Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/91256/?format=api
{ "id": 91256, "url": "https://patches.dpdk.org/api/patches/91256/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1618321639-57642-8-git-send-email-humin29@huawei.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1618321639-57642-8-git-send-email-humin29@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1618321639-57642-8-git-send-email-humin29@huawei.com", "date": "2021-04-13T13:47:17", "name": "[7/9] net/hns3: support link speed autoneg for PF", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "9d737840e4f50a2c30e92f861d7b11e12323d57b", "submitter": { "id": 1944, "url": "https://patches.dpdk.org/api/people/1944/?format=api", "name": "humin (Q)", "email": "humin29@huawei.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1618321639-57642-8-git-send-email-humin29@huawei.com/mbox/", "series": [ { "id": 16336, "url": "https://patches.dpdk.org/api/series/16336/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=16336", "date": "2021-04-13T13:47:11", "name": "support speed capability and autoneg report", "version": 1, "mbox": "https://patches.dpdk.org/series/16336/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/91256/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/91256/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id CB94DA0524;\n\tTue, 13 Apr 2021 15:47:46 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B5B7D160FE9;\n\tTue, 13 Apr 2021 15:47:14 +0200 (CEST)", "from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32])\n by mails.dpdk.org (Postfix) with ESMTP id CC1B8160FBC\n for <dev@dpdk.org>; Tue, 13 Apr 2021 15:47:07 +0200 (CEST)", "from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59])\n by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4FKRgY36VtzlXpY\n for <dev@dpdk.org>; Tue, 13 Apr 2021 21:45:13 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id\n 14.3.498.0; Tue, 13 Apr 2021 21:47:01 +0800" ], "From": "\"Min Hu (Connor)\" <humin29@huawei.com>", "To": "<dev@dpdk.org>", "CC": "<ferruh.yigit@intel.com>", "Date": "Tue, 13 Apr 2021 21:47:17 +0800", "Message-ID": "<1618321639-57642-8-git-send-email-humin29@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1618321639-57642-1-git-send-email-humin29@huawei.com>", "References": "<1618321639-57642-1-git-send-email-humin29@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH 7/9] net/hns3: support link speed autoneg for PF", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Huisong Li <lihuisong@huawei.com>\n\nThis patch supports link speed auto-negotiation for PF. If the\ndevice supports auto-negotiation, the device negotiates with\nthe link partner at all speeds supported by the device.\n\nSigned-off-by: Huisong Li <lihuisong@huawei.com>\nSigned-off-by: Min Hu (Connor) <humin29@huawei.com>\n---\n drivers/net/hns3/hns3_cmd.h | 5 +-\n drivers/net/hns3/hns3_ethdev.c | 152 ++++++++++++++++++++++++++++++++++++++++-\n drivers/net/hns3/hns3_ethdev.h | 6 ++\n 3 files changed, 160 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h\nindex 35f26c0..14f2f21 100644\n--- a/drivers/net/hns3/hns3_cmd.h\n+++ b/drivers/net/hns3/hns3_cmd.h\n@@ -115,6 +115,7 @@ enum hns3_opcode_type {\n \n \t/* MAC command */\n \tHNS3_OPC_CONFIG_MAC_MODE = 0x0301,\n+\tHNS3_OPC_CONFIG_AN_MODE = 0x0304,\n \tHNS3_OPC_QUERY_LINK_STATUS = 0x0307,\n \tHNS3_OPC_CONFIG_MAX_FRM_SIZE = 0x0308,\n \tHNS3_OPC_CONFIG_SPEED_DUP = 0x0309,\n@@ -803,7 +804,9 @@ struct hns3_sfp_info_cmd {\n \tuint32_t sfp_speed;\n \tuint8_t query_type; /* 0: sfp speed, 1: active */\n \tuint8_t active_fec; /* current FEC mode */\n-\tuint16_t rsv;\n+\tuint8_t autoneg; /* current autoneg state */\n+\t/* 0: not support autoneg, 1: support autoneg */\n+\tuint8_t autoneg_ability;\n \tuint32_t supported_speed; /* speed supported by current media */\n \tuint32_t module_type;\n \tuint8_t rsv1[8];\ndiff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex 7893379..e251b97 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -2850,8 +2850,7 @@ hns3_setup_linkstatus(struct rte_eth_dev *eth_dev,\n \n \tnew_link->link_duplex = mac->link_duplex;\n \tnew_link->link_status = mac->link_status ? ETH_LINK_UP : ETH_LINK_DOWN;\n-\tnew_link->link_autoneg =\n-\t !(eth_dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED);\n+\tnew_link->link_autoneg = mac->link_autoneg;\n }\n \n static int\n@@ -4605,6 +4604,9 @@ hns3_get_sfp_info(struct hns3_hw *hw, struct hns3_mac *mac_info)\n \t\tmac_info->query_type = HNS3_ACTIVE_QUERY;\n \t\tmac_info->supported_speed =\n \t\t\t\t\trte_le_to_cpu_32(resp->supported_speed);\n+\t\tmac_info->support_autoneg = resp->autoneg_ability;\n+\t\tmac_info->link_autoneg = (resp->autoneg == 0) ? ETH_LINK_FIXED\n+\t\t\t\t\t: ETH_LINK_AUTONEG;\n \t} else {\n \t\tmac_info->query_type = HNS3_DEFAULT_QUERY;\n \t}\n@@ -4685,6 +4687,8 @@ hns3_update_fiber_link_info(struct hns3_hw *hw)\n \n \t\tmac->link_speed = mac_info.link_speed;\n \t\tmac->supported_speed = mac_info.supported_speed;\n+\t\tmac->support_autoneg = mac_info.support_autoneg;\n+\t\tmac->link_autoneg = mac_info.link_autoneg;\n \n \t\treturn 0;\n \t}\n@@ -5248,6 +5252,144 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev)\n }\n \n static int\n+hns3_set_copper_port_link_speed(struct hns3_hw *hw,\n+\t\t\t\tstruct hns3_set_link_speed_cfg *cfg)\n+{\n+\tstruct hns3_cmd_desc desc[HNS3_PHY_PARAM_CFG_BD_NUM];\n+\tstruct hns3_phy_params_bd0_cmd *req;\n+\tuint16_t i;\n+\n+\tfor (i = 0; i < HNS3_PHY_PARAM_CFG_BD_NUM - 1; i++) {\n+\t\thns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_PHY_PARAM_CFG,\n+\t\t\t\t\t false);\n+\t\tdesc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT);\n+\t}\n+\thns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_PHY_PARAM_CFG, false);\n+\treq = (struct hns3_phy_params_bd0_cmd *)desc[0].data;\n+\treq->autoneg = cfg->autoneg;\n+\n+\t/*\n+\t * The full speed capability is used to negotiate when\n+\t * auto-negotiation is enabled.\n+\t */\n+\tif (cfg->autoneg) {\n+\t\treq->advertising = HNS3_PHY_LINK_SPEED_10M_BIT |\n+\t\t\t\t HNS3_PHY_LINK_SPEED_10M_HD_BIT |\n+\t\t\t\t HNS3_PHY_LINK_SPEED_100M_BIT |\n+\t\t\t\t HNS3_PHY_LINK_SPEED_100M_HD_BIT |\n+\t\t\t\t HNS3_PHY_LINK_SPEED_1000M_BIT;\n+\t}\n+\n+\treturn hns3_cmd_send(hw, desc, HNS3_PHY_PARAM_CFG_BD_NUM);\n+}\n+\n+static int\n+hns3_set_autoneg(struct hns3_hw *hw, bool enable)\n+{\n+\tstruct hns3_config_auto_neg_cmd *req;\n+\tstruct hns3_cmd_desc desc;\n+\tuint32_t flag = 0;\n+\tint ret;\n+\n+\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_CONFIG_AN_MODE, false);\n+\n+\treq = (struct hns3_config_auto_neg_cmd *)desc.data;\n+\tif (enable)\n+\t\thns3_set_bit(flag, HNS3_MAC_CFG_AN_EN_B, 1);\n+\treq->cfg_an_cmd_flag = rte_cpu_to_le_32(flag);\n+\n+\tret = hns3_cmd_send(hw, &desc, 1);\n+\tif (ret)\n+\t\thns3_err(hw, \"autoneg set cmd failed, ret = %d.\", ret);\n+\n+\treturn ret;\n+}\n+\n+static int\n+hns3_set_fiber_port_link_speed(struct hns3_hw *hw,\n+\t\t\t struct hns3_set_link_speed_cfg *cfg)\n+{\n+\tint ret;\n+\n+\tif (hw->mac.support_autoneg) {\n+\t\tret = hns3_set_autoneg(hw, cfg->autoneg);\n+\t\tif (ret) {\n+\t\t\thns3_err(hw, \"failed to configure auto-negotiation.\");\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\t/*\n+\t\t * To enable auto-negotiation, we only need to open the switch\n+\t\t * of auto-negotiation, then firmware sets all speed\n+\t\t * capabilities.\n+\t\t */\n+\t\tif (cfg->autoneg)\n+\t\t\treturn 0;\n+\t}\n+\n+\t/*\n+\t * Some hardware doesn't support auto-negotiation, but users may not\n+\t * configure link_speeds (default 0), which means auto-negotiation\n+\t * In this case, a warning message need to be printed, instead of\n+\t * an error.\n+\t */\n+\tif (cfg->autoneg) {\n+\t\thns3_warn(hw, \"auto-negotiation is not supported.\");\n+\t\treturn 0;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+hns3_set_port_link_speed(struct hns3_hw *hw,\n+\t\t\t struct hns3_set_link_speed_cfg *cfg)\n+{\n+\tint ret;\n+\n+\tif (hw->mac.media_type == HNS3_MEDIA_TYPE_COPPER) {\n+#if defined(RTE_HNS3_ONLY_1630_FPGA)\n+\t\tstruct hns3_pf *pf = HNS3_DEV_HW_TO_PF(hw);\n+\t\tif (pf->is_tmp_phy)\n+\t\t\treturn 0;\n+#endif\n+\n+\t\tret = hns3_set_copper_port_link_speed(hw, cfg);\n+\t\tif (ret) {\n+\t\t\thns3_err(hw, \"failed to set copper port link speed,\"\n+\t\t\t\t \"ret = %d.\", ret);\n+\t\t\treturn ret;\n+\t\t}\n+\t} else if (hw->mac.media_type == HNS3_MEDIA_TYPE_FIBER) {\n+\t\tret = hns3_set_fiber_port_link_speed(hw, cfg);\n+\t\tif (ret) {\n+\t\t\thns3_err(hw, \"failed to set fiber port link speed,\"\n+\t\t\t\t \"ret = %d.\", ret);\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+hns3_apply_link_speed(struct hns3_hw *hw)\n+{\n+\tstruct rte_eth_conf *conf = &hw->data->dev_conf;\n+\tstruct hns3_set_link_speed_cfg cfg;\n+\n+\tmemset(&cfg, 0, sizeof(struct hns3_set_link_speed_cfg));\n+\tcfg.autoneg = (conf->link_speeds == ETH_LINK_SPEED_AUTONEG) ?\n+\t\t\tETH_LINK_AUTONEG : ETH_LINK_FIXED;\n+\tif (cfg.autoneg != ETH_LINK_AUTONEG) {\n+\t\thns3_err(hw, \"device doesn't support to force link speed.\");\n+\t\treturn -EOPNOTSUPP;\n+\t}\n+\n+\treturn hns3_set_port_link_speed(hw, &cfg);\n+}\n+\n+static int\n hns3_do_start(struct hns3_adapter *hns, bool reset_queue)\n {\n \tstruct hns3_hw *hw = &hns->hw;\n@@ -5280,9 +5422,15 @@ hns3_do_start(struct hns3_adapter *hns, bool reset_queue)\n \t\tPMD_INIT_LOG(ERR, \"failed to enable MAC, ret = %d\", ret);\n \t\tgoto err_config_mac_mode;\n \t}\n+\n+\tret = hns3_apply_link_speed(hw);\n+\tif (ret)\n+\t\tgoto err_config_mac_mode;\n+\n \treturn 0;\n \n err_config_mac_mode:\n+\t(void)hns3_cfg_mac_mode(hw, false);\n \thns3_dev_release_mbufs(hns);\n \t/*\n \t * Here is exception handling, hns3_reset_all_tqps will have the\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex a09d825..3e2fe7b 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -165,6 +165,12 @@ struct hns3_cfg {\n \tuint16_t umv_space;\n };\n \n+struct hns3_set_link_speed_cfg {\n+\tuint32_t speed;\n+\tuint8_t duplex : 1;\n+\tuint8_t autoneg : 1;\n+};\n+\n /* mac media type */\n enum hns3_media_type {\n \tHNS3_MEDIA_TYPE_UNKNOWN,\n", "prefixes": [ "7/9" ] }