Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 068672e7 authored by Tom Lendacky's avatar Tom Lendacky Committed by Greg Kroah-Hartman
Browse files

net: amd-xgbe: Check only the minimum speed for active/passive cables 



[ Upstream commit f8ab263d4d48e6dab752029bf562f20a2ee630ed ]

There are cables that exist that can support speeds in excess of 10GbE.
The driver, however, restricts the EEPROM advertised nominal bitrate to
a specific range, which can prevent usage of cables that can support,
for example, up to 25GbE.

Rather than checking that an active or passive cable supports a specific
range, only check for a minimum supported speed.

Fixes: abf0a1c2 ("amd-xgbe: Add support for SFP+ modules")
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 291b9669

drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c

+2 −12
Original line number Diff line number Diff line
@@ -236,10 +236,7 @@ enum xgbe_sfp_speed { 


#define XGBE_SFP_BASE_BR			12

#define XGBE_SFP_BASE_BR_1GBE_MIN		0x0a

#define XGBE_SFP_BASE_BR_1GBE_MAX		0x0d

#define XGBE_SFP_BASE_BR_10GBE_MIN		0x64

#define XGBE_SFP_BASE_BR_10GBE_MAX		0x68

#define XGBE_MOLEX_SFP_BASE_BR_10GBE_MAX	0x78



#define XGBE_SFP_BASE_CU_CABLE_LEN		18
@@ -826,29 +823,22 @@ static void xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata) 
static bool xgbe_phy_sfp_bit_rate(struct xgbe_sfp_eeprom *sfp_eeprom,

				  enum xgbe_sfp_speed sfp_speed)

{

	u8 *sfp_base, min, max;

	u8 *sfp_base, min;



	sfp_base = sfp_eeprom->base;



	switch (sfp_speed) {

	case XGBE_SFP_SPEED_1000:

		min = XGBE_SFP_BASE_BR_1GBE_MIN;

		max = XGBE_SFP_BASE_BR_1GBE_MAX;

		break;

	case XGBE_SFP_SPEED_10000:

		min = XGBE_SFP_BASE_BR_10GBE_MIN;

		if (memcmp(&sfp_eeprom->base[XGBE_SFP_BASE_VENDOR_NAME],

			   XGBE_MOLEX_VENDOR, XGBE_SFP_BASE_VENDOR_NAME_LEN) == 0)

			max = XGBE_MOLEX_SFP_BASE_BR_10GBE_MAX;

		else

			max = XGBE_SFP_BASE_BR_10GBE_MAX;

		break;

	default:

		return false;

	}



	return ((sfp_base[XGBE_SFP_BASE_BR] >= min) &&

		(sfp_base[XGBE_SFP_BASE_BR] <= max));

	return sfp_base[XGBE_SFP_BASE_BR] >= min;

}



static void xgbe_phy_free_phy_device(struct xgbe_prv_data *pdata)