aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2023-04-13 20:16:05 +0100
committerDaniel Golle <daniel@makrotopia.org>2023-04-13 20:16:05 +0100
commitb8e1fcad38eae059d45ec21e708839985b511994 (patch)
tree044ca8961b2597cf39d585eb6852e517b372a073 /target/linux
parentf4f8c0e8de1c9ff6f0a76f7e722e4cbdbaba92c3 (diff)
downloadupstream-b8e1fcad38eae059d45ec21e708839985b511994.tar.gz
upstream-b8e1fcad38eae059d45ec21e708839985b511994.tar.bz2
upstream-b8e1fcad38eae059d45ec21e708839985b511994.zip
generic: move accepted patch to backport-5.15
The patch adding SFP quirk for MXPD 483II was accepted upstream and will be part of Linux v6.3: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=ad651d68cee75e9ac20002254c4e5d09ee67a84b Move the patch from pending-5.15 to backport-5.15. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/backport-5.15/789-v6.3-net-sfp-add-quirk-enabling-2500Base-x-for-HG-MXPD-48.patch37
-rw-r--r--target/linux/generic/pending-5.15/701-net-sfp-add-quirk-for-MXPD-483II.patch13
2 files changed, 37 insertions, 13 deletions
diff --git a/target/linux/generic/backport-5.15/789-v6.3-net-sfp-add-quirk-enabling-2500Base-x-for-HG-MXPD-48.patch b/target/linux/generic/backport-5.15/789-v6.3-net-sfp-add-quirk-enabling-2500Base-x-for-HG-MXPD-48.patch
new file mode 100644
index 0000000000..a5a53bbc6e
--- /dev/null
+++ b/target/linux/generic/backport-5.15/789-v6.3-net-sfp-add-quirk-enabling-2500Base-x-for-HG-MXPD-48.patch
@@ -0,0 +1,37 @@
+From ad651d68cee75e9ac20002254c4e5d09ee67a84b Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sun, 2 Apr 2023 12:44:37 +0100
+Subject: [PATCH] net: sfp: add quirk enabling 2500Base-x for HG MXPD-483II
+
+The HG MXPD-483II 1310nm SFP module is meant to operate with 2500Base-X,
+however, in their EEPROM they incorrectly specify:
+ Transceiver type : Ethernet: 1000BASE-LX
+ ...
+ BR, Nominal : 2600MBd
+
+Use sfp_quirk_2500basex for this module to allow 2500Base-X mode anyway.
+
+https://forum.banana-pi.org/t/bpi-r3-sfp-module-compatibility/14573/60
+
+Reported-by: chowtom <chowtom@gmail.com>
+Tested-by: chowtom <chowtom@gmail.com>
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/phy/sfp.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/net/phy/sfp.c
++++ b/drivers/net/phy/sfp.c
+@@ -366,6 +366,10 @@ static const struct sfp_quirk sfp_quirks
+ .part = "HL-GSFP",
+ .fixup = sfp_fixup_halny_gsfp,
+ }, {
++ .vendor = "HG GENUINE",
++ .part = "MXPD-483II",
++ .modes = sfp_quirk_2500basex,
++ }, {
+ // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd
+ // NRZ in their EEPROM
+ .vendor = "HUAWEI",
diff --git a/target/linux/generic/pending-5.15/701-net-sfp-add-quirk-for-MXPD-483II.patch b/target/linux/generic/pending-5.15/701-net-sfp-add-quirk-for-MXPD-483II.patch
deleted file mode 100644
index 86a665fd0a..0000000000
--- a/target/linux/generic/pending-5.15/701-net-sfp-add-quirk-for-MXPD-483II.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/net/phy/sfp.c
-+++ b/drivers/net/phy/sfp.c
-@@ -366,6 +366,10 @@ static const struct sfp_quirk sfp_quirks
- .part = "HL-GSFP",
- .fixup = sfp_fixup_halny_gsfp,
- }, {
-+ .vendor = "HG GENUINE",
-+ .part = "MXPD-483II",
-+ .modes = sfp_quirk_2500basex,
-+ }, {
- // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd
- // NRZ in their EEPROM
- .vendor = "HUAWEI",