git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From e184e8609f8c1cd9fef703f667245b6ebd89c2ed Mon Sep 17 00:00:00 2001
   2 From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
   3 Date: Tue, 3 Oct 2023 14:34:24 +0100
   4 Subject: [PATCH] net: sfp: re-implement ignoring the hardware TX_FAULT signal
   5
   6 Re-implement how we ignore the hardware TX_FAULT signal. Rather than
   7 having a separate boolean for this, use a bitmask of the hardware
   8 signals that we wish to ignore. This gives more flexibility in the
   9 future to ignore other signals such as RX_LOS.
  10
  11 Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
  12 Tested-by: Christian Marangi <ansuelsmth@gmail.com>
  13 Link: https://lore.kernel.org/r/E1qnfXc-008UDY-91@rmk-PC.armlinux.org.uk
  14 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  15 ---
  16  drivers/net/phy/sfp.c | 16 ++++++++--------
  17  1 file changed, 8 insertions(+), 8 deletions(-)
  18
  19 --- a/drivers/net/phy/sfp.c
  20 +++ b/drivers/net/phy/sfp.c
  21 @@ -257,6 +257,7 @@ struct sfp {
  22         unsigned int state_hw_drive;
  23         unsigned int state_hw_mask;
  24         unsigned int state_soft_mask;
  25 +       unsigned int state_ignore_mask;
  26         unsigned int state;
  27
  28         struct delayed_work poll;
  29 @@ -280,7 +281,6 @@ struct sfp {
  30         unsigned int rs_state_mask;
  31
  32         bool have_a2;
  33 -       bool tx_fault_ignore;
  34
  35         const struct sfp_quirk *quirk;
  36
  37 @@ -347,7 +347,7 @@ static void sfp_fixup_long_startup(struc
  38
  39  static void sfp_fixup_ignore_tx_fault(struct sfp *sfp)
  40  {
  41 -       sfp->tx_fault_ignore = true;
  42 +       sfp->state_ignore_mask |= SFP_F_TX_FAULT;
  43  }
  44
  45  // For 10GBASE-T short-reach modules
  46 @@ -798,7 +798,8 @@ static void sfp_soft_start_poll(struct s
  47
  48         mutex_lock(&sfp->st_mutex);
  49         // Poll the soft state for hardware pins we want to ignore
  50 -       sfp->state_soft_mask = ~sfp->state_hw_mask & mask;
  51 +       sfp->state_soft_mask = ~sfp->state_hw_mask & ~sfp->state_ignore_mask &
  52 +                              mask;
  53
  54         if (sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT) &&
  55             !sfp->need_poll)
  56 @@ -2323,7 +2324,7 @@ static int sfp_sm_mod_probe(struct sfp *
  57         sfp->module_t_start_up = T_START_UP;
  58         sfp->module_t_wait = T_WAIT;
  59
  60 -       sfp->tx_fault_ignore = false;
  61 +       sfp->state_ignore_mask = 0;
  62
  63         if (sfp->id.base.extended_cc == SFF8024_ECC_10GBASE_T_SFI ||
  64             sfp->id.base.extended_cc == SFF8024_ECC_10GBASE_T_SR ||
  65 @@ -2346,6 +2347,8 @@ static int sfp_sm_mod_probe(struct sfp *
  66
  67         if (sfp->quirk && sfp->quirk->fixup)
  68                 sfp->quirk->fixup(sfp);
  69 +
  70 +       sfp->state_hw_mask &= ~sfp->state_ignore_mask;
  71         mutex_unlock(&sfp->st_mutex);
  72
  73         return 0;
  74 @@ -2846,10 +2849,7 @@ static void sfp_check_state(struct sfp *
  75         mutex_lock(&sfp->st_mutex);
  76         state = sfp_get_state(sfp);
  77         changed = state ^ sfp->state;
  78 -       if (sfp->tx_fault_ignore)
  79 -               changed &= SFP_F_PRESENT | SFP_F_LOS;
  80 -       else
  81 -               changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
  82 +       changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
  83
  84         for (i = 0; i < GPIO_MAX; i++)
  85                 if (changed & BIT(i))