Patch "mlxsw: spectrum: Fix EEPROM access in case of SFP/SFP+" has been added to the 4.13-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
mlxsw: spectrum: Fix EEPROM access in case of SFP/SFP+
to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mlxsw-spectrum-fix-eeprom-access-in-case-of-sfp-sfp.patch
and it can be found in the queue-4.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Oct 9 09:32:35 CEST 2017
From: Arkadi Sharshevsky <[email protected]>
Date: Mon, 11 Sep 2017 09:42:26 +0200
Subject: mlxsw: spectrum: Fix EEPROM access in case of SFP/SFP+
From: Arkadi Sharshevsky <[email protected]>
[ Upstream commit 4400081b631af69abc63cea3352680e3d85e0c39 ]
The current code does not handle correctly the access to the upper page in case of SFP/SFP+ EEPROM. In that case the offset should be local and the I2C address should be changed.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +17 -2
@@ -2519,7 +2519,9 @@ out:return err; } -#define MLXSW_SP_QSFP_I2C_ADDR 0x50 +#define MLXSW_SP_I2C_ADDR_LOW 0x50 +#define MLXSW_SP_I2C_ADDR_HIGH 0x51 +#define MLXSW_SP_EEPROM_PAGE_LENGTH 256 static int mlxsw_sp_query_module_eeprom(struct mlxsw_sp_port *mlxsw_sp_port, u16 offset, u16 size, void *data,
@@ -2528,12 +2530,25 @@ static int mlxsw_sp_query_module_eeprom(struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;char eeprom_tmp[MLXSW_SP_REG_MCIA_EEPROM_SIZE ];char mcia_pl[MLXSW_REG_MCIA_LEN ]; +u16 i2c_addr;int status;int err; size =min_t (u16, size,MLXSW_SP_REG_MCIA_EEPROM_SIZE ); + +if (offset <MLXSW_SP_EEPROM_PAGE_LENGTH && + offset + size >MLXSW_SP_EEPROM_PAGE_LENGTH ) +/* Cross pages read, read until offset 256 in low page */ + size =MLXSW_SP_EEPROM_PAGE_LENGTH - offset; + + i2c_addr =MLXSW_SP_I2C_ADDR_LOW ; +if (offset >=MLXSW_SP_EEPROM_PAGE_LENGTH ) { + i2c_addr =MLXSW_SP_I2C_ADDR_HIGH ; + offset -=MLXSW_SP_EEPROM_PAGE_LENGTH ; + } +mlxsw_reg_mcia_pack (mcia_pl, mlxsw_sp_port->mapping.module, -0 ,0 , offset, size,MLXSW_SP_QSFP_I2C_ADDR ); +0 ,0 , offset, size, i2c_addr); err =mlxsw_reg_query (mlxsw_sp->core,MLXSW_REG (mcia), mcia_pl);if (err)
Patches currently in stable-queue which might be from [email protected] are
queue-4.13/mlxsw-spectrum-fix-eeprom-access-in-case-of-sfp-sfp.patch