net/axgbe: support sfp module EEPROM
PATCH 1/1 net/axgbe: support sfp module EEPROM
From: Amaranath Somalapuram <[email protected]>
Adding API for get_module_eeprom and get_module_info.
--- 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 | 107 +++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -18,3 +18,4 @@ Basic stats = Y Linux UIO = Y x86-32 = Y x86-64 = Y +Module EEPROM dump = Y
drivers/net/axgbe/axgbe_ethdev.c +2 -0
@@ -214,6 +214,8 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = { .dev_supported_ptypes_get = axgbe_dev_supported_ptypes_get, .rx_descriptor_status = axgbe_dev_rx_descriptor_status, .tx_descriptor_status = axgbe_dev_tx_descriptor_status, + .get_module_info = axgbe_get_module_info, + .get_module_eeprom = axgbe_get_module_eeprom, };static int axgbe_phy_reset (struct axgbe_port *pdata)
drivers/net/axgbe/axgbe_phy.h +4 -0
@@ -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 */
drivers/net/axgbe/axgbe_phy_impl.c +107 -0
131 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 5 lines · On 5/14/2020 2:43 PM, [email protected] wrote:
From: Amaranath Somalapuram <[email protected]>
Adding API for
get_module_eepromandget_module_info.Signed-off-by Amaranath Somalapuram <[email protected]>
Hi Amaranath,
I guess this is v3 of the patch, can you please use the version info and keep the all versions in same thread (using --in-reply-to), this helps us to trace the status or previous comments of the patch.
There are multiple change requests and comments to previous version, same seems sent in this version, can you please addresss them first?
http://inbox.dpdk.org/dev/[email protected]/
Quoted 12 lines
--- 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 | 107 +++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+)doc/guides/nics/features/axgbe.ini +0
-0
doc/guides/nics/features/axgbe.ini Basic stats = Y · line 21
Quoted 4 lines
doc/guides/nics/features/axgbe.ini +1
-0@@ -18,3 +18,4 @@ Basic stats = Y Linux UIO = Y x86-32 = Y x86-64 = Y +Module EEPROM dump = Y
Can you please add the items with same order as 'default.ini'
PATCH v4 1/1 net/axgbe: support sfp module EEPROM
From: Amaranath Somalapuram <[email protected]>
Adding API for get_module_eeprom and get_module_info.wq
--- 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(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +2 -0
@@ -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)
drivers/net/axgbe/axgbe_phy.h +4 -0
@@ -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 */
drivers/net/axgbe/axgbe_phy_impl.c +108 -0
126 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 99 lines · On 12/22/2020 7:01 AM, [email protected] wrote:
From: Amaranath Somalapuram <[email protected]>
Adding API for
get_module_eepromand get_module_info.wqSigned-off-by Amaranath Somalapuram <[email protected]>--- 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(+)doc/guides/nics/features/axgbe.ini +1
-0@@ -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 = Ydrivers/net/axgbe/axgbe_ethdev.c +2
-0@@ -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)drivers/net/axgbe/axgbe_phy.h +4
-0@@ -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 */ drivers/net/axgbe/axgbe_phy_impl.c +27
-0@@ -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 ;
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 773
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-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.
Quoted 21 lines
drivers/net/axgbe/axgbe_phy_impl.c +21
-0+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;
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 804
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-0+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.
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 813
Quoted 9 lines
drivers/net/axgbe/axgbe_phy_impl.c +9
-0+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.
Quoted 4 lines
drivers/net/axgbe/axgbe_phy_impl.c +4
-0+ + eeprom_addr =0 ; + ret = axgbe_phy_i2c_read(pdata, AXGBE_SFP_SERIAL_ID_ADDRESS, + &eeprom_addr, sizeof(eeprom_addr),
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 827
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-0+ &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.
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 837
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-0+ + 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.
Quoted 11 lines
drivers/net/axgbe/axgbe_phy_impl.c +7
-0+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;
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Monday, January 4, 2021 7:54 PM
To: Somalapuram, Amaranath <[email protected]>; [email protected]
Subject: Re: [PATCH v4] net/axgbe: support sfp module EEPROM
[CAUTION: External Email]
Quoted 101 lines · On 12/22/2020 7:01 AM, [email protected] wrote:
From: Amaranath Somalapuram <[email protected]>
Adding API for
get_module_eepromand get_module_info.wqSigned-off-by Amaranath Somalapuram <[email protected]>--- 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(+)doc/guides/nics/features/axgbe.ini +1
-0@@ -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 = Ydrivers/net/axgbe/axgbe_ethdev.c +2
-0@@ -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.hb/drivers/net/axgbe/axgbe_phy.hindex77ee20a31..d9d7fde41100644drivers/net/axgbe/axgbe_phy.h +4
-0@@ -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 */ drivers/net/axgbe/axgbe_phy_impl.c +26
-0@@ -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 ;
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 773
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-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.
I have used the reference code from i40e_ethdev.c and ixgbe_ethdev.c. let me know your inputs.
Quoted 20 lines
drivers/net/axgbe/axgbe_phy_impl.c +20
-0+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;
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 804
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-0+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. Agreed.
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 813
Quoted 9 lines
drivers/net/axgbe/axgbe_phy_impl.c +9
-0+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. Agreed.
Quoted 4 lines
drivers/net/axgbe/axgbe_phy_impl.c +4
-0+ + eeprom_addr =0 ; + ret = axgbe_phy_i2c_read(pdata, AXGBE_SFP_SERIAL_ID_ADDRESS, + &eeprom_addr, sizeof(eeprom_addr),
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 827
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-0+ &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. Agreed.
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 837
Quoted 11 lines
drivers/net/axgbe/axgbe_phy_impl.c +11
-0+ + 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. Agreed.
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 847
Quoted 11 lines
drivers/net/axgbe/axgbe_phy_impl.c +7
-0+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;
Please reply for the else case issue. I can resubmit. Other I will fix.
Quoted 125 lines · Amaranath
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Monday, January 4, 2021 7:54 PM
To: Somalapuram, Amaranath <[email protected]>; [email protected]
Subject: Re: [PATCH v4] net/axgbe: support sfp module EEPROM[CAUTION: External Email]
Quoted 101 lines · On 12/22/2020 7:01 AM, [email protected] wrote:
From: Amaranath Somalapuram <[email protected]>
Adding API for
get_module_eepromand get_module_info.wqSigned-off-by Amaranath Somalapuram <[email protected]>--- 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(+)doc/guides/nics/features/axgbe.ini +1
-0@@ -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 = Ydrivers/net/axgbe/axgbe_ethdev.c +2
-0@@ -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.hb/drivers/net/axgbe/axgbe_phy.hindex77ee20a31..d9d7fde41100644drivers/net/axgbe/axgbe_phy.h +4
-0@@ -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 */ drivers/net/axgbe/axgbe_phy_impl.c +26
-0@@ -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 ;drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 773
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-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.
Quoted 2 lines
I have used the reference code from
i40e_ethdev.candixgbe_ethdev.c. let me know your inputs.
I am not sure what exactly you are referencing in i40e & ixgbe, as far as I can see there is no similar usage on them, if there is please show it to me.
Above issue is, what if "sfp_eeprom.extd[AXGBE_SFP_EXTD_SFF_8472] == 0xff", what will happen in that case? As far as I can see in that case function returns success, but the 'modinfo' is not updated at all, am I missing something?
Quoted 15 lines
Quoted 15 lines
drivers/net/axgbe/axgbe_phy_impl.c +15
-0+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; +} +
<...>
PATCH v5 1/1 net/axgbe: support sfp module EEPROM
In reply to [email protected]From: Amaranath Somalapuram <[email protected]>
Adding API for get_module_eeprom and get_module_info.
--- 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 | 114 +++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +2 -0
@@ -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)
drivers/net/axgbe/axgbe_phy.h +4 -0
@@ -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 */
drivers/net/axgbe/axgbe_phy_impl.c +114 -0
132 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 107 lines · On 1/12/2021 5:28 AM, [email protected] wrote:
From: Amaranath Somalapuram <[email protected]>
Adding API for
get_module_eepromandget_module_info.Signed-off-by Amaranath Somalapuram <[email protected]>--- 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 | 114 +++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+)doc/guides/nics/features/axgbe.ini +1
-0@@ -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 = Ydrivers/net/axgbe/axgbe_ethdev.c +2
-0@@ -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)drivers/net/axgbe/axgbe_phy.h +4
-0@@ -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 */ drivers/net/axgbe/axgbe_phy_impl.c +35
-0@@ -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,114 @@ 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; + }
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 781
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-0+ +if (sfp_eeprom.extd[AXGBE_SFP_EXTD_SFF_8472 ] !=0xff ) { +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 { + ret = -EIO ; + goto put; + } + }
The issue mentioned is still valid, can you please check comment in the previous version(s).
Quoted 51 lines
drivers/net/axgbe/axgbe_phy_impl.c +51
-0+ +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; + +if (!info || !info->length || !info->data) { +axgbe_phy_put_comm_ownership (pdata); +return -EINVAL ; + } + + 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; + } + + data = info->data; + +/* for AXGBE_SFP_SERIAL_ID_ADDRESS */ +if (info->length >AXGBE_SFP_EEPROM_PAGE_SIZE ) +for (i =0 ; i <AXGBE_SFP_EEPROM_PAGE_SIZE ; i++) + data[i] = sfp_eeprom.base[i]; +
drivers/net/axgbe/axgbe_phy_impl.c static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) · line 842
Quoted 10 lines
drivers/net/axgbe/axgbe_phy_impl.c +10
-0+ 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 */ +if (info->length >AXGBE_SFP_EEPROM_PAGE_SIZE ) +for (i =0 ; i < info->length -AXGBE_SFP_EEPROM_PAGE_SIZE ; i++) + data[i +AXGBE_SFP_EEPROM_PAGE_SIZE ] = + sfp_eeprom.base[i];
The second page can be written partially, isn't this a problem?
Quoted 12 lines
drivers/net/axgbe/axgbe_phy_impl.c +8
-0+ +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;