Skip to content

Commit

Permalink
net: sfp: Add tx-fault workaround for Huawei MA5671A SFP ONT
Browse files Browse the repository at this point in the history
[ Upstream commit 2069624 ]

As noted elsewhere, various GPON SFP modules exhibit non-standard
TX-fault behaviour. In the tested case, the Huawei MA5671A, when used
in combination with a Marvell mv88e6085 switch, was found to
persistently assert TX-fault, resulting in the module being disabled.

This patch adds a quirk to ignore the SFP_F_TX_FAULT state, allowing the
module to function.

Change from v1: removal of erroneous return statment (Andrew Lunn)

Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220502223315.1973376-1-mnhagan88@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
clayface authored and gregkh committed May 18, 2022
1 parent 48f1dd6 commit 3abbfac
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/net/phy/sfp.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ struct sfp {
struct sfp_eeprom_id id;
unsigned int module_power_mW;
unsigned int module_t_start_up;
bool tx_fault_ignore;

#if IS_ENABLED(CONFIG_HWMON)
struct sfp_diag diag;
Expand Down Expand Up @@ -1893,6 +1894,12 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
else
sfp->module_t_start_up = T_START_UP;

if (!memcmp(id.base.vendor_name, "HUAWEI ", 16) &&
!memcmp(id.base.vendor_pn, "MA5671A ", 16))
sfp->tx_fault_ignore = true;
else
sfp->tx_fault_ignore = false;

return 0;
}

Expand Down Expand Up @@ -2320,7 +2327,10 @@ static void sfp_check_state(struct sfp *sfp)
mutex_lock(&sfp->st_mutex);
state = sfp_get_state(sfp);
changed = state ^ sfp->state;
changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
if (sfp->tx_fault_ignore)
changed &= SFP_F_PRESENT | SFP_F_LOS;
else
changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;

for (i = 0; i < GPIO_MAX; i++)
if (changed & BIT(i))
Expand Down

0 comments on commit 3abbfac

Please sign in to comment.