Commit 5ffe330e authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski

net: sfp: improve Nokia GPON sfp fixup

Improve the Nokia GPON fixup - we need to ignore not only the hardware
LOS signal, but also the software implementation as well. Do this by
using the new state_ignore_mask to indicate that we should ignore not
only the hardware RX_LOS signal, and also clear the LOS bits in the
option field.
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Link: https://lore.kernel.org/r/E1qnfXh-008UDe-F9@rmk-PC.armlinux.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e184e860
...@@ -345,11 +345,26 @@ static void sfp_fixup_long_startup(struct sfp *sfp) ...@@ -345,11 +345,26 @@ static void sfp_fixup_long_startup(struct sfp *sfp)
sfp->module_t_start_up = T_START_UP_BAD_GPON; sfp->module_t_start_up = T_START_UP_BAD_GPON;
} }
static void sfp_fixup_ignore_los(struct sfp *sfp)
{
/* This forces LOS to zero, so we ignore transitions */
sfp->state_ignore_mask |= SFP_F_LOS;
/* Make sure that LOS options are clear */
sfp->id.ext.options &= ~cpu_to_be16(SFP_OPTIONS_LOS_INVERTED |
SFP_OPTIONS_LOS_NORMAL);
}
static void sfp_fixup_ignore_tx_fault(struct sfp *sfp) static void sfp_fixup_ignore_tx_fault(struct sfp *sfp)
{ {
sfp->state_ignore_mask |= SFP_F_TX_FAULT; sfp->state_ignore_mask |= SFP_F_TX_FAULT;
} }
static void sfp_fixup_nokia(struct sfp *sfp)
{
sfp_fixup_long_startup(sfp);
sfp_fixup_ignore_los(sfp);
}
// For 10GBASE-T short-reach modules // For 10GBASE-T short-reach modules
static void sfp_fixup_10gbaset_30m(struct sfp *sfp) static void sfp_fixup_10gbaset_30m(struct sfp *sfp)
{ {
...@@ -446,7 +461,7 @@ static const struct sfp_quirk sfp_quirks[] = { ...@@ -446,7 +461,7 @@ static const struct sfp_quirk sfp_quirks[] = {
// Alcatel Lucent G-010S-A can operate at 2500base-X, but report 3.2GBd // Alcatel Lucent G-010S-A can operate at 2500base-X, but report 3.2GBd
// NRZ in their EEPROM // NRZ in their EEPROM
SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex, SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex,
sfp_fixup_long_startup), sfp_fixup_nokia),
// Fiberstore SFP-10G-T doesn't identify as copper, and uses the // Fiberstore SFP-10G-T doesn't identify as copper, and uses the
// Rollball protocol to talk to the PHY. // Rollball protocol to talk to the PHY.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment