Commit 5859a99b authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: sfp: add support for a couple of copper multi-rate modules 



Add support for the Fiberstore SFP-10G-T and Walsun HXSX-ATRC-1
modules. Internally, the PCB silkscreen has what seems to be a part
number of WT_502. Fiberstore use v2.2 whereas Walsun use v2.6.

These modules contain a Marvell AQrate AQR113C PHY, accessible through
I2C 0x51 using the "rollball" protocol. In both cases, the PHY is
programmed to use 10GBASE-R with pause-mode rate adaption.

Unlike the other rollball modules, these only need a four second delay
before we can talk to the PHY.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/E1q0JfS-006Dqc-8t@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d49b9b07

drivers/net/phy/sfp.c

+31 −3
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static const enum gpiod_flags gpio_flags[] = { 
 * on board (for a copper SFP) time to initialise.

 */

#define T_WAIT			msecs_to_jiffies(50)

#define T_WAIT_ROLLBALL		msecs_to_jiffies(25000)

#define T_START_UP		msecs_to_jiffies(300)

#define T_START_UP_BAD_GPON	msecs_to_jiffies(60000)
@@ -351,6 +350,27 @@ static void sfp_fixup_ignore_tx_fault(struct sfp *sfp) 
	sfp->tx_fault_ignore = true;

}



// For 10GBASE-T short-reach modules

static void sfp_fixup_10gbaset_30m(struct sfp *sfp)

{

	sfp->id.base.connector = SFF8024_CONNECTOR_RJ45;

	sfp->id.base.extended_cc = SFF8024_ECC_10GBASE_T_SR;

}



static void sfp_fixup_rollball_proto(struct sfp *sfp, unsigned int secs)

{

	sfp->mdio_protocol = MDIO_I2C_ROLLBALL;

	sfp->module_t_wait = msecs_to_jiffies(secs * 1000);

}



static void sfp_fixup_fs_10gt(struct sfp *sfp)

{

	sfp_fixup_10gbaset_30m(sfp);



	// These SFPs need 4 seconds before the PHY can be accessed

	sfp_fixup_rollball_proto(sfp, 4);

}



static void sfp_fixup_halny_gsfp(struct sfp *sfp)

{

	/* Ignore the TX_FAULT and LOS signals on this module.
@@ -362,8 +382,8 @@ static void sfp_fixup_halny_gsfp(struct sfp *sfp) 


static void sfp_fixup_rollball(struct sfp *sfp)

{

	sfp->mdio_protocol = MDIO_I2C_ROLLBALL;

	sfp->module_t_wait = T_WAIT_ROLLBALL;

	// Rollball SFPs need 25 seconds before the PHY can be accessed

	sfp_fixup_rollball_proto(sfp, 25);

}



static void sfp_fixup_rollball_cc(struct sfp *sfp)
@@ -428,6 +448,10 @@ static const struct sfp_quirk sfp_quirks[] = { 
	SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex,

		  sfp_fixup_long_startup),



	// Fiberstore SFP-10G-T doesn't identify as copper, and uses the

	// Rollball protocol to talk to the PHY.

	SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt),



	SFP_QUIRK_F("HALNy", "HL-GSFP", sfp_fixup_halny_gsfp),



	// HG MXPD-483II-F 2.5G supports 2500Base-X, but incorrectly reports
@@ -445,6 +469,10 @@ static const struct sfp_quirk sfp_quirks[] = { 


	SFP_QUIRK_M("UBNT", "UF-INSTANT", sfp_quirk_ubnt_uf_instant),



	// Walsun HXSX-ATRC-1 doesn't identify as copper, and uses the

	// Rollball protocol to talk to the PHY.

	SFP_QUIRK_F("Walsun", "HXSX-ATRC-1", sfp_fixup_fs_10gt),



	SFP_QUIRK_F("OEM", "SFP-10G-T", sfp_fixup_rollball_cc),

	SFP_QUIRK_M("OEM", "SFP-2.5G-T", sfp_quirk_oem_2_5g),

	SFP_QUIRK_F("OEM", "RTSFP-10", sfp_fixup_rollball_cc),