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
6 Parse the SFP power requirement earlier, in preparation for moving the
7 power level setup code.
9 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
11 drivers/net/phy/sfp.c | 42 +++++++++++++++++++++++++++++-------------
12 1 file changed, 29 insertions(+), 13 deletions(-)
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;
19 struct sfp_eeprom_id id;
20 + unsigned int module_power_mW;
22 #if IS_ENABLED(CONFIG_HWMON)
24 struct device *hwmon_dev;
25 @@ -1374,17 +1376,14 @@ static void sfp_sm_mod_init(struct sfp *
26 sfp_sm_probe_phy(sfp);
29 -static int sfp_sm_mod_hpower(struct sfp *sfp)
30 +static int sfp_module_parse_power(struct sfp *sfp)
35 + u32 power_mW = 1000;
38 if (sfp->id.ext.options & cpu_to_be16(SFP_OPTIONS_POWER_DECL))
41 if (sfp->id.ext.options & cpu_to_be16(SFP_OPTIONS_HIGH_POWER_LEVEL))
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.
51 - if (power > sfp->max_power_mW) {
52 + if (power_mW > sfp->max_power_mW) {
54 "Host does not support %u.%uW modules\n",
55 - power / 1000, (power / 100) % 10);
56 + power_mW / 1000, (power_mW / 100) % 10);
62 - if (power > sfp->max_power_mW) {
63 + if (power_mW > sfp->max_power_mW) {
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);
72 + sfp->module_power_mW = power_mW;
77 +static int sfp_sm_mod_hpower(struct sfp *sfp)
82 + if (sfp->module_power_mW <= 1000)
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
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;
96 @@ -1516,6 +1526,11 @@ static int sfp_sm_mod_probe(struct sfp *
98 "module address swap to access page 0xA2 is not supported.\n");
100 + /* Parse the module power requirement */
101 + ret = sfp_module_parse_power(sfp);
105 ret = sfp_hwmon_insert(sfp);
108 @@ -1539,6 +1554,7 @@ static void sfp_sm_mod_remove(struct sfp
109 sfp_module_tx_disable(sfp);
111 memset(&sfp->id, 0, sizeof(sfp->id));
112 + sfp->module_power_mW = 0;
114 dev_info(sfp->dev, "module removed\n");