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 21A9342CAC; Wed, 14 Jun 2023 04:37:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B10AB42D3F; Wed, 14 Jun 2023 04:37:12 +0200 (CEST) Received: from smtpbguseast1.qq.com (smtpbguseast1.qq.com [54.204.34.129]) by mails.dpdk.org (Postfix) with ESMTP id 076E64161A; Wed, 14 Jun 2023 04:37:09 +0200 (CEST) X-QQ-mid: bizesmtp73t1686710226tro16yvd Received: from wxdbg.localdomain.com ( [183.159.171.58]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 14 Jun 2023 10:37:05 +0800 (CST) X-QQ-SSF: 01400000000000J0Z000000A0000000 X-QQ-FEAT: r/cTxDoDoiG5iGsbgxDwetS+0x4gBTlBJA/c8W/emi8wUa6+50X5GB5Bofk8w Yxqvb6B4iv08R27injh0C2BZdrs9tu8rgDppl/zlgIGWPkX9z2aBn8mx+AF04y9Hh+CocV/ M33Qn7LkXu8sxCurv6IAfyaws6EZHdr+j/pEehVMovp0rQwyUvAdUEz3Ddu49cU21I9w53I /M2swXaNei7+SmqvREkp2tfQswsuZCbxFZiwnaizMVpERJ+i0v9o+cASo2Y7Pnmz16f9OsE o/zdLMNbCTQnUFHNq78m644f9MzUHWnCuGgiksekrcvgbMXGvBB5BkI4cyQaxWsGlXpmCJa 4dIazNDn0HWg/WZ+hIEhK3R/z78yhnVhV4EJBlcTRmH2RfMu2XPV1ImUm7pxV+MryJJWcmV X-QQ-GoodBg: 2 X-BIZMAIL-ID: 16049203608549177296 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH 4/9] net/txgbe: fix to set autoneg for 1G speed Date: Wed, 14 Jun 2023 10:34:24 +0800 Message-Id: <20230614023429.1002071-5-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230614023429.1002071-1-jiawenwu@trustnetic.com> References: <20230614023429.1002071-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz5a-1 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 Autoneg was always on for 1G speed, fix to set autoneg off. Fixes: 01c3cf5c85a7 ("net/txgbe: add autoneg control read and write") Fixes: e4c515a7bc7e ("net/txgbe: add multi-speed link setup") Cc: stable@dpdk.org Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_hw.c | 14 ++++++++++++++ drivers/net/txgbe/base/txgbe_phy.c | 4 +++- drivers/net/txgbe/base/txgbe_type.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/base/txgbe_hw.c b/drivers/net/txgbe/base/txgbe_hw.c index 2952c408fd..d19fd0065d 100644 --- a/drivers/net/txgbe/base/txgbe_hw.c +++ b/drivers/net/txgbe/base/txgbe_hw.c @@ -2273,10 +2273,24 @@ s32 txgbe_setup_mac_link_multispeed_fiber(struct txgbe_hw *hw, } if (speed & TXGBE_LINK_SPEED_1GB_FULL) { + u32 curr_autoneg; + speedcnt++; if (highest_link_speed == TXGBE_LINK_SPEED_UNKNOWN) highest_link_speed = TXGBE_LINK_SPEED_1GB_FULL; + status = hw->mac.check_link(hw, &link_speed, &link_up, false); + if (status != 0) + return status; + + /* If we already have link at this speed, just jump out */ + if (link_speed == TXGBE_LINK_SPEED_1GB_FULL) { + curr_autoneg = rd32_epcs(hw, SR_MII_MMD_CTL); + if (link_up && (hw->autoneg == + !!(curr_autoneg & SR_MII_MMD_CTL_AN_EN))) + goto out; + } + /* Set the module link speed */ switch (hw->phy.media_type) { case txgbe_media_type_fiber: diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c index 1eb45b068a..d87af656d5 100644 --- a/drivers/net/txgbe/base/txgbe_phy.c +++ b/drivers/net/txgbe/base/txgbe_phy.c @@ -1402,7 +1402,9 @@ txgbe_set_sgmii_an37_ability(struct txgbe_hw *hw) wr32_epcs(hw, SR_MII_MMD_AN_CTL, 0x0105); wr32_epcs(hw, SR_MII_MMD_DIGI_CTL, 0x0200); value = rd32_epcs(hw, SR_MII_MMD_CTL); - value = (value & ~0x1200) | (0x1 << 12) | (0x1 << 9); + value = (value & ~0x1200) | (0x1 << 9); + if (hw->autoneg) + value |= SR_MII_MMD_CTL_AN_EN; wr32_epcs(hw, SR_MII_MMD_CTL, value); } diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h index c3486b472f..75e839b7de 100644 --- a/drivers/net/txgbe/base/txgbe_type.h +++ b/drivers/net/txgbe/base/txgbe_type.h @@ -783,6 +783,7 @@ struct txgbe_hw { bool allow_unsupported_sfp; bool need_crosstalk_fix; bool dev_start; + bool autoneg; struct txgbe_devargs devarg; uint64_t isb_dma; diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 36c74d353d..962667acdc 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1821,6 +1821,7 @@ txgbe_dev_start(struct rte_eth_dev *dev) speed = (TXGBE_LINK_SPEED_100M_FULL | TXGBE_LINK_SPEED_1GB_FULL | TXGBE_LINK_SPEED_10GB_FULL); + hw->autoneg = true; } else { if (*link_speeds & RTE_ETH_LINK_SPEED_10G) speed |= TXGBE_LINK_SPEED_10GB_FULL; @@ -1832,6 +1833,7 @@ txgbe_dev_start(struct rte_eth_dev *dev) speed |= TXGBE_LINK_SPEED_1GB_FULL; if (*link_speeds & RTE_ETH_LINK_SPEED_100M) speed |= TXGBE_LINK_SPEED_100M_FULL; + hw->autoneg = false; } err = hw->mac.setup_link(hw, speed, link_up); -- 2.27.0