From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (xvm-189-124.dc0.ghst.net [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EBB7CA09FF; Mon, 4 Jan 2021 15:24:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F6F7160733; Mon, 4 Jan 2021 15:24:02 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 536D1160722 for ; Mon, 4 Jan 2021 15:24:00 +0100 (CET) IronPort-SDR: X7sbhRKHlMzEDn3FOMIcdfd6+xa1PDSgWK6V11U7Ix+9XoJlhtOqxYNFn0xwfSElB0m5voyr18 dMxQfVgJto0A== X-IronPort-AV: E=McAfee;i="6000,8403,9853"; a="195481821" X-IronPort-AV: E=Sophos;i="5.78,474,1599548400"; d="scan'208";a="195481821" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2021 06:23:59 -0800 IronPort-SDR: aDIlYGVpqAQ1tdHCcJVuJzxhiQ9hwAr+xiOIM7/Fgc1C49ci/lATVlaqixJpvt39s7hwXKjbY6 i13UFNNprkGg== X-IronPort-AV: E=Sophos;i="5.78,474,1599548400"; d="scan'208";a="378440582" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.251.93.148]) ([10.251.93.148]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2021 06:23:58 -0800 To: asomalap@amd.com, dev@dpdk.org References: <20201222070157.521188-1-asomalap@amd.com> From: Ferruh Yigit Message-ID: <0466be3c-1017-4416-b737-11f603ede7e2@intel.com> Date: Mon, 4 Jan 2021 14:23:54 +0000 MIME-Version: 1.0 In-Reply-To: <20201222070157.521188-1-asomalap@amd.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH v4] net/axgbe: support sfp module EEPROM 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" On 12/22/2020 7:01 AM, asomalap@amd.com wrote: > From: Amaranath Somalapuram > > Adding API for get_module_eeprom and get_module_info.wq > > Signed-off-by: Amaranath Somalapuram > --- > doc/guides/nics/features/axgbe.ini | 1 + > drivers/net/axgbe/axgbe_ethdev.c | 2 + > drivers/net/axgbe/axgbe_phy.h | 4 ++ > drivers/net/axgbe/axgbe_phy_impl.c | 108 +++++++++++++++++++++++++++++ > 4 files changed, 115 insertions(+) > > diff --git a/doc/guides/nics/features/axgbe.ini b/doc/guides/nics/features/axgbe.ini > index 34df0d1ee..3a090183e 100644 > --- a/doc/guides/nics/features/axgbe.ini > +++ b/doc/guides/nics/features/axgbe.ini > @@ -17,6 +17,7 @@ CRC offload = Y > L3 checksum offload = Y > L4 checksum offload = Y > Basic stats = Y > +Module EEPROM dump = Y > Linux UIO = Y > x86-32 = Y > x86-64 = Y > diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c > index cfe6aba73..22e05e8cb 100644 > --- a/drivers/net/axgbe/axgbe_ethdev.c > +++ b/drivers/net/axgbe/axgbe_ethdev.c > @@ -257,6 +257,8 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = { > .timesync_adjust_time = axgbe_timesync_adjust_time, > .timesync_read_time = axgbe_timesync_read_time, > .timesync_write_time = axgbe_timesync_write_time, > + .get_module_info = axgbe_get_module_info, > + .get_module_eeprom = axgbe_get_module_eeprom, > }; > > static int axgbe_phy_reset(struct axgbe_port *pdata) > diff --git a/drivers/net/axgbe/axgbe_phy.h b/drivers/net/axgbe/axgbe_phy.h > index 77ee20a31..d9d7fde41 100644 > --- a/drivers/net/axgbe/axgbe_phy.h > +++ b/drivers/net/axgbe/axgbe_phy.h > @@ -188,5 +188,9 @@ > #define DUPLEX_FULL 0x01 > #define DUPLEX_UNKNOWN 0xff > > +int axgbe_get_module_info(struct rte_eth_dev *dev, > + struct rte_eth_dev_module_info *modinfo); > +int axgbe_get_module_eeprom(struct rte_eth_dev *dev, > + struct rte_dev_eeprom_info *info); > #endif > /* PHY */ > diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c > index 02236ec19..af18a8d51 100644 > --- a/drivers/net/axgbe/axgbe_phy_impl.c > +++ b/drivers/net/axgbe/axgbe_phy_impl.c > @@ -141,12 +141,18 @@ enum axgbe_sfp_speed { > > #define AXGBE_SFP_EXTD_CC 31 > > +#define AXGBE_SFP_EEPROM_PAGE_SIZE 256 > + > struct axgbe_sfp_eeprom { > u8 base[64]; > u8 extd[32]; > u8 vendor[32]; > }; > > +struct axgbe_sfp_eeprom_module { > + u8 base[AXGBE_SFP_EEPROM_PAGE_SIZE]; > +}; > + > #define AXGBE_BEL_FUSE_VENDOR "BEL-FUSE" > #define AXGBE_BEL_FUSE_PARTNO "1GBT-SFP06" > > @@ -734,6 +740,108 @@ static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) > return ret; > } > > +int axgbe_get_module_info(struct rte_eth_dev *dev, > + struct rte_eth_dev_module_info *modinfo) > +{ > + struct axgbe_port *pdata = dev->data->dev_private; > + struct axgbe_sfp_eeprom sfp_eeprom; > + uint8_t eeprom_addr; > + int ret; > + > + ret = axgbe_phy_get_comm_ownership(pdata); > + > + if (ret) > + return -EIO; > + > + ret = axgbe_phy_sfp_get_mux(pdata); > + > + if (ret) { > + PMD_DRV_LOG(ERR, "I2C error setting SFP MUX\n"); > + goto put; > + } > + > + eeprom_addr = 0; > + ret = axgbe_phy_i2c_read(pdata, AXGBE_SFP_SERIAL_ID_ADDRESS, > + &eeprom_addr, sizeof(eeprom_addr), > + &sfp_eeprom, sizeof(sfp_eeprom)); > + > + if (ret) { > + PMD_DRV_LOG(ERR, "I2C error reading SFP EEPROM\n"); > + goto put; > + } > + > + if (sfp_eeprom.extd[AXGBE_SFP_EXTD_SFF_8472] != 0xff) { The 'else' case of this check seems wrong, which returns success but doesn't set modinfo correctly. > + if (sfp_eeprom.extd[AXGBE_SFP_EXTD_SFF_8472] == 0) { > + modinfo->type = RTE_ETH_MODULE_SFF_8079; > + modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8079_LEN; > + } else { > + modinfo->type = RTE_ETH_MODULE_SFF_8472; > + modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8472_LEN; > + } > + } > + > +put: > + axgbe_phy_sfp_put_mux(pdata); > + axgbe_phy_put_comm_ownership(pdata); > + return ret; > +} > + > +int axgbe_get_module_eeprom(struct rte_eth_dev *dev, > + struct rte_dev_eeprom_info *info) > +{ > + struct axgbe_port *pdata = dev->data->dev_private; > + struct axgbe_sfp_eeprom_module sfp_eeprom; > + uint8_t eeprom_addr; > + uint8_t *data; > + uint32_t i; > + int ret; > + > + ret = axgbe_phy_get_comm_ownership(pdata); > + > + if (ret) > + return -EIO; > + > + if (!info || !info->length || !info->data) { Up to you but it may be easier to verify the input and fail before taking the ownership of the device first. > + axgbe_phy_put_comm_ownership(pdata); > + return -EINVAL; > + } > + > + ret = axgbe_phy_sfp_get_mux(pdata); > + if (ret) { > + PMD_DRV_LOG(ERR, "I2C error setting SFP MUX\n"); > + goto put; > + } Just a syntax issue, some lines has an empty line between 'ret' assignment and 'ret' check, but some does not (as above), can you please make it consistent. > + > + eeprom_addr = 0; > + ret = axgbe_phy_i2c_read(pdata, AXGBE_SFP_SERIAL_ID_ADDRESS, > + &eeprom_addr, sizeof(eeprom_addr), > + &sfp_eeprom, sizeof(sfp_eeprom)); > + if (ret) { > + PMD_DRV_LOG(ERR, "I2C error reading SFP EEPROM\n"); > + goto put; > + } > + data = info->data; > + > + /* for AXGBE_SFP_SERIAL_ID_ADDRESS */ > + for (i = 0; i < AXGBE_SFP_EEPROM_PAGE_SIZE; i++) > + data[i] = sfp_eeprom.base[i]; Should check if 'info->length' > 'AXGBE_SFP_SERIAL_ID_ADDRESS' before above assignment. > + > + eeprom_addr = 0; > + ret = axgbe_phy_i2c_read(pdata, AXGBE_SFP_DIAG_INFO_ADDRESS, > + &eeprom_addr, sizeof(eeprom_addr), > + &sfp_eeprom, sizeof(sfp_eeprom)); > + > + /* for AXGBE_SFP_DIAG_INFO_ADDRESS */ > + for (i = 0; i < info->length - AXGBE_SFP_EEPROM_PAGE_SIZE; i++) > + data[i + AXGBE_SFP_EEPROM_PAGE_SIZE] = sfp_eeprom.base[i]; > + Will it be acceptable if the loop break in the middle because of missing space, "i < info->length - AXGBE_SFP_EEPROM_PAGE_SIZE"? If not, size needs to be checked before the loop. > +put: > + axgbe_phy_sfp_put_mux(pdata); > + axgbe_phy_put_comm_ownership(pdata); > + return ret; > +} > + > + > static void axgbe_phy_sfp_signals(struct axgbe_port *pdata) > { > struct axgbe_phy_data *phy_data = pdata->phy_data; >