lkml.org 
[lkml]   [2019]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 46/53] net/mlx5e: ethtool, Remove unsupported SFP EEPROM high pages query
    Date
    From: Erez Alfasi <ereza@mellanox.com>

    [ Upstream commit ace329f4ab3ba434be2adf618073c752d083b524 ]

    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: bb64143eee8c ("net/mlx5e: Add ethtool support for dump module EEPROM")
    Signed-off-by: Erez Alfasi <ereza@mellanox.com>
    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +-
    drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 ----
    2 files changed, 1 insertion(+), 5 deletions(-)

    --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
    @@ -1622,7 +1622,7 @@ static int mlx5e_get_module_info(struct
    break;
    case MLX5_MODULE_ID_SFP:
    modinfo->type = ETH_MODULE_SFF_8472;
    - modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
    + modinfo->eeprom_len = MLX5_EEPROM_PAGE_LENGTH;
    break;
    default:
    netdev_err(priv->netdev, "%s: cable type not recognized:0x%x\n",
    --- a/drivers/net/ethernet/mellanox/mlx5/core/port.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c
    @@ -392,10 +392,6 @@ int mlx5_query_module_eeprom(struct mlx5
    size -= offset + size - MLX5_EEPROM_PAGE_LENGTH;

    i2c_addr = MLX5_I2C_ADDR_LOW;
    - if (offset >= MLX5_EEPROM_PAGE_LENGTH) {
    - i2c_addr = MLX5_I2C_ADDR_HIGH;
    - offset -= MLX5_EEPROM_PAGE_LENGTH;
    - }

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

    \
     
     \ /
      Last update: 2019-04-30 14:05    [W:4.905 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site