target/linux/generic/pending-5.4/758-net-sfp-error-handling-for-phy-probe.patch

   1 From 1fba543dc8edf4a43bff3276306648bb27c1e207 Mon Sep 17 00:00:00 2001
   2 From: Russell King <rmk+kernel@armlinux.org.uk>
   3 Date: Fri, 29 Nov 2019 00:30:08 +0000
   4 Subject: [PATCH 3/4] net: sfp: error handling for phy probe
   5
   6 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
   7 ---
   8  drivers/net/phy/sfp.c | 26 +++++++++++++++++---------
   9  1 file changed, 17 insertions(+), 9 deletions(-)
  10
  11 --- a/drivers/net/phy/sfp.c
  12 +++ b/drivers/net/phy/sfp.c
  13 @@ -1345,7 +1345,7 @@ static void sfp_sm_phy_detach(struct sfp
  14         sfp->mod_phy = NULL;
  15  }
  16
  17 -static void sfp_sm_probe_phy(struct sfp *sfp, bool is_c45)
  18 +static int sfp_sm_probe_phy(struct sfp *sfp, bool is_c45)
  19  {
  20         struct phy_device *phy;
  21         int err;
  22 @@ -1353,18 +1353,18 @@ static void sfp_sm_probe_phy(struct sfp
  23         phy = get_phy_device(sfp->i2c_mii, SFP_PHY_ADDR, is_c45);
  24         if (phy == ERR_PTR(-ENODEV)) {
  25                 dev_info(sfp->dev, "no PHY detected\n");
  26 -               return;
  27 +               return 0;
  28         }
  29         if (IS_ERR(phy)) {
  30                 dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy));
  31 -               return;
  32 +               return PTR_ERR(phy);
  33         }
  34
  35         err = phy_device_register(phy);
  36         if (err) {
  37                 phy_device_free(phy);
  38                 dev_err(sfp->dev, "phy_device_register failed: %d\n", err);
  39 -               return;
  40 +               return err;
  41         }
  42
  43         err = sfp_add_phy(sfp->sfp_bus, phy);
  44 @@ -1372,10 +1372,12 @@ static void sfp_sm_probe_phy(struct sfp
  45                 phy_device_remove(phy);
  46                 phy_device_free(phy);
  47                 dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err);
  48 -               return;
  49 +               return err;
  50         }
  51
  52         sfp->mod_phy = phy;
  53 +
  54 +       return 0;
  55  }
  56
  57  static void sfp_sm_link_up(struct sfp *sfp)
  58 @@ -1448,21 +1450,24 @@ static void sfp_sm_fault(struct sfp *sfp
  59   * Clause 45 copper SFP+ modules (10G) appear to switch their interface
  60   * mode according to the negotiated line speed.
  61   */
  62 -static void sfp_sm_probe_for_phy(struct sfp *sfp)
  63 +static int sfp_sm_probe_for_phy(struct sfp *sfp)
  64  {
  65 +       int err = 0;
  66 +
  67         switch (sfp->id.base.extended_cc) {
  68         case SFF8024_ECC_10GBASE_T_SFI:
  69         case SFF8024_ECC_10GBASE_T_SR:
  70         case SFF8024_ECC_5GBASE_T:
  71         case SFF8024_ECC_2_5GBASE_T:
  72 -               sfp_sm_probe_phy(sfp, true);
  73 +               err = sfp_sm_probe_phy(sfp, true);
  74                 break;
  75
  76         default:
  77                 if (sfp->id.base.e1000_base_t)
  78 -                       sfp_sm_probe_phy(sfp, false);
  79 +                       err = sfp_sm_probe_phy(sfp, false);
  80                 break;
  81         }
  82 +       return err;
  83  }
  84
  85  static int sfp_module_parse_power(struct sfp *sfp)
  86 @@ -1873,7 +1878,10 @@ static void sfp_sm_main(struct sfp *sfp,
  87         init_done:      /* TX_FAULT deasserted or we timed out with TX_FAULT
  88                          * clear.  Probe for the PHY and check the LOS state.
  89                          */
  90 -                       sfp_sm_probe_for_phy(sfp);
  91 +                       if (sfp_sm_probe_for_phy(sfp)) {
  92 +                               sfp_sm_next(sfp, SFP_S_FAIL, 0);
  93 +                               break;
  94 +                       }
  95                         if (sfp_module_start(sfp->sfp_bus)) {
  96                                 sfp_sm_next(sfp, SFP_S_FAIL, 0);
  97                                 break;