From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E148643C8E; Tue, 12 Mar 2024 08:53:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 39D11406FF; Tue, 12 Mar 2024 08:52:47 +0100 (CET) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by mails.dpdk.org (Postfix) with ESMTP id 09480410E3 for ; Tue, 12 Mar 2024 08:52:41 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Tv5Qs0Dhcz2BfkR; Tue, 12 Mar 2024 15:50:13 +0800 (CST) Received: from dggpeml500011.china.huawei.com (unknown [7.185.36.84]) by mail.maildlp.com (Postfix) with ESMTPS id 51AA4140485; Tue, 12 Mar 2024 15:52:39 +0800 (CST) Received: from localhost.huawei.com (10.50.165.33) by dggpeml500011.china.huawei.com (7.185.36.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 12 Mar 2024 15:52:39 +0800 From: Dengdui Huang To: CC: , , , , , , , , Subject: [PATCH 2/3] net/hns3: support setting lanes Date: Tue, 12 Mar 2024 15:52:37 +0800 Message-ID: <20240312075238.3319480-3-huangdengdui@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240312075238.3319480-1-huangdengdui@huawei.com> References: <20240312075238.3319480-1-huangdengdui@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500011.china.huawei.com (7.185.36.84) X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Some speeds can be achieved with different number of lanes. For example, 100Gbps can be achieved using two lanes of 50Gbps or four lanes of 25Gbps. When use different lanes, the port cannot be up. This patch add support for setting lanes and report lanes. Signed-off-by: Dengdui Huang --- doc/guides/rel_notes/release_24_03.rst | 2 + drivers/net/hns3/hns3_cmd.h | 15 ++-- drivers/net/hns3/hns3_common.c | 3 +- drivers/net/hns3/hns3_ethdev.c | 111 +++++++++++-------------- drivers/net/hns3/hns3_ethdev.h | 2 + 5 files changed, 66 insertions(+), 67 deletions(-) diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index 75d93ee965..c17334ac25 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -180,6 +180,8 @@ New Features * Added power-saving during polling within the ``rte_event_dequeue_burst()`` API. * Added support for DMA adapter. +* **Added setting lanes for hns3 PF driver.** + * This feature add support for setting lanes and report lanes. Removed Items ------------- diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h index 79a8c1edad..31ff7b35d8 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -753,7 +753,9 @@ struct hns3_config_mac_mode_cmd { struct hns3_config_mac_speed_dup_cmd { uint8_t speed_dup; uint8_t mac_change_fec_en; - uint8_t rsv[22]; + uint8_t rsv[4]; + uint8_t lanes; + uint8_t rsv1[17]; }; #define HNS3_TQP_ENABLE_B 0 @@ -789,12 +791,15 @@ struct hns3_sfp_type { #define HNS3_FIBER_LINK_SPEED_1G_BIT BIT(0) #define HNS3_FIBER_LINK_SPEED_10G_BIT BIT(1) #define HNS3_FIBER_LINK_SPEED_25G_BIT BIT(2) -#define HNS3_FIBER_LINK_SPEED_50G_BIT BIT(3) -#define HNS3_FIBER_LINK_SPEED_100G_BIT BIT(4) +#define HNS3_FIBER_LINK_SPEED_50G_R2_BIT BIT(3) +#define HNS3_FIBER_LINK_SPEED_100G_R4_BIT BIT(4) #define HNS3_FIBER_LINK_SPEED_40G_BIT BIT(5) #define HNS3_FIBER_LINK_SPEED_100M_BIT BIT(6) #define HNS3_FIBER_LINK_SPEED_10M_BIT BIT(7) -#define HNS3_FIBER_LINK_SPEED_200G_BIT BIT(8) +#define HNS3_FIBER_LINK_SPEED_200G_EXT_BIT BIT(8) +#define HNS3_FIBER_LINK_SPEED_50G_R1_BIT BIT(9) +#define HNS3_FIBER_LINK_SPEED_100G_R2_BIT BIT(10) +#define HNS3_FIBER_LINK_SPEED_200G_R4_BIT BIT(11) #define HNS3_FIBER_FEC_AUTO_BIT BIT(0) #define HNS3_FIBER_FEC_BASER_BIT BIT(1) @@ -823,7 +828,7 @@ struct hns3_sfp_info_cmd { uint32_t supported_speed; /* speed supported by current media */ uint32_t module_type; uint8_t fec_ability; /* supported fec modes, see HNS3_FIBER_FEC_XXX_BIT */ - uint8_t rsv0; + uint8_t lanes; uint8_t pause_status; uint8_t rsv1[5]; }; diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c index 28c26b049c..cccb441780 100644 --- a/drivers/net/hns3/hns3_common.c +++ b/drivers/net/hns3/hns3_common.c @@ -92,7 +92,8 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM; info->dev_capa = RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP | - RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP; + RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP | + RTE_ETH_DEV_CAPA_SETTING_LANES; if (hns3_dev_get_support(hw, INDEP_TXRX)) info->dev_capa |= RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP | RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP; diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index ecd3b2ef64..8a19c3ddd9 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2235,12 +2235,16 @@ hns3_get_firber_port_speed_capa(uint32_t supported_speed) speed_capa |= RTE_ETH_LINK_SPEED_25G; if (supported_speed & HNS3_FIBER_LINK_SPEED_40G_BIT) speed_capa |= RTE_ETH_LINK_SPEED_40G; - if (supported_speed & HNS3_FIBER_LINK_SPEED_50G_BIT) + if (supported_speed & HNS3_FIBER_LINK_SPEED_50G_R1_BIT) speed_capa |= RTE_ETH_LINK_SPEED_50G; - if (supported_speed & HNS3_FIBER_LINK_SPEED_100G_BIT) - speed_capa |= RTE_ETH_LINK_SPEED_100G; - if (supported_speed & HNS3_FIBER_LINK_SPEED_200G_BIT) - speed_capa |= RTE_ETH_LINK_SPEED_200G; + if (supported_speed & HNS3_FIBER_LINK_SPEED_50G_R2_BIT) + speed_capa |= RTE_ETH_LINK_SPEED_50G_2LANES; + if (supported_speed & HNS3_FIBER_LINK_SPEED_100G_R4_BIT) + speed_capa |= RTE_ETH_LINK_SPEED_100G_4LANES; + if (supported_speed & HNS3_FIBER_LINK_SPEED_100G_R2_BIT) + speed_capa |= RTE_ETH_LINK_SPEED_100G_2LANES; + if (supported_speed & HNS3_FIBER_LINK_SPEED_200G_R4_BIT) + speed_capa |= RTE_ETH_LINK_SPEED_200G_4LANES; return speed_capa; } @@ -2308,6 +2312,7 @@ hns3_setup_linkstatus(struct rte_eth_dev *eth_dev, if (!mac->link_status) new_link->link_speed = RTE_ETH_SPEED_NUM_NONE; + new_link->link_lanes = mac->link_lanes; new_link->link_duplex = mac->link_duplex; new_link->link_status = mac->link_status ? RTE_ETH_LINK_UP : RTE_ETH_LINK_DOWN; new_link->link_autoneg = mac->link_autoneg; @@ -2934,7 +2939,8 @@ hns3_map_tqp(struct hns3_hw *hw) } static int -hns3_cfg_mac_speed_dup_hw(struct hns3_hw *hw, uint32_t speed, uint8_t duplex) +hns3_cfg_mac_speed_dup_hw(struct hns3_hw *hw, uint32_t speed, uint8_t lanes, + uint8_t duplex) { struct hns3_config_mac_speed_dup_cmd *req; struct hns3_cmd_desc desc; @@ -2989,6 +2995,7 @@ hns3_cfg_mac_speed_dup_hw(struct hns3_hw *hw, uint32_t speed, uint8_t duplex) } hns3_set_bit(req->mac_change_fec_en, HNS3_CFG_MAC_SPEED_CHANGE_EN_B, 1); + req->lanes = lanes; ret = hns3_cmd_send(hw, &desc, 1); if (ret) @@ -3643,7 +3650,9 @@ hns3_mac_init(struct hns3_hw *hw) pf->support_sfp_query = true; mac->link_duplex = RTE_ETH_LINK_FULL_DUPLEX; - ret = hns3_cfg_mac_speed_dup_hw(hw, mac->link_speed, mac->link_duplex); + /* If lane is set to 0, the firmware selects the default lane.*/ + ret = hns3_cfg_mac_speed_dup_hw(hw, mac->link_speed, 0, + mac->link_duplex); if (ret) { PMD_INIT_LOG(ERR, "Config mac speed dup fail ret = %d", ret); return ret; @@ -4052,6 +4061,7 @@ hns3_get_sfp_info(struct hns3_hw *hw, struct hns3_mac *mac_info) return 0; mac_info->link_speed = rte_le_to_cpu_32(resp->sfp_speed); + mac_info->link_lanes = resp->lanes; /* * if resp->supported_speed is 0, it means it's an old version * firmware, do not update these params. @@ -4088,16 +4098,18 @@ hns3_check_speed_dup(uint8_t duplex, uint32_t speed) } static int -hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t duplex) +hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t lanes, + uint8_t duplex) { struct hns3_mac *mac = &hw->mac; int ret; duplex = hns3_check_speed_dup(duplex, speed); - if (mac->link_speed == speed && mac->link_duplex == duplex) + if (mac->link_speed == speed && mac->link_lanes == lanes && + mac->link_duplex == duplex) return 0; - ret = hns3_cfg_mac_speed_dup_hw(hw, speed, duplex); + ret = hns3_cfg_mac_speed_dup_hw(hw, speed, lanes, duplex); if (ret) return ret; @@ -4106,6 +4118,7 @@ hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t duplex) return ret; mac->link_speed = speed; + mac->link_lanes = lanes; mac->link_duplex = duplex; return 0; @@ -4150,6 +4163,7 @@ hns3_update_fiber_link_info(struct hns3_hw *hw) } mac->link_speed = mac_info.link_speed; + mac->link_lanes = mac_info.link_lanes; mac->supported_speed = mac_info.supported_speed; mac->support_autoneg = mac_info.support_autoneg; mac->link_autoneg = mac_info.link_autoneg; @@ -4161,7 +4175,7 @@ hns3_update_fiber_link_info(struct hns3_hw *hw) } /* Config full duplex for SFP */ - return hns3_cfg_mac_speed_dup(hw, mac_info.link_speed, + return hns3_cfg_mac_speed_dup(hw, mac_info.link_speed, mac_info.link_lanes, RTE_ETH_LINK_FULL_DUPLEX); } @@ -4512,11 +4526,11 @@ hns3_set_firber_default_support_speed(struct hns3_hw *hw) case RTE_ETH_SPEED_NUM_40G: return HNS3_FIBER_LINK_SPEED_40G_BIT; case RTE_ETH_SPEED_NUM_50G: - return HNS3_FIBER_LINK_SPEED_50G_BIT; + return HNS3_FIBER_LINK_SPEED_50G_R2_BIT; case RTE_ETH_SPEED_NUM_100G: - return HNS3_FIBER_LINK_SPEED_100G_BIT; + return HNS3_FIBER_LINK_SPEED_100G_R4_BIT; case RTE_ETH_SPEED_NUM_200G: - return HNS3_FIBER_LINK_SPEED_200G_BIT; + return HNS3_FIBER_LINK_SPEED_200G_R4_BIT; default: hns3_warn(hw, "invalid speed %u Mbps.", mac->link_speed); return 0; @@ -4773,13 +4787,19 @@ hns3_convert_link_speeds2bitmap_fiber(uint32_t link_speeds) speed_bit = HNS3_FIBER_LINK_SPEED_40G_BIT; break; case RTE_ETH_LINK_SPEED_50G: - speed_bit = HNS3_FIBER_LINK_SPEED_50G_BIT; + speed_bit = HNS3_FIBER_LINK_SPEED_50G_R1_BIT; break; - case RTE_ETH_LINK_SPEED_100G: - speed_bit = HNS3_FIBER_LINK_SPEED_100G_BIT; + case RTE_ETH_LINK_SPEED_50G_2LANES: + speed_bit = HNS3_FIBER_LINK_SPEED_50G_R2_BIT; break; - case RTE_ETH_LINK_SPEED_200G: - speed_bit = HNS3_FIBER_LINK_SPEED_200G_BIT; + case RTE_ETH_LINK_SPEED_100G_4LANES: + speed_bit = HNS3_FIBER_LINK_SPEED_100G_R4_BIT; + break; + case RTE_ETH_LINK_SPEED_100G_2LANES: + speed_bit = HNS3_FIBER_LINK_SPEED_100G_R2_BIT; + break; + case RTE_ETH_LINK_SPEED_200G_4LANES: + speed_bit = HNS3_FIBER_LINK_SPEED_200G_R4_BIT; break; default: speed_bit = 0; @@ -4810,45 +4830,6 @@ hns3_check_port_speed(struct hns3_hw *hw, uint32_t link_speeds) return 0; } -static uint32_t -hns3_get_link_speed(uint32_t link_speeds) -{ - uint32_t speed = RTE_ETH_SPEED_NUM_NONE; - - if (link_speeds & RTE_ETH_LINK_SPEED_10M || - link_speeds & RTE_ETH_LINK_SPEED_10M_HD) - speed = RTE_ETH_SPEED_NUM_10M; - if (link_speeds & RTE_ETH_LINK_SPEED_100M || - link_speeds & RTE_ETH_LINK_SPEED_100M_HD) - speed = RTE_ETH_SPEED_NUM_100M; - if (link_speeds & RTE_ETH_LINK_SPEED_1G) - speed = RTE_ETH_SPEED_NUM_1G; - if (link_speeds & RTE_ETH_LINK_SPEED_10G) - speed = RTE_ETH_SPEED_NUM_10G; - if (link_speeds & RTE_ETH_LINK_SPEED_25G) - speed = RTE_ETH_SPEED_NUM_25G; - if (link_speeds & RTE_ETH_LINK_SPEED_40G) - speed = RTE_ETH_SPEED_NUM_40G; - if (link_speeds & RTE_ETH_LINK_SPEED_50G) - speed = RTE_ETH_SPEED_NUM_50G; - if (link_speeds & RTE_ETH_LINK_SPEED_100G) - speed = RTE_ETH_SPEED_NUM_100G; - if (link_speeds & RTE_ETH_LINK_SPEED_200G) - speed = RTE_ETH_SPEED_NUM_200G; - - return speed; -} - -static uint8_t -hns3_get_link_duplex(uint32_t link_speeds) -{ - if ((link_speeds & RTE_ETH_LINK_SPEED_10M_HD) || - (link_speeds & RTE_ETH_LINK_SPEED_100M_HD)) - return RTE_ETH_LINK_HALF_DUPLEX; - else - return RTE_ETH_LINK_FULL_DUPLEX; -} - static int hns3_set_copper_port_link_speed(struct hns3_hw *hw, struct hns3_set_link_speed_cfg *cfg) @@ -4939,7 +4920,7 @@ hns3_set_fiber_port_link_speed(struct hns3_hw *hw, return 0; } - return hns3_cfg_mac_speed_dup(hw, cfg->speed, cfg->duplex); + return hns3_cfg_mac_speed_dup(hw, cfg->speed, cfg->lanes, cfg->duplex); } const char * @@ -4979,15 +4960,23 @@ hns3_set_port_link_speed(struct hns3_hw *hw, static int hns3_apply_link_speed(struct hns3_hw *hw) { + struct rte_eth_speed_capa_info capa_info = { 0 }; struct rte_eth_conf *conf = &hw->data->dev_conf; struct hns3_set_link_speed_cfg cfg; + int ret; memset(&cfg, 0, sizeof(struct hns3_set_link_speed_cfg)); cfg.autoneg = (conf->link_speeds == RTE_ETH_LINK_SPEED_AUTONEG) ? RTE_ETH_LINK_AUTONEG : RTE_ETH_LINK_FIXED; if (cfg.autoneg != RTE_ETH_LINK_AUTONEG) { - cfg.speed = hns3_get_link_speed(conf->link_speeds); - cfg.duplex = hns3_get_link_duplex(conf->link_speeds); + ret = rte_eth_speed_capa_to_info(conf->link_speeds, &capa_info); + if (ret) { + hns3_err(hw, "speed capability error, ret = %d", ret); + return ret; + } + cfg.speed = capa_info.speed; + cfg.lanes = capa_info.lanes; + cfg.duplex = capa_info.duplex; } return hns3_set_port_link_speed(hw, &cfg); diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 12d8299def..eae7f4bb12 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -168,6 +168,7 @@ struct hns3_set_link_speed_cfg { uint32_t speed; uint8_t duplex : 1; uint8_t autoneg : 1; + uint8_t lanes : 6; }; /* mac media type */ @@ -190,6 +191,7 @@ struct hns3_mac { uint8_t link_autoneg : 1; /* RTE_ETH_LINK_[AUTONEG/FIXED] */ uint8_t link_status : 1; /* RTE_ETH_LINK_[DOWN/UP] */ uint32_t link_speed; /* RTE_ETH_SPEED_NUM_ */ + uint8_t link_lanes; /* RTE_ETH_LANES_ */ /* * Some firmware versions support only the SFP speed query. In addition * to the SFP speed query, some firmware supports the query of the speed -- 2.33.0