diff options
author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2022-08-26 16:21:44 +0200 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-09-06 16:26:23 +0100 |
commit | 7e94a02cbe84701d2638d243b328d53ce27f2474 (patch) | |
tree | 81ab9683d28d3cc69f04dab12a79ede4e2f36f1d /target/linux/generic/pending-5.15/772-net-sfp-move-Huawei-MA5671A-fixup.patch | |
parent | 09ea1db93b53d2c1e4a081f20fbbddd4bffd451d (diff) | |
download | upstream-7e94a02cbe84701d2638d243b328d53ce27f2474.tar.gz upstream-7e94a02cbe84701d2638d243b328d53ce27f2474.tar.bz2 upstream-7e94a02cbe84701d2638d243b328d53ce27f2474.zip |
kernel: add support for HALNy HL-GSFP and other related fixes
It was reported on Turris forum [1] that HALNy HL-GSFP module does not
work as it should with kernel 5.15. Russell King prepared this patch
series, which fixes broken SFP module to work.
Compile and run tested with Turris Omnia.
[1] https://forum.turris.cz/t/hbl-turrisos-6-0-alpha2-halny-hl-gsfp-sfp-gpon-stick-problems/17547
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/772-net-sfp-move-Huawei-MA5671A-fixup.patch')
-rw-r--r-- | target/linux/generic/pending-5.15/772-net-sfp-move-Huawei-MA5671A-fixup.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/target/linux/generic/pending-5.15/772-net-sfp-move-Huawei-MA5671A-fixup.patch b/target/linux/generic/pending-5.15/772-net-sfp-move-Huawei-MA5671A-fixup.patch new file mode 100644 index 0000000000..dfd08af671 --- /dev/null +++ b/target/linux/generic/pending-5.15/772-net-sfp-move-Huawei-MA5671A-fixup.patch @@ -0,0 +1,47 @@ +From 4c9d8c654827ef42da702c5b6c3392e8ac0bc60a Mon Sep 17 00:00:00 2001 +From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> +Date: Fri, 26 Aug 2022 08:43:40 +0100 +Subject: [PATCH 3/6] net: sfp: move Huawei MA5671A fixup + +Move this module over to the new fixup mechanism. + +Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> +--- + drivers/net/phy/sfp.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -315,6 +315,11 @@ static void sfp_fixup_long_startup(struc + sfp->module_t_start_up = T_START_UP_BAD_GPON; + } + ++static void sfp_fixup_ignore_tx_fault(struct sfp *sfp) ++{ ++ sfp->tx_fault_ignore = true; ++} ++ + static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id, + unsigned long *modes) + { +@@ -352,6 +357,7 @@ static const struct sfp_quirk sfp_quirks + .vendor = "HUAWEI", + .part = "MA5671A", + .modes = sfp_quirk_2500basex, ++ .fixup = sfp_fixup_ignore_tx_fault, + }, { + // Lantech 8330-262D-E can operate at 2500base-X, but + // incorrectly report 2500MBd NRZ in their EEPROM +@@ -2037,11 +2043,7 @@ static int sfp_sm_mod_probe(struct sfp * + + sfp->module_t_start_up = T_START_UP; + +- if (!memcmp(id.base.vendor_name, "HUAWEI ", 16) && +- !memcmp(id.base.vendor_pn, "MA5671A ", 16)) +- sfp->tx_fault_ignore = true; +- else +- sfp->tx_fault_ignore = false; ++ sfp->tx_fault_ignore = false; + + sfp->quirk = sfp_lookup_quirk(&id); + if (sfp->quirk && sfp->quirk->fixup) |