iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sfp: move Alcatel Lucent 3FE46541AA fixup

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

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle) 2022-09-13 20:06:37 +01:00 committed by Jakub Kicinski
parent 23571c7b96
commit 275416754e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/phy/sfp.c
View File

@ -311,6 +311,11 @@ static const struct of_device_id sfp_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, 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, static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
unsigned long *modes) unsigned long *modes)
{ {
@ -341,6 +346,7 @@ static const struct sfp_quirk sfp_quirks[] = {
.vendor = "ALCATELLUCENT", .vendor = "ALCATELLUCENT",
.part = "3FE46541AA", .part = "3FE46541AA",
.modes = sfp_quirk_2500basex, .modes = sfp_quirk_2500basex,
.fixup = sfp_fixup_long_startup,
}, { }, {
// Huawei MA5671A can operate at 2500base-X, but report 1.2GBd // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd
// NRZ in their EEPROM // NRZ in their EEPROM
@ -2003,11 +2009,7 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
if (sfp->gpio[GPIO_LOS]) if (sfp->gpio[GPIO_LOS])
sfp->state_hw_mask |= SFP_F_LOS; sfp->state_hw_mask |= SFP_F_LOS;
if (!memcmp(id.base.vendor_name, "ALCATELLUCENT ", 16) && sfp->module_t_start_up = T_START_UP;
!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) && if (!memcmp(id.base.vendor_name, "HUAWEI ", 16) &&
!memcmp(id.base.vendor_pn, "MA5671A ", 16)) !memcmp(id.base.vendor_pn, "MA5671A ", 16))
@ -2016,6 +2018,8 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
sfp->tx_fault_ignore = false; sfp->tx_fault_ignore = false;
sfp->quirk = sfp_lookup_quirk(&id); sfp->quirk = sfp_lookup_quirk(&id);
if (sfp->quirk && sfp->quirk->fixup)
sfp->quirk->fixup(sfp);
return 0; return 0;
} }

1
drivers/net/phy/sfp.h
View File

@ -10,6 +10,7 @@ struct sfp_quirk {
const char *vendor; const char *vendor;
const char *part; const char *part;
void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes); void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes);
void (*fixup)(struct sfp *sfp);
}; };
struct sfp_socket_ops { struct sfp_socket_ops {