target/linux/generic/pending-5.15/774--net-sfp-redo-soft-state-polling.patch

   1 From 9a84d699ddde0d4e272aa919ad8fd50271a3f932 Mon Sep 17 00:00:00 2001
   2 From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
   3 Date: Fri, 26 Aug 2022 08:48:20 +0100
   4 Subject: [PATCH 5/6] net: sfp: redo soft state polling
   5
   6 Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
   7 ---
   8  drivers/net/phy/sfp.c | 35 ++++++++++++++++++++++++-----------
   9  1 file changed, 24 insertions(+), 11 deletions(-)
  10
  11 --- a/drivers/net/phy/sfp.c
  12 +++ b/drivers/net/phy/sfp.c
  13 @@ -234,6 +234,7 @@ struct sfp {
  14         bool need_poll;
  15
  16         struct mutex st_mutex;                  /* Protects state */
  17 +       unsigned int state_ignore_hw_mask;
  18         unsigned int state_soft_mask;
  19         unsigned int state;
  20         struct delayed_work poll;
  21 @@ -623,17 +624,18 @@ static void sfp_soft_set_state(struct sf
  22  static void sfp_soft_start_poll(struct sfp *sfp)
  23  {
  24         const struct sfp_eeprom_id *id = &sfp->id;
  25 +       unsigned int mask = 0;
  26
  27         sfp->state_soft_mask = 0;
  28 -       if (id->ext.enhopts & SFP_ENHOPTS_SOFT_TX_DISABLE &&
  29 -           !sfp->gpio[GPIO_TX_DISABLE])
  30 -               sfp->state_soft_mask |= SFP_F_TX_DISABLE;
  31 -       if (id->ext.enhopts & SFP_ENHOPTS_SOFT_TX_FAULT &&
  32 -           !sfp->gpio[GPIO_TX_FAULT])
  33 -               sfp->state_soft_mask |= SFP_F_TX_FAULT;
  34 -       if (id->ext.enhopts & SFP_ENHOPTS_SOFT_RX_LOS &&
  35 -           !sfp->gpio[GPIO_LOS])
  36 -               sfp->state_soft_mask |= SFP_F_LOS;
  37 +       if (id->ext.enhopts & SFP_ENHOPTS_SOFT_TX_DISABLE)
  38 +               mask |= SFP_F_TX_DISABLE;
  39 +       if (id->ext.enhopts & SFP_ENHOPTS_SOFT_TX_FAULT)
  40 +               mask |= SFP_F_TX_FAULT;
  41 +       if (id->ext.enhopts & SFP_ENHOPTS_SOFT_RX_LOS)
  42 +               mask |= SFP_F_LOS;
  43 +
  44 +       // Poll the soft state for hardware pins we want to ignore
  45 +       sfp->state_soft_mask = sfp->state_ignore_hw_mask & mask;
  46
  47         if (sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT) &&
  48             !sfp->need_poll)
  49 @@ -647,10 +649,12 @@ static void sfp_soft_stop_poll(struct sf
  50
  51  static unsigned int sfp_get_state(struct sfp *sfp)
  52  {
  53 +       unsigned int soft = sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT);
  54         unsigned int state = sfp->get_state(sfp);
  55
  56 -       if (state & SFP_F_PRESENT &&
  57 -           sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT))
  58 +       state &= ~sfp->state_ignore_hw_mask;
  59 +
  60 +       if (state & SFP_F_PRESENT && soft)
  61                 state |= sfp_soft_get_state(sfp);
  62
  63         return state;
  64 @@ -2064,6 +2068,15 @@ static int sfp_sm_mod_probe(struct sfp *
  65         if (ret < 0)
  66                 return ret;
  67
  68 +       /* Initialise state bits to ignore from hardware */
  69 +       sfp->state_ignore_hw_mask = 0;
  70 +       if (!sfp->gpio[GPIO_TX_DISABLE])
  71 +               sfp->state_ignore_hw_mask |= SFP_F_TX_DISABLE;
  72 +       if (!sfp->gpio[GPIO_TX_FAULT])
  73 +               sfp->state_ignore_hw_mask |= SFP_F_TX_FAULT;
  74 +       if (!sfp->gpio[GPIO_LOS])
  75 +               sfp->state_ignore_hw_mask |= SFP_F_LOS;
  76 +
  77         sfp->module_t_start_up = T_START_UP;
  78
  79         sfp->tx_fault_ignore = false;