Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Russell King <rmk+kernel@armlinux.org.uk>,
        "David S . Miller" <davem@davemloft.net>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.14 32/67] sfp: fix EEPROM reading in the case of
 non-SFF8472 SFPs
Thread-Topic: [PATCH AUTOSEL for 4.14 32/67] sfp: fix EEPROM reading in the
 case of non-SFF8472 SFPs
Thread-Index: AQHTtpn/Fia+7N/+V0ShiJmc+w6Yrg==
Date:   Thu, 8 Mar 2018 04:57:45 +0000
Message-ID: <20180308045641.7814-32-alexander.levin@microsoft.com>
References: <20180308045641.7814-1-alexander.levin@microsoft.com>
In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: d8dd61e6-aa91-4ce1-f382-08d584b14a5f
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:57:45.5706
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1080
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 8bf10aba7452..ddf184db9c45 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -667,20 +667,19 @@ static int sfp_module_eeprom(struct sfp *sfp, struct =
ethtool_eeprom *ee,
 		len =3D min_t(unsigned int, last, ETH_MODULE_SFF_8079_LEN);
 		len -=3D first;
=20
-		ret =3D sfp->read(sfp, false, first, data, len);
+		ret =3D sfp_read(sfp, false, first, data, len);
 		if (ret < 0)
 			return ret;
=20
 		first +=3D len;
 		data +=3D len;
 	}
-	if (first >=3D 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 =3D min_t(unsigned int, last, ETH_MODULE_SFF_8472_LEN);
 		len -=3D first;
 		first -=3D ETH_MODULE_SFF_8079_LEN;
=20
-		ret =3D sfp->read(sfp, true, first, data, len);
+		ret =3D sfp_read(sfp, true, first, data, len);
 		if (ret < 0)
 			return ret;
 	}
--=20
2.14.1