From patchwork Tue Apr 13 13:47:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 91251 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 62F4BA0524; Tue, 13 Apr 2021 15:47:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E7BF160FC8; Tue, 13 Apr 2021 15:47:08 +0200 (CEST) Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by mails.dpdk.org (Postfix) with ESMTP id AFA86160FBC for ; Tue, 13 Apr 2021 15:47:06 +0200 (CEST) Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4FKRgY3hBZzlXpf for ; Tue, 13 Apr 2021 21:45:13 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.498.0; Tue, 13 Apr 2021 21:47:00 +0800 From: "Min Hu (Connor)" To: CC: Date: Tue, 13 Apr 2021 21:47:11 +0800 Message-ID: <1618321639-57642-2-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 X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH 1/9] net/hns3: fix supported speed of copper ports 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 Sender: "dev" From: Huisong Li The "supported" obtaining from firmware on copper ports includes the speed capability, auto-negotiation capability, and flow control capability. Therefore, this patch changes "supported_capa" to "supported_speed" and parses the speed capability supported by the driver from the "supported". Fixes: 2e4859f3b362 ("net/hns3: support PF device with copper PHYs") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 11 +++++++---- drivers/net/hns3/hns3_ethdev.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 846e5a2..d7766e1 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4612,7 +4612,10 @@ hns3_update_fiber_link_info(struct hns3_hw *hw) static void hns3_parse_copper_phy_params(struct hns3_cmd_desc *desc, struct hns3_mac *mac) { +#define HNS3_PHY_SUPPORTED_SPEED_MASK 0x2f + struct hns3_phy_params_bd0_cmd *req; + uint32_t supported; req = (struct hns3_phy_params_bd0_cmd *)desc[0].data; mac->link_speed = rte_le_to_cpu_32(req->speed); @@ -4620,11 +4623,11 @@ hns3_parse_copper_phy_params(struct hns3_cmd_desc *desc, struct hns3_mac *mac) HNS3_PHY_DUPLEX_CFG_B); mac->link_autoneg = hns3_get_bit(req->autoneg, HNS3_PHY_AUTONEG_CFG_B); - mac->supported_capa = rte_le_to_cpu_32(req->supported); mac->advertising = rte_le_to_cpu_32(req->advertising); mac->lp_advertising = rte_le_to_cpu_32(req->lp_advertising); - mac->support_autoneg = !!(mac->supported_capa & - HNS3_PHY_LINK_MODE_AUTONEG_BIT); + supported = rte_le_to_cpu_32(req->supported); + mac->supported_speed = supported & HNS3_PHY_SUPPORTED_SPEED_MASK; + mac->support_autoneg = !!(supported & HNS3_PHY_LINK_MODE_AUTONEG_BIT); } static int @@ -4673,7 +4676,7 @@ hns3_update_copper_link_info(struct hns3_hw *hw) mac->link_speed = mac_info.link_speed; mac->link_duplex = mac_info.link_duplex; mac->link_autoneg = mac_info.link_autoneg; - mac->supported_capa = mac_info.supported_capa; + mac->supported_speed = mac_info.supported_speed; mac->advertising = mac_info.advertising; mac->lp_advertising = mac_info.lp_advertising; mac->support_autoneg = mac_info.support_autoneg; diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 72d718c..cbeadc0 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -183,7 +183,7 @@ struct hns3_mac { uint8_t link_autoneg : 1; /* ETH_LINK_[AUTONEG/FIXED] */ uint8_t link_status : 1; /* ETH_LINK_[DOWN/UP] */ uint32_t link_speed; /* ETH_SPEED_NUM_ */ - uint32_t supported_capa; /* supported capability for current media */ + uint32_t supported_speed; /* supported speed for current media type */ uint32_t advertising; /* advertised capability in the local part */ /* advertised capability in the link partner */ uint32_t lp_advertising;