From 462a088c474832b19ff2730de1e6bea66d399c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 15 Oct 2022 23:01:29 +0200 Subject: Add Turris kernel (includes patches from OpenWrt) --- .../112-net-sfp-move-Huawei-MA5671A-fixup.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/patches-linux-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch (limited to 'pkgs/patches-linux-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch') diff --git a/pkgs/patches-linux-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch b/pkgs/patches-linux-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch new file mode 100644 index 0000000..416f3a3 --- /dev/null +++ b/pkgs/patches-linux-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch @@ -0,0 +1,52 @@ +From a9e957e4da9f28797663b162e0bdd0147ace7853 Mon Sep 17 00:00:00 2001 +From: "Russell King (Oracle)" +Date: Fri, 26 Aug 2022 08:43:40 +0100 +Subject: [PATCH 3/4] net: sfp: move Huawei MA5671A fixup + +Move this module over to the new fixup mechanism. + +Signed-off-by: Russell King (Oracle) +--- + drivers/net/phy/sfp.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c +index 900b10887c3f..db922d27ee79 100644 +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -315,6 +315,11 @@ static void sfp_fixup_long_startup(struct sfp *sfp) + 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, bool report) + + 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) +-- +2.34.1 + -- cgit v1.2.3