From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B60ECD98E1 for ; Tue, 16 Jun 2026 12:22:52 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D6AE4410D2; Tue, 16 Jun 2026 14:21:47 +0200 (CEST) Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) by mails.dpdk.org (Postfix) with ESMTP id 6BB96410D2; Tue, 16 Jun 2026 14:21:44 +0200 (CEST) X-QQ-mid: esmtpsz20t1781612500t28e6c77d X-QQ-Originating-IP: lXvIfsh1cz7wLYpRCHjwxJuDwydURQsi4AKZ2hJRtdE= Received: from DSK-zaiyuwang.trustnetic.com ( [183.157.22.210]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 16 Jun 2026 20:21:38 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 5377110301766326410 EX-QQ-RecipientCnt: 4 From: Zaiyu Wang To: dev@dpdk.org Cc: Zaiyu Wang , stable@dpdk.org, Jiawen Wu Subject: [PATCH v6 17/21] net/txgbe: fix get module info operation Date: Tue, 16 Jun 2026 20:20:25 +0800 Message-Id: <20260616122030.9688-18-zaiyuwang@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20260616122030.9688-1-zaiyuwang@trustnetic.com> References: <20260423034024.14404-1-zaiyuwang@trustnetic.com> <20260616122030.9688-1-zaiyuwang@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: esmtpsz:trustnetic.com:qybglogicsvrsz:qybglogicsvrsz3b-0 X-QQ-XMAILINFO: MVbvI5amSZ2YM59QHLNc3xCPvaXSh3qvtLHSHIOUG7wTcT0Zm6klhB0B 7NYtlV3QMH+pmuonvnAcNNBq7rFs9a/daPgL/E7CtrId56Ff87c8WHpuW0EhvrqSidZlrme DPQsa4MRAl2SRTOvy9B8pXejIzi5kvHG6AIUEdzfo+vOe07seol9Njs25A4qbCOQnrTGqIt fvkS3z+P0d7L1RVwK8Cye9YNfKLS55UEdvAnmbmYYTnLcbNHPluLeqAtj8BAZuk0xBzpXYH P5Qydc4V4RweDljgWoTjR0PCrzihoA9Z3WOLJIKNjuYeouA2HtSzcncYhyFvNwABwO1Mei7 DgGbbMrJBgH8rLwOh+zyVMfkVYIik3wCFF8GZTPLwx4kpICMk3A0dx1NkJQQBlYIewY1OHP NRD1VzeckTdQ5x+kI5+xZzRmNUAZ38qRxQejoo0iNCjz/7Yb0jbdKJPPytAd1qf+jiw6n+9 ItUwlrYMZMtpy2ChXP25Mm2EOIdpT5P/37vRu+NFkIrh+wfOTt2VYVPU4MnfN4TLQRoOZkv 9phcKVLuLtm6MCJ7RPFvHQ8OTWLlSVJtZ7473ZRJzj+Jo2SOssG9h1v6oIlinHQ68iBaB4S 853zXYjSFwxfqjxMSeutrKHxobTvR9H4IY9+aaR8/9zgITglnZyiXOtvoL8sBQrnB9ilJ9A Ax0ac6UBBzZIM2X8NYgzIUK3IZb02rYgWxjG/hy9CJ8DQ4RQ7jXLQWfryng2c0QtR4ufH6/ wSD1IpUe5TdL2z4c8tu2F4ddjPZ8hqDAKvYmOHKJaGweJzh47oeXN8y3kMUprtZMwTgIwSi j5J0tmpV+1a4l5lY7YMhXuOM7gKuwOTBmNbF9G3sfb8ZtCHtkobUO5aJXSWtt3JXOxr/syP In1dHEebgDFpwChrfqqzR8aUK4phk0vdnQy+3X2biXjovmMD6Szpb0yceXgje4w1er5xmYD vAdQqNoSMLCEO8Cd3bcC7DizmMKcbkiWI0G8E0sbUxvK5lNJmt6lawSGmdzrN6aVibAFGgF fbG9DEA0fZA7Nsj1Vw3lXwSaqsl2pS0/2RpQ7GiEpiKADsUVrsa1TLPx69d93sQRsg2iSSi nvgpfY6PAN5qWxvNZ1SBek= X-QQ-XMRINFO: MSVp+SPm3vtSI1QTLgDHQqIV1w2oNKDqfg== X-QQ-RECHKSPAM: 0 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 The original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info. Fixes: abf042d32b39 ("net/txgbe: add Amber-Lite 25G/40G NICs") Cc: stable@dpdk.org Signed-off-by: Zaiyu Wang --- drivers/net/txgbe/base/txgbe_phy.h | 6 +- drivers/net/txgbe/txgbe_ethdev.c | 118 +++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 26 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_phy.h b/drivers/net/txgbe/base/txgbe_phy.h index 20c80d9d88..31bdceb35b 100644 --- a/drivers/net/txgbe/base/txgbe_phy.h +++ b/drivers/net/txgbe/base/txgbe_phy.h @@ -258,10 +258,14 @@ #define TXGBE_SFF_CABLE_DA_ACTIVE 0x8 #define TXGBE_SFF_CABLE_SPEC_COMP 0x3C #define TXGBE_SFF_SFF_8472_SWAP 0x5C +#define TXGBE_SFF_DDM_IMPLEMENTED 0x40 #define TXGBE_SFF_SFF_8472_COMP 0x5E #define TXGBE_SFF_SFF_8472_OSCB 0x6E #define TXGBE_SFF_SFF_8472_ESCB 0x76 -#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_SFF_REVISION_ADDR 0x01 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F + +#define TXGBE_MODULE_QSFP_MAX_LEN 640 #define TXGBE_SFF_IDENTIFIER_QSFP 0x0C #define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index f1119cf6f8..c34635c50a 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -5348,41 +5348,109 @@ txgbe_get_module_info(struct rte_eth_dev *dev, struct txgbe_hw *hw = TXGBE_DEV_HW(dev); uint32_t status; uint8_t sff8472_rev, addr_mode; + uint8_t identifier; + uint8_t sff8636_rev; bool page_swap = false; + uint32_t value; - /* Check whether we support SFF-8472 or not */ - status = hw->phy.read_i2c_eeprom(hw, - TXGBE_SFF_SFF_8472_COMP, - &sff8472_rev); - if (status != 0) - return -EIO; + if (hw->mac.type == txgbe_mac_aml40) { + value = rd32(hw, TXGBE_GPIOEXT); + if (value & TXGBE_SFP1_MOD_PRST_LS) { + PMD_DRV_LOG(WARNING, "QSFP module not present, cannot get module info."); + return -EINVAL; + } + } + + if (hw->mac.type == txgbe_mac_aml) { + value = rd32(hw, TXGBE_GPIOEXT); + if (value & TXGBE_SFP1_MOD_ABS_LS) { + PMD_DRV_LOG(WARNING, "SFP module not present, cannot get module info."); + return -EINVAL; + } + } - /* addressing mode is not supported */ - status = hw->phy.read_i2c_eeprom(hw, - TXGBE_SFF_SFF_8472_SWAP, - &addr_mode); + status = hw->mac.acquire_swfw_sync(hw, TXGBE_MNGSEM_SWPHY); if (status != 0) - return -EIO; + return -EBUSY; - if (addr_mode & TXGBE_SFF_ADDRESSING_MODE) { - PMD_DRV_LOG(ERR, - "Address change required to access page 0xA2, " - "but not supported. Please report the module " - "type to the driver maintainers."); - page_swap = true; + if (hw->mac.type == txgbe_mac_aml40) { + status = hw->phy.read_i2c_sff8636(hw, 0, + TXGBE_SFF_IDENTIFIER, + &identifier); + } else { + status = hw->phy.read_i2c_eeprom(hw, + TXGBE_SFF_IDENTIFIER, + &identifier); } - if (sff8472_rev == TXGBE_SFF_SFF_8472_UNSUP || page_swap) { - /* We have a SFP, but it does not support SFF-8472 */ - modinfo->type = RTE_ETH_MODULE_SFF_8079; - modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8079_LEN; - } else { - /* We have a SFP which supports a revision of SFF-8472. */ - modinfo->type = RTE_ETH_MODULE_SFF_8472; - modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8472_LEN; + if (status != 0) + goto ERROR_IO; + + switch (identifier) { + case TXGBE_SFF_IDENTIFIER_SFP: + /* Check whether we support SFF-8472 or not */ + status = hw->phy.read_i2c_eeprom(hw, + TXGBE_SFF_SFF_8472_COMP, + &sff8472_rev); + if (status != 0) + goto ERROR_IO; + + /* addressing mode is not supported */ + status = hw->phy.read_i2c_eeprom(hw, + TXGBE_SFF_SFF_8472_SWAP, + &addr_mode); + if (status != 0) + goto ERROR_IO; + + if (addr_mode & TXGBE_SFF_ADDRESSING_MODE) { + PMD_DRV_LOG(ERR, + "Address change required to access page 0xA2, " + "but not supported. Please report the module " + "type to the driver maintainers."); + page_swap = true; + } + + if (sff8472_rev == TXGBE_SFF_SFF_8472_UNSUP || page_swap || + !(addr_mode & TXGBE_SFF_DDM_IMPLEMENTED)) { + /* We have a SFP, but it does not support SFF-8472 */ + modinfo->type = RTE_ETH_MODULE_SFF_8079; + modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8079_LEN; + } else { + /* We have a SFP which supports a revision of SFF-8472. */ + modinfo->type = RTE_ETH_MODULE_SFF_8472; + modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8472_LEN; + } + break; + case TXGBE_SFF_IDENTIFIER_QSFP: + case TXGBE_SFF_IDENTIFIER_QSFP_PLUS: + status = hw->phy.read_i2c_sff8636(hw, 0, + TXGBE_SFF_SFF_REVISION_ADDR, + &sff8636_rev); + if (status != 0) + goto ERROR_IO; + /* Check revision compliance */ + if (sff8636_rev > 0x02) { + /* Module is SFF-8636 compliant */ + modinfo->type = RTE_ETH_MODULE_SFF_8636; + modinfo->eeprom_len = TXGBE_MODULE_QSFP_MAX_LEN; + } else { + modinfo->type = RTE_ETH_MODULE_SFF_8436; + modinfo->eeprom_len = TXGBE_MODULE_QSFP_MAX_LEN; + } + break; + default: + PMD_DRV_LOG(ERR, "SFF Module Type not recognized, identifier=0x%x", identifier); + hw->mac.release_swfw_sync(hw, TXGBE_MNGSEM_SWPHY); + return -EINVAL; } + hw->mac.release_swfw_sync(hw, TXGBE_MNGSEM_SWPHY); return 0; + +ERROR_IO: + PMD_DRV_LOG(ERR, "I2C IO ERROR."); + hw->mac.release_swfw_sync(hw, TXGBE_MNGSEM_SWPHY); + return -EIO; } static int -- 2.21.0.windows.1