hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sfp: fix EEPROM reading in the case of non-SFF8472 SFPs 

The EEPROM reading was trying to read from the second EEPROM address
if we requested the last byte from the SFF8079 EEPROM, which caused a
failure when the second EEPROM is not present.  Discovered with a
S-RJ01 SFP module.  Fix this.

Fixes: 7397005545 ("sfp: add SFP module support")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2017-12-15 16:09:41 +00:00 committed by David S. Miller
parent 20b56ed9f8
commit 2794ffc441
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/phy/sfp.c
View File

@ -724,20 +724,19 @@ static int sfp_module_eeprom(struct sfp *sfp, struct ethtool_eeprom *ee,
len = min_t(unsigned int, last, ETH_MODULE_SFF_8079_LEN); len = min_t(unsigned int, last, ETH_MODULE_SFF_8079_LEN);
len -= first; len -= first;
ret = sfp->read(sfp, false, first, data, len); ret = sfp_read(sfp, false, first, data, len);
if (ret < 0) if (ret < 0)
return ret; return ret;
first += len; first += len;
data += len; data += len;
} }
if (first >= ETH_MODULE_SFF_8079_LEN && if (first < ETH_MODULE_SFF_8472_LEN && last > ETH_MODULE_SFF_8079_LEN) {
first < ETH_MODULE_SFF_8472_LEN) {
len = min_t(unsigned int, last, ETH_MODULE_SFF_8472_LEN); len = min_t(unsigned int, last, ETH_MODULE_SFF_8472_LEN);
len -= first; len -= first;
first -= ETH_MODULE_SFF_8079_LEN; first -= ETH_MODULE_SFF_8079_LEN;
ret = sfp->read(sfp, true, first, data, len); ret = sfp_read(sfp, true, first, data, len);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }