lkml.org 
[lkml]   [2018]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 37/78] sfp: fix EEPROM reading in the case of non-SFF8472 SFPs
    Date
    From: Russell King <rmk+kernel@armlinux.org.uk>

    [ Upstream commit 2794ffc441dde3109804085dc745e8014a4de224 ]

    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: 73970055450e ("sfp: add SFP module support")
    Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/phy/sfp.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
    index 9dfc1c4c954f..dec35888c429 100644
    --- a/drivers/net/phy/sfp.c
    +++ b/drivers/net/phy/sfp.c
    @@ -683,20 +683,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 -= first;

    - ret = sfp->read(sfp, false, first, data, len);
    + ret = sfp_read(sfp, false, first, data, len);
    if (ret < 0)
    return ret;

    first += len;
    data += len;
    }
    - if (first >= ETH_MODULE_SFF_8079_LEN &&
    - first < ETH_MODULE_SFF_8472_LEN) {
    + if (first < ETH_MODULE_SFF_8472_LEN && last > ETH_MODULE_SFF_8079_LEN) {
    len = min_t(unsigned int, last, ETH_MODULE_SFF_8472_LEN);
    len -= first;
    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)
    return ret;
    }
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-08 05:57    [W:4.229 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site