Skip to content

Commit ace329f

Browse files
erezamellanoxSaeed Mahameed
authored andcommitted
net/mlx5e: ethtool, Remove unsupported SFP EEPROM high pages query
Querying EEPROM high pages data for SFP module is currently not supported by our driver and yet queried, resulting in invalid FW queries. Set the EEPROM ethtool data length to 256 for SFP module will limit the reading for page 0 only and prevent invalid FW queries. Fixes: bb64143 ("net/mlx5e: Add ethtool support for dump module EEPROM") Signed-off-by: Erez Alfasi <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent d460c27 commit ace329f

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1586,7 +1586,7 @@ static int mlx5e_get_module_info(struct net_device *netdev,
15861586
break;
15871587
case MLX5_MODULE_ID_SFP:
15881588
modinfo->type = ETH_MODULE_SFF_8472;
1589-
modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
1589+
modinfo->eeprom_len = MLX5_EEPROM_PAGE_LENGTH;
15901590
break;
15911591
default:
15921592
netdev_err(priv->netdev, "%s: cable type not recognized:0x%x\n",

drivers/net/ethernet/mellanox/mlx5/core/port.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,6 @@ int mlx5_query_module_eeprom(struct mlx5_core_dev *dev,
317317
size -= offset + size - MLX5_EEPROM_PAGE_LENGTH;
318318

319319
i2c_addr = MLX5_I2C_ADDR_LOW;
320-
if (offset >= MLX5_EEPROM_PAGE_LENGTH) {
321-
i2c_addr = MLX5_I2C_ADDR_HIGH;
322-
offset -= MLX5_EEPROM_PAGE_LENGTH;
323-
}
324320

325321
MLX5_SET(mcia_reg, in, l, 0);
326322
MLX5_SET(mcia_reg, in, module, module_num);

0 commit comments

Comments
 (0)