Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/91260/?format=api
{ "id": 91260, "url": "https://patches.dpdk.org/api/patches/91260/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1618321639-57642-6-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-6-git-send-email-humin29@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1618321639-57642-6-git-send-email-humin29@huawei.com", "date": "2021-04-13T13:47:15", "name": "[5/9] net/hns3: obtain the supported speed for fiber port", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "cc5905cc8130251b0f3d3c8116167dd76228d074", "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-6-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/91260/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/91260/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 8EC9BA0524;\n\tTue, 13 Apr 2021 15:48:09 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 90EBA160FFD;\n\tTue, 13 Apr 2021 15:47:19 +0200 (CEST)", "from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32])\n by mails.dpdk.org (Postfix) with ESMTP id 3CA1F160FC7\n for <dev@dpdk.org>; Tue, 13 Apr 2021 15:47:08 +0200 (CEST)", "from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59])\n by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4FKRgY47sxzlXpm\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:15 +0800", "Message-ID": "<1618321639-57642-6-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 5/9] net/hns3: obtain the supported speed for\n fiber port", "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\nCurrently, the speed of fiber port is obtained by using the default\nquery type of HNS3_OPC_GET_SFP_INFO opcode. In this way, only\nthe speed of the optical module can be obtained. In fact, the opcode\nalso supports an active query type, which is a channel for obtaining\ninformation such as the speed, the supported speed, auto-negotiation\ncapability, and FEC mode. This patch changes the query type of the\nopcode from the default query type to the active query type to obtain\nthe supported speed of fiber port.\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 | 41 ++++++++++++++--------\n drivers/net/hns3/hns3_ethdev.c | 80 ++++++++++++++++++++++++++++++++----------\n drivers/net/hns3/hns3_ethdev.h | 26 ++++++++++++--\n 3 files changed, 113 insertions(+), 34 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h\nindex a39f159..35f26c0 100644\n--- a/drivers/net/hns3/hns3_cmd.h\n+++ b/drivers/net/hns3/hns3_cmd.h\n@@ -237,7 +237,7 @@ enum hns3_opcode_type {\n \t/* SFP command */\n \tHNS3_OPC_GET_SFP_EEPROM = 0x7100,\n \tHNS3_OPC_GET_SFP_EXIST = 0x7101,\n-\tHNS3_OPC_SFP_GET_SPEED = 0x7104,\n+\tHNS3_OPC_GET_SFP_INFO = 0x7104,\n \n \t/* Interrupts commands */\n \tHNS3_OPC_ADD_RING_TO_VECTOR = 0x1503,\n@@ -774,13 +774,6 @@ struct hns3_config_auto_neg_cmd {\n \tuint8_t rsv[20];\n };\n \n-#define HNS3_MAC_CFG_FEC_AUTO_EN_B\t0\n-#define HNS3_MAC_CFG_FEC_MODE_S\t\t1\n-#define HNS3_MAC_CFG_FEC_MODE_M\tGENMASK(3, 1)\n-#define HNS3_MAC_FEC_OFF\t\t0\n-#define HNS3_MAC_FEC_BASER\t\t1\n-#define HNS3_MAC_FEC_RS\t\t\t2\n-\n #define HNS3_SFP_INFO_BD0_LEN 20UL\n #define HNS3_SFP_INFO_BDX_LEN 24UL\n \n@@ -795,14 +788,34 @@ struct hns3_sfp_type {\n \tuint8_t ext_type;\n };\n \n-struct hns3_sfp_speed_cmd {\n-\tuint32_t sfp_speed;\n-\tuint8_t query_type; /* 0: sfp speed, 1: active fec */\n-\tuint8_t active_fec; /* current FEC mode */\n-\tuint16_t rsv1;\n-\tuint32_t rsv2[4];\n+/* Bitmap flags in supported_speed */\n+#define HNS3_FIBER_LINK_SPEED_1G_BIT\t\tBIT(0)\n+#define HNS3_FIBER_LINK_SPEED_10G_BIT\t\tBIT(1)\n+#define HNS3_FIBER_LINK_SPEED_25G_BIT\t\tBIT(2)\n+#define HNS3_FIBER_LINK_SPEED_50G_BIT\t\tBIT(3)\n+#define HNS3_FIBER_LINK_SPEED_100G_BIT\t\tBIT(4)\n+#define HNS3_FIBER_LINK_SPEED_40G_BIT\t\tBIT(5)\n+#define HNS3_FIBER_LINK_SPEED_100M_BIT\t\tBIT(6)\n+#define HNS3_FIBER_LINK_SPEED_10M_BIT\t\tBIT(7)\n+#define HNS3_FIBER_LINK_SPEED_200G_BIT\t\tBIT(8)\n+\n+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+\tuint32_t supported_speed; /* speed supported by current media */\n+\tuint32_t module_type;\n+\tuint8_t rsv1[8];\n };\n \n+#define HNS3_MAC_CFG_FEC_AUTO_EN_B\t0\n+#define HNS3_MAC_CFG_FEC_MODE_S\t\t1\n+#define HNS3_MAC_CFG_FEC_MODE_M\tGENMASK(3, 1)\n+#define HNS3_MAC_FEC_OFF\t\t0\n+#define HNS3_MAC_FEC_BASER\t\t1\n+#define HNS3_MAC_FEC_RS\t\t\t2\n+\n /* Configure FEC mode, opcode:0x031A */\n struct hns3_config_fec_cmd {\n \tuint8_t fec_mode;\ndiff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex d22d31d..e8ae288 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -4507,24 +4507,45 @@ hns3_dev_promisc_restore(struct hns3_adapter *hns)\n }\n \n static int\n-hns3_get_sfp_speed(struct hns3_hw *hw, uint32_t *speed)\n+hns3_get_sfp_info(struct hns3_hw *hw, struct hns3_mac *mac_info)\n {\n-\tstruct hns3_sfp_speed_cmd *resp;\n+\tstruct hns3_sfp_info_cmd *resp;\n \tstruct hns3_cmd_desc desc;\n \tint ret;\n \n-\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_SFP_GET_SPEED, true);\n-\tresp = (struct hns3_sfp_speed_cmd *)desc.data;\n+\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_GET_SFP_INFO, true);\n+\tresp = (struct hns3_sfp_info_cmd *)desc.data;\n+\tresp->query_type = HNS3_ACTIVE_QUERY;\n+\n \tret = hns3_cmd_send(hw, &desc, 1);\n \tif (ret == -EOPNOTSUPP) {\n-\t\thns3_err(hw, \"IMP do not support get SFP speed %d\", ret);\n+\t\thns3_warn(hw, \"firmware does not support get SFP info,\"\n+\t\t\t \" ret = %d.\", ret);\n \t\treturn ret;\n \t} else if (ret) {\n-\t\thns3_err(hw, \"get sfp speed failed %d\", ret);\n+\t\thns3_err(hw, \"get sfp info failed, ret = %d.\", ret);\n \t\treturn ret;\n \t}\n \n-\t*speed = resp->sfp_speed;\n+\t/*\n+\t * In some case, the speed of MAC obtained from firmware may be 0, it\n+\t * shouldn't be set to mac->speed.\n+\t */\n+\tif (!rte_le_to_cpu_32(resp->sfp_speed))\n+\t\treturn 0;\n+\n+\tmac_info->link_speed = rte_le_to_cpu_32(resp->sfp_speed);\n+\t/*\n+\t * if resp->supported_speed is 0, it means it's an old version\n+\t * firmware, do not update these params.\n+\t */\n+\tif (resp->supported_speed) {\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} else {\n+\t\tmac_info->query_type = HNS3_DEFAULT_QUERY;\n+\t}\n \n \treturn 0;\n }\n@@ -4566,25 +4587,49 @@ static int\n hns3_update_fiber_link_info(struct hns3_hw *hw)\n {\n \tstruct hns3_pf *pf = HNS3_DEV_HW_TO_PF(hw);\n-\tuint32_t speed;\n+\tstruct hns3_mac *mac = &hw->mac;\n+\tstruct hns3_mac mac_info;\n \tint ret;\n \n-\t/* If IMP do not support get SFP/qSFP speed, return directly */\n+\t/* If firmware do not support get SFP/qSFP speed, return directly */\n \tif (!pf->support_sfp_query)\n \t\treturn 0;\n \n-\tret = hns3_get_sfp_speed(hw, &speed);\n+\tmemset(&mac_info, 0, sizeof(struct hns3_mac));\n+\tret = hns3_get_sfp_info(hw, &mac_info);\n \tif (ret == -EOPNOTSUPP) {\n \t\tpf->support_sfp_query = false;\n \t\treturn ret;\n \t} else if (ret)\n \t\treturn ret;\n \n-\tif (speed == ETH_SPEED_NUM_NONE)\n-\t\treturn 0; /* do nothing if no SFP */\n+\t/* Do nothing if no SFP */\n+\tif (mac_info.link_speed == ETH_SPEED_NUM_NONE)\n+\t\treturn 0;\n+\n+\t/*\n+\t * If query_type is HNS3_ACTIVE_QUERY, it is no need\n+\t * to reconfigure the speed of MAC. Otherwise, it indicates\n+\t * that the current firmware only supports to obtain the\n+\t * speed of the SFP, and the speed of MAC needs to reconfigure.\n+\t */\n+\tmac->query_type = mac_info.query_type;\n+\tif (mac->query_type == HNS3_ACTIVE_QUERY) {\n+\t\tif (mac_info.link_speed != mac->link_speed) {\n+\t\t\tret = hns3_port_shaper_update(hw, mac_info.link_speed);\n+\t\t\tif (ret)\n+\t\t\t\treturn ret;\n+\t\t}\n+\n+\t\tmac->link_speed = mac_info.link_speed;\n+\t\tmac->supported_speed = mac_info.supported_speed;\n+\n+\t\treturn 0;\n+\t}\n \n \t/* Config full duplex for SFP */\n-\treturn hns3_cfg_mac_speed_dup(hw, speed, ETH_LINK_FULL_DUPLEX);\n+\treturn hns3_cfg_mac_speed_dup(hw, mac_info.link_speed,\n+\t\t\t\t ETH_LINK_FULL_DUPLEX);\n }\n \n static void\n@@ -6200,8 +6245,7 @@ get_current_fec_auto_state(struct hns3_hw *hw, uint8_t *state)\n static int\n hns3_fec_get_internal(struct hns3_hw *hw, uint32_t *fec_capa)\n {\n-#define QUERY_ACTIVE_SPEED\t1\n-\tstruct hns3_sfp_speed_cmd *resp;\n+\tstruct hns3_sfp_info_cmd *resp;\n \tuint32_t tmp_fec_capa;\n \tuint8_t auto_state;\n \tstruct hns3_cmd_desc desc;\n@@ -6223,9 +6267,9 @@ hns3_fec_get_internal(struct hns3_hw *hw, uint32_t *fec_capa)\n \t\t}\n \t}\n \n-\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_SFP_GET_SPEED, true);\n-\tresp = (struct hns3_sfp_speed_cmd *)desc.data;\n-\tresp->query_type = QUERY_ACTIVE_SPEED;\n+\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_GET_SFP_INFO, true);\n+\tresp = (struct hns3_sfp_info_cmd *)desc.data;\n+\tresp->query_type = HNS3_ACTIVE_QUERY;\n \n \tret = hns3_cmd_send(hw, &desc, 1);\n \tif (ret == -EOPNOTSUPP) {\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex 553caa3..a09d825 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -174,6 +174,9 @@ enum hns3_media_type {\n \tHNS3_MEDIA_TYPE_NONE,\n };\n \n+#define HNS3_DEFAULT_QUERY\t\t0\n+#define HNS3_ACTIVE_QUERY\t\t1\n+\n struct hns3_mac {\n \tuint8_t mac_addr[RTE_ETHER_ADDR_LEN];\n \tbool default_addr_setted; /* whether default addr(mac_addr) is set */\n@@ -183,10 +186,29 @@ struct hns3_mac {\n \tuint8_t link_autoneg : 1; /* ETH_LINK_[AUTONEG/FIXED] */\n \tuint8_t link_status : 1; /* ETH_LINK_[DOWN/UP] */\n \tuint32_t link_speed; /* ETH_SPEED_NUM_ */\n+\t/*\n+\t * Some firmware versions support only the SFP speed query. In addition\n+\t * to the SFP speed query, some firmware supports the query of the speed\n+\t * capability, auto-negotiation capability, and FEC mode, which can be\n+\t * selected by the 'query_type' filed in the HNS3_OPC_GET_SFP_INFO CMD.\n+\t * This field is used to record the SFP information query mode.\n+\t * Value range:\n+\t * HNS3_DEFAULT_QUERY/HNS3_ACTIVE_QUERY\n+\t *\n+\t * - HNS3_DEFAULT_QUERY\n+\t * Speed obtained is from SFP. When the queried speed changes, the MAC\n+\t * speed needs to be reconfigured.\n+\t *\n+\t * - HNS3_ACTIVE_QUERY\n+\t * Speed obtained is from MAC. At this time, it is unnecessary for\n+\t * driver to reconfigured the MAC speed. In addition, more information,\n+\t * such as, the speed capability, auto-negotiation capability and FEC\n+\t * mode, can be obtained by the HNS3_OPC_GET_SFP_INFO CMD.\n+\t */\n+\tuint8_t query_type;\n \tuint32_t supported_speed; /* supported speed for current media type */\n \tuint32_t advertising; /* advertised capability in the local part */\n-\t/* advertised capability in the link partner */\n-\tuint32_t lp_advertising;\n+\tuint32_t lp_advertising; /* advertised capability in the link partner */\n \tuint8_t support_autoneg;\n };\n \n", "prefixes": [ "5/9" ] }