target/linux/generic/backport-5.4/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch

   1 From d4b8746219e8c0361e5ed6e440ab3a8a600d1f76 Mon Sep 17 00:00:00 2001
   2 From: Russell King <rmk+kernel@armlinux.org.uk>
   3 Date: Fri, 11 Oct 2019 17:24:40 +0100
   4 Subject: [PATCH 623/660] net: sfp: parse SFP power requirement earlier
   5
   6 Parse the SFP power requirement earlier, in preparation for moving the
   7 power level setup code.
   8
   9 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  10 ---
  11  drivers/net/phy/sfp.c | 42 +++++++++++++++++++++++++++++-------------
  12  1 file changed, 29 insertions(+), 13 deletions(-)
  13
  14 --- a/drivers/net/phy/sfp.c
  15 +++ b/drivers/net/phy/sfp.c
  16 @@ -198,6 +198,8 @@ struct sfp {
  17         unsigned int sm_retries;
  18
  19         struct sfp_eeprom_id id;
  20 +       unsigned int module_power_mW;
  21 +
  22  #if IS_ENABLED(CONFIG_HWMON)
  23         struct sfp_diag diag;
  24         struct device *hwmon_dev;
  25 @@ -1374,17 +1376,14 @@ static void sfp_sm_mod_init(struct sfp *
  26                 sfp_sm_probe_phy(sfp);
  27  }
  28
  29 -static int sfp_sm_mod_hpower(struct sfp *sfp)
  30 +static int sfp_module_parse_power(struct sfp *sfp)
  31  {
  32 -       u32 power;
  33 -       u8 val;
  34 -       int err;
  35 +       u32 power_mW = 1000;
  36
  37 -       power = 1000;
  38         if (sfp->id.ext.options & cpu_to_be16(SFP_OPTIONS_POWER_DECL))
  39 -               power = 1500;
  40 +               power_mW = 1500;
  41         if (sfp->id.ext.options & cpu_to_be16(SFP_OPTIONS_HIGH_POWER_LEVEL))
  42 -               power = 2000;
  43 +               power_mW = 2000;
  44
  45         if (sfp->id.ext.sff8472_compliance == SFP_SFF8472_COMPLIANCE_NONE &&
  46             (sfp->id.ext.diagmon & (SFP_DIAGMON_DDM | SFP_DIAGMON_ADDRMODE)) !=
  47 @@ -1393,23 +1392,33 @@ static int sfp_sm_mod_hpower(struct sfp
  48                  * or requires an address change sequence, so assume that
  49                  * the module powers up in the indicated power mode.
  50                  */
  51 -               if (power > sfp->max_power_mW) {
  52 +               if (power_mW > sfp->max_power_mW) {
  53                         dev_err(sfp->dev,
  54                                 "Host does not support %u.%uW modules\n",
  55 -                               power / 1000, (power / 100) % 10);
  56 +                               power_mW / 1000, (power_mW / 100) % 10);
  57                         return -EINVAL;
  58                 }
  59                 return 0;
  60         }
  61
  62 -       if (power > sfp->max_power_mW) {
  63 +       if (power_mW > sfp->max_power_mW) {
  64                 dev_warn(sfp->dev,
  65                          "Host does not support %u.%uW modules, module left in power mode 1\n",
  66 -                        power / 1000, (power / 100) % 10);
  67 +                        power_mW / 1000, (power_mW / 100) % 10);
  68                 return 0;
  69         }
  70
  71 -       if (power <= 1000)
  72 +       sfp->module_power_mW = power_mW;
  73 +
  74 +       return 0;
  75 +}
  76 +
  77 +static int sfp_sm_mod_hpower(struct sfp *sfp)
  78 +{
  79 +       u8 val;
  80 +       int err;
  81 +
  82 +       if (sfp->module_power_mW <= 1000)
  83                 return 0;
  84
  85         err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
  86 @@ -1429,7 +1438,8 @@ static int sfp_sm_mod_hpower(struct sfp
  87         }
  88
  89         dev_info(sfp->dev, "Module switched to %u.%uW power level\n",
  90 -                power / 1000, (power / 100) % 10);
  91 +                sfp->module_power_mW / 1000,
  92 +                (sfp->module_power_mW / 100) % 10);
  93         return T_HPOWER_LEVEL;
  94
  95  err:
  96 @@ -1516,6 +1526,11 @@ static int sfp_sm_mod_probe(struct sfp *
  97                 dev_warn(sfp->dev,
  98                          "module address swap to access page 0xA2 is not supported.\n");
  99
 100 +       /* Parse the module power requirement */
 101 +       ret = sfp_module_parse_power(sfp);
 102 +       if (ret < 0)
 103 +               return ret;
 104 +
 105         ret = sfp_hwmon_insert(sfp);
 106         if (ret < 0)
 107                 return ret;
 108 @@ -1539,6 +1554,7 @@ static void sfp_sm_mod_remove(struct sfp
 109         sfp_module_tx_disable(sfp);
 110
 111         memset(&sfp->id, 0, sizeof(sfp->id));
 112 +       sfp->module_power_mW = 0;
 113
 114         dev_info(sfp->dev, "module removed\n");
 115  }