net: sfp: re-implement ignoring the hardware TX_FAULT signal

Re-implement how we ignore the hardware TX_FAULT signal. Rather than
having a separate boolean for this, use a bitmask of the hardware
signals that we wish to ignore. This gives more flexibility in the
future to ignore other signals such as RX_LOS.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: Christian Marangi <ansuelsmth@gmail.com>
Link: https://lore.kernel.org/r/E1qnfXc-008UDY-91@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 3679a43f4eb024d9ee605a5ed0fac6f84543a983..d51b2036c06086582712f173f712849da1b26909 100644 (file)
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -257,6 +257,7 @@ struct sfp {
        unsigned int state_hw_drive;
        unsigned int state_hw_mask;
        unsigned int state_soft_mask;
+       unsigned int state_ignore_mask;
        unsigned int state;
 
        struct delayed_work poll;
@@ -280,7 +281,6 @@ struct sfp {
        unsigned int rs_state_mask;
 
        bool have_a2;
-       bool tx_fault_ignore;
 
        const struct sfp_quirk *quirk;
 
@@ -347,7 +347,7 @@ static void sfp_fixup_long_startup(struct sfp *sfp)
 
 static void sfp_fixup_ignore_tx_fault(struct sfp *sfp)
 {
-       sfp->tx_fault_ignore = true;
+       sfp->state_ignore_mask |= SFP_F_TX_FAULT;
 }
 
 // For 10GBASE-T short-reach modules
@@ -792,7 +792,8 @@ static void sfp_soft_start_poll(struct sfp *sfp)
 
        mutex_lock(&sfp->st_mutex);
        // Poll the soft state for hardware pins we want to ignore
-       sfp->state_soft_mask = ~sfp->state_hw_mask & mask;
+       sfp->state_soft_mask = ~sfp->state_hw_mask & ~sfp->state_ignore_mask &
+                              mask;
 
        if (sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT) &&
            !sfp->need_poll)
@@ -2317,7 +2318,7 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
        sfp->module_t_start_up = T_START_UP;
        sfp->module_t_wait = T_WAIT;
 
-       sfp->tx_fault_ignore = false;
+       sfp->state_ignore_mask = 0;
 
        if (sfp->id.base.extended_cc == SFF8024_ECC_10GBASE_T_SFI ||
            sfp->id.base.extended_cc == SFF8024_ECC_10GBASE_T_SR ||
@@ -2340,6 +2341,8 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
 
        if (sfp->quirk && sfp->quirk->fixup)
                sfp->quirk->fixup(sfp);
+
+       sfp->state_hw_mask &= ~sfp->state_ignore_mask;
        mutex_unlock(&sfp->st_mutex);
 
        return 0;
@@ -2841,10 +2844,7 @@ static void sfp_check_state(struct sfp *sfp)
        mutex_lock(&sfp->st_mutex);
        state = sfp_get_state(sfp);
        changed = state ^ sfp->state;
-       if (sfp->tx_fault_ignore)
-               changed &= SFP_F_PRESENT | SFP_F_LOS;
-       else
-               changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
+       changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
 
        for (i = 0; i < GPIO_MAX; i++)
                if (changed & BIT(i))