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

net: sfp: move Alcatel Lucent 3FE46541AA fixup 



Add a new fixup mechanism to the SFP quirks, and use it for this
module.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 23571c7b

drivers/net/phy/sfp.c

+9 −5
Original line number Diff line number Diff line
@@ -311,6 +311,11 @@ static const struct of_device_id sfp_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, sfp_of_match);



static void sfp_fixup_long_startup(struct sfp *sfp)

{

	sfp->module_t_start_up = T_START_UP_BAD_GPON;

}



static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,

				unsigned long *modes)

{
@@ -341,6 +346,7 @@ static const struct sfp_quirk sfp_quirks[] = { 
		.vendor = "ALCATELLUCENT",

		.part = "3FE46541AA",

		.modes = sfp_quirk_2500basex,

		.fixup = sfp_fixup_long_startup,

	}, {

		// Huawei MA5671A can operate at 2500base-X, but report 1.2GBd

		// NRZ in their EEPROM
@@ -2003,10 +2009,6 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report) 
	if (sfp->gpio[GPIO_LOS])

		sfp->state_hw_mask |= SFP_F_LOS;



	if (!memcmp(id.base.vendor_name, "ALCATELLUCENT   ", 16) &&

	    !memcmp(id.base.vendor_pn, "3FE46541AA      ", 16))

		sfp->module_t_start_up = T_START_UP_BAD_GPON;

	else

	sfp->module_t_start_up = T_START_UP;



	if (!memcmp(id.base.vendor_name, "HUAWEI          ", 16) &&
@@ -2016,6 +2018,8 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report) 
		sfp->tx_fault_ignore = false;



	sfp->quirk = sfp_lookup_quirk(&id);

	if (sfp->quirk && sfp->quirk->fixup)

		sfp->quirk->fixup(sfp);



	return 0;

}

drivers/net/phy/sfp.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ struct sfp_quirk { 
	const char *vendor;

	const char *part;

	void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes);

	void (*fixup)(struct sfp *sfp);

};



struct sfp_socket_ops {