projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: add support for kernel 5.4
[oweals/openwrt.git]
/
target
/
linux
/
generic
/
backport-5.4
/
725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch
diff --git
a/target/linux/generic/backport-5.4/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch
b/target/linux/generic/backport-5.4/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch
index 0b358f86d23b5d14d5f75a67fc09ba5e47cff9cd..df5ef9f79e03bacb85eb28f4101ad20f381a1a68 100644
(file)
--- a/
target/linux/generic/backport-5.4/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch
+++ b/
target/linux/generic/backport-5.4/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch
@@
-13,7
+13,7
@@
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -19
6,6 +196
,8 @@ struct sfp {
+@@ -19
8,6 +198
,8 @@ struct sfp {
unsigned int sm_retries;
struct sfp_eeprom_id id;
unsigned int sm_retries;
struct sfp_eeprom_id id;
@@
-22,7
+22,7
@@
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
#if IS_ENABLED(CONFIG_HWMON)
struct sfp_diag diag;
struct device *hwmon_dev;
#if IS_ENABLED(CONFIG_HWMON)
struct sfp_diag diag;
struct device *hwmon_dev;
-@@ -13
09,17 +1311
,14 @@ static void sfp_sm_mod_init(struct sfp *
+@@ -13
74,17 +1376
,14 @@ static void sfp_sm_mod_init(struct sfp *
sfp_sm_probe_phy(sfp);
}
sfp_sm_probe_phy(sfp);
}
@@
-44,7
+44,7
@@
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (sfp->id.ext.sff8472_compliance == SFP_SFF8472_COMPLIANCE_NONE &&
(sfp->id.ext.diagmon & (SFP_DIAGMON_DDM | SFP_DIAGMON_ADDRMODE)) !=
if (sfp->id.ext.sff8472_compliance == SFP_SFF8472_COMPLIANCE_NONE &&
(sfp->id.ext.diagmon & (SFP_DIAGMON_DDM | SFP_DIAGMON_ADDRMODE)) !=
-@@ -13
28,23 +1327
,33 @@ static int sfp_sm_mod_hpower(struct sfp
+@@ -13
93,23 +1392
,33 @@ static int sfp_sm_mod_hpower(struct sfp
* or requires an address change sequence, so assume that
* the module powers up in the indicated power mode.
*/
* or requires an address change sequence, so assume that
* the module powers up in the indicated power mode.
*/
@@
-83,7
+83,7
@@
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
return 0;
err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
return 0;
err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
-@@ -1
364,7 +1373
,8 @@ static int sfp_sm_mod_hpower(struct sfp
+@@ -1
429,7 +1438
,8 @@ static int sfp_sm_mod_hpower(struct sfp
}
dev_info(sfp->dev, "Module switched to %u.%uW power level\n",
}
dev_info(sfp->dev, "Module switched to %u.%uW power level\n",
@@
-93,7
+93,7
@@
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
return T_HPOWER_LEVEL;
err:
return T_HPOWER_LEVEL;
err:
-@@ -1
451,6 +1461
,11 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -1
516,6 +1526
,11 @@ static int sfp_sm_mod_probe(struct sfp *
dev_warn(sfp->dev,
"module address swap to access page 0xA2 is not supported.\n");
dev_warn(sfp->dev,
"module address swap to access page 0xA2 is not supported.\n");
@@
-105,7
+105,7
@@
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
ret = sfp_hwmon_insert(sfp);
if (ret < 0)
return ret;
ret = sfp_hwmon_insert(sfp);
if (ret < 0)
return ret;
-@@ -1
474,6 +1489
,7 @@ static void sfp_sm_mod_remove(struct sfp
+@@ -1
539,6 +1554
,7 @@ static void sfp_sm_mod_remove(struct sfp
sfp_module_tx_disable(sfp);
memset(&sfp->id, 0, sizeof(sfp->id));
sfp_module_tx_disable(sfp);
memset(&sfp->id, 0, sizeof(sfp->id));