Skip to content
Snippets Groups Projects
Verified Commit 3cd00f59 authored by Josef Schlehofer's avatar Josef Schlehofer
Browse files

patches/openwrt: 5.15: add support for HALny GPON SFP

parent 9ae341ee
Branches
Tags
1 merge request!569Turris OS 6.0 (HBK)
Pipeline #103522 passed with stage
Stage:
    in 5 minutes and 39 seconds
    Hide whitespace changes
    Inline Side-by-side
    patches/openwrt/5.15-kernel-configuration/0024-kernel-5.15-Add-support-for-HALNy-GPON-SFP-and-other.patch 0 → 100644
    + 494
    − 0
    View file @ 3cd00f59
    From 3d7a37e16aa07cbb8f320a45f31bc8058a27a4c9 Mon Sep 17 00:00:00 2001
    From: Josef Schlehofer <pepe.schlehofer@gmail.com>
    Date: Wed, 24 Aug 2022 13:00:36 +0200
    Subject: [PATCH] kernel: 5.15: Add support for HALNy-GPON-SFP and other fixes
    It was reported on Turris forum [1] that HALNy-GPON-SFP module does not
    work as it should with kernel 5.15. Russel King prepared this patch
    series, which should hopefully fix this issue.
    Before sending this to OpenWrt, it needs to 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>
    ---
    ...t-sfp-move-quirk-handling-into-sfp.c.patch | 301 ++++++++++++++++++
    ...move-Alcatel-Lucent-3FE46541AA-fixup.patch | 63 ++++
    ...12-net-sfp-move-Huawei-MA5671A-fixup.patch | 50 +++
    ...t-sfp-add-support-for-HALNy-GPON-SFP.patch | 28 ++
    4 files changed, 442 insertions(+)
    create mode 100644 target/linux/generic/pending-5.15/110-net-sfp-move-quirk-handling-into-sfp.c.patch
    create mode 100644 target/linux/generic/pending-5.15/111-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch
    create mode 100644 target/linux/generic/pending-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch
    create mode 100644 target/linux/generic/pending-5.15/113-net-sfp-add-support-for-HALNy-GPON-SFP.patch
    diff --git a/target/linux/generic/pending-5.15/110-net-sfp-move-quirk-handling-into-sfp.c.patch b/target/linux/generic/pending-5.15/110-net-sfp-move-quirk-handling-into-sfp.c.patch
    new file mode 100644
    index 0000000000..4b52b16c09
    --- /dev/null
    +++ b/target/linux/generic/pending-5.15/110-net-sfp-move-quirk-handling-into-sfp.c.patch
    @@ -0,0 +1,301 @@
    +From fa192d917c6421ea1636833306d76314ab409a7e Mon Sep 17 00:00:00 2001
    +From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
    +Date: Wed, 24 Aug 2022 11:36:32 +0100
    +Subject: [PATCH 1/4] net: sfp: move quirk handling into sfp.c
    +
    +We need to handle more quirks than just those which affect the link
    +modes of the module. Move the quirk lookup into sfp.c, and pass the
    +quirk to sfp-bus.c
    +
    +Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
    +---
    + drivers/net/phy/sfp-bus.c | 98 ++-------------------------------------
    + drivers/net/phy/sfp.c | 96 +++++++++++++++++++++++++++++++++++++-
    + drivers/net/phy/sfp.h | 9 +++-
    + 3 files changed, 106 insertions(+), 97 deletions(-)
    +
    +diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
    +index 4369d6249e7b..267182d32bd5 100644
    +--- a/drivers/net/phy/sfp-bus.c
    ++++ b/drivers/net/phy/sfp-bus.c
    +@@ -10,12 +10,6 @@
    +
    + #include "sfp.h"
    +
    +-struct sfp_quirk {
    +- const char *vendor;
    +- const char *part;
    +- void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes);
    +-};
    +-
    + /**
    + * struct sfp_bus - internal representation of a sfp bus
    + */
    +@@ -38,93 +32,6 @@ struct sfp_bus {
    + bool started;
    + };
    +
    +-static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
    +- unsigned long *modes)
    +-{
    +- phylink_set(modes, 2500baseX_Full);
    +-}
    +-
    +-static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id,
    +- unsigned long *modes)
    +-{
    +- /* Ubiquiti U-Fiber Instant module claims that support all transceiver
    +- * types including 10G Ethernet which is not truth. So clear all claimed
    +- * modes and set only one mode which module supports: 1000baseX_Full.
    +- */
    +- phylink_zero(modes);
    +- phylink_set(modes, 1000baseX_Full);
    +-}
    +-
    +-static const struct sfp_quirk sfp_quirks[] = {
    +- {
    +- // Alcatel Lucent G-010S-P can operate at 2500base-X, but
    +- // incorrectly report 2500MBd NRZ in their EEPROM
    +- .vendor = "ALCATELLUCENT",
    +- .part = "G010SP",
    +- .modes = sfp_quirk_2500basex,
    +- }, {
    +- // Alcatel Lucent G-010S-A can operate at 2500base-X, but
    +- // report 3.2GBd NRZ in their EEPROM
    +- .vendor = "ALCATELLUCENT",
    +- .part = "3FE46541AA",
    +- .modes = sfp_quirk_2500basex,
    +- }, {
    +- // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd
    +- // NRZ in their EEPROM
    +- .vendor = "HUAWEI",
    +- .part = "MA5671A",
    +- .modes = sfp_quirk_2500basex,
    +- }, {
    +- // Lantech 8330-262D-E can operate at 2500base-X, but
    +- // incorrectly report 2500MBd NRZ in their EEPROM
    +- .vendor = "Lantech",
    +- .part = "8330-262D-E",
    +- .modes = sfp_quirk_2500basex,
    +- }, {
    +- .vendor = "UBNT",
    +- .part = "UF-INSTANT",
    +- .modes = sfp_quirk_ubnt_uf_instant,
    +- },
    +-};
    +-
    +-static size_t sfp_strlen(const char *str, size_t maxlen)
    +-{
    +- size_t size, i;
    +-
    +- /* Trailing characters should be filled with space chars */
    +- for (i = 0, size = 0; i < maxlen; i++)
    +- if (str[i] != ' ')
    +- size = i + 1;
    +-
    +- return size;
    +-}
    +-
    +-static bool sfp_match(const char *qs, const char *str, size_t len)
    +-{
    +- if (!qs)
    +- return true;
    +- if (strlen(qs) != len)
    +- return false;
    +- return !strncmp(qs, str, len);
    +-}
    +-
    +-static const struct sfp_quirk *sfp_lookup_quirk(const struct sfp_eeprom_id *id)
    +-{
    +- const struct sfp_quirk *q;
    +- unsigned int i;
    +- size_t vs, ps;
    +-
    +- vs = sfp_strlen(id->base.vendor_name, ARRAY_SIZE(id->base.vendor_name));
    +- ps = sfp_strlen(id->base.vendor_pn, ARRAY_SIZE(id->base.vendor_pn));
    +-
    +- for (i = 0, q = sfp_quirks; i < ARRAY_SIZE(sfp_quirks); i++, q++)
    +- if (sfp_match(q->vendor, id->base.vendor_name, vs) &&
    +- sfp_match(q->part, id->base.vendor_pn, ps))
    +- return q;
    +-
    +- return NULL;
    +-}
    +-
    + /**
    + * sfp_parse_port() - Parse the EEPROM base ID, setting the port type
    + * @bus: a pointer to the &struct sfp_bus structure for the sfp module
    +@@ -786,12 +693,13 @@ void sfp_link_down(struct sfp_bus *bus)
    + }
    + EXPORT_SYMBOL_GPL(sfp_link_down);
    +
    +-int sfp_module_insert(struct sfp_bus *bus, const struct sfp_eeprom_id *id)
    ++int sfp_module_insert(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
    ++ const struct sfp_quirk *quirk)
    + {
    + const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus);
    + int ret = 0;
    +
    +- bus->sfp_quirk = sfp_lookup_quirk(id);
    ++ bus->sfp_quirk = quirk;
    +
    + if (ops && ops->module_insert)
    + ret = ops->module_insert(bus->upstream, id);
    +diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
    +index 028a5df5c538..3dd502db9dd6 100644
    +--- a/drivers/net/phy/sfp.c
    ++++ b/drivers/net/phy/sfp.c
    +@@ -252,6 +252,8 @@ struct sfp {
    + unsigned int module_t_start_up;
    + bool tx_fault_ignore;
    +
    ++ const struct sfp_quirk *quirk;
    ++
    + #if IS_ENABLED(CONFIG_HWMON)
    + struct sfp_diag diag;
    + struct delayed_work hwmon_probe;
    +@@ -308,6 +310,93 @@ static const struct of_device_id sfp_of_match[] = {
    + };
    + MODULE_DEVICE_TABLE(of, sfp_of_match);
    +
    ++static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
    ++ unsigned long *modes)
    ++{
    ++ linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT, modes);
    ++}
    ++
    ++static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id,
    ++ unsigned long *modes)
    ++{
    ++ /* Ubiquiti U-Fiber Instant module claims that support all transceiver
    ++ * types including 10G Ethernet which is not truth. So clear all claimed
    ++ * modes and set only one mode which module supports: 1000baseX_Full.
    ++ */
    ++ linkmode_zero(modes);
    ++ linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, modes);
    ++}
    ++
    ++static const struct sfp_quirk sfp_quirks[] = {
    ++ {
    ++ // Alcatel Lucent G-010S-P can operate at 2500base-X, but
    ++ // incorrectly report 2500MBd NRZ in their EEPROM
    ++ .vendor = "ALCATELLUCENT",
    ++ .part = "G010SP",
    ++ .modes = sfp_quirk_2500basex,
    ++ }, {
    ++ // Alcatel Lucent G-010S-A can operate at 2500base-X, but
    ++ // report 3.2GBd NRZ in their EEPROM
    ++ .vendor = "ALCATELLUCENT",
    ++ .part = "3FE46541AA",
    ++ .modes = sfp_quirk_2500basex,
    ++ }, {
    ++ // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd
    ++ // NRZ in their EEPROM
    ++ .vendor = "HUAWEI",
    ++ .part = "MA5671A",
    ++ .modes = sfp_quirk_2500basex,
    ++ }, {
    ++ // Lantech 8330-262D-E can operate at 2500base-X, but
    ++ // incorrectly report 2500MBd NRZ in their EEPROM
    ++ .vendor = "Lantech",
    ++ .part = "8330-262D-E",
    ++ .modes = sfp_quirk_2500basex,
    ++ }, {
    ++ .vendor = "UBNT",
    ++ .part = "UF-INSTANT",
    ++ .modes = sfp_quirk_ubnt_uf_instant,
    ++ },
    ++};
    ++
    ++static size_t sfp_strlen(const char *str, size_t maxlen)
    ++{
    ++ size_t size, i;
    ++
    ++ /* Trailing characters should be filled with space chars */
    ++ for (i = 0, size = 0; i < maxlen; i++)
    ++ if (str[i] != ' ')
    ++ size = i + 1;
    ++
    ++ return size;
    ++}
    ++
    ++static bool sfp_match(const char *qs, const char *str, size_t len)
    ++{
    ++ if (!qs)
    ++ return true;
    ++ if (strlen(qs) != len)
    ++ return false;
    ++ return !strncmp(qs, str, len);
    ++}
    ++
    ++static const struct sfp_quirk *sfp_lookup_quirk(const struct sfp_eeprom_id *id)
    ++{
    ++ const struct sfp_quirk *q;
    ++ unsigned int i;
    ++ size_t vs, ps;
    ++
    ++ vs = sfp_strlen(id->base.vendor_name, ARRAY_SIZE(id->base.vendor_name));
    ++ ps = sfp_strlen(id->base.vendor_pn, ARRAY_SIZE(id->base.vendor_pn));
    ++
    ++ for (i = 0, q = sfp_quirks; i < ARRAY_SIZE(sfp_quirks); i++, q++)
    ++ if (sfp_match(q->vendor, id->base.vendor_name, vs) &&
    ++ sfp_match(q->part, id->base.vendor_pn, ps))
    ++ return q;
    ++
    ++ return NULL;
    ++}
    ++
    + static unsigned long poll_jiffies;
    +
    + static unsigned int sfp_gpio_get_state(struct sfp *sfp)
    +@@ -1952,6 +2041,10 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
    + else
    + sfp->tx_fault_ignore = false;
    +
    ++ sfp->quirk = sfp_lookup_quirk(&id);
    ++ if (sfp->quirk && sfp->quirk->fixup)
    ++ sfp->quirk->fixup(sfp);
    ++
    + return 0;
    + }
    +
    +@@ -2063,7 +2156,8 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event)
    + break;
    +
    + /* Report the module insertion to the upstream device */
    +- err = sfp_module_insert(sfp->sfp_bus, &sfp->id);
    ++ err = sfp_module_insert(sfp->sfp_bus, &sfp->id,
    ++ sfp->quirk);
    + if (err < 0) {
    + sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0);
    + break;
    +diff --git a/drivers/net/phy/sfp.h b/drivers/net/phy/sfp.h
    +index 27226535c72b..03f1d47fe6ca 100644
    +--- a/drivers/net/phy/sfp.h
    ++++ b/drivers/net/phy/sfp.h
    +@@ -6,6 +6,12 @@
    +
    + struct sfp;
    +
    ++struct sfp_quirk {
    ++ const char *vendor;
    ++ const char *part;
    ++ void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes);
    ++};
    ++
    + struct sfp_socket_ops {
    + void (*attach)(struct sfp *sfp);
    + void (*detach)(struct sfp *sfp);
    +@@ -23,7 +29,8 @@ int sfp_add_phy(struct sfp_bus *bus, struct phy_device *phydev);
    + void sfp_remove_phy(struct sfp_bus *bus);
    + void sfp_link_up(struct sfp_bus *bus);
    + void sfp_link_down(struct sfp_bus *bus);
    +-int sfp_module_insert(struct sfp_bus *bus, const struct sfp_eeprom_id *id);
    ++int sfp_module_insert(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
    ++ const struct sfp_quirk *quirk);
    + void sfp_module_remove(struct sfp_bus *bus);
    + int sfp_module_start(struct sfp_bus *bus);
    + void sfp_module_stop(struct sfp_bus *bus);
    +--
    +2.34.1
    +
    diff --git a/target/linux/generic/pending-5.15/111-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch b/target/linux/generic/pending-5.15/111-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch
    new file mode 100644
    index 0000000000..2fd0654594
    --- /dev/null
    +++ b/target/linux/generic/pending-5.15/111-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch
    @@ -0,0 +1,63 @@
    +From 2c59df88574b91f46fa59543a40aadb407219080 Mon Sep 17 00:00:00 2001
    +From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
    +Date: Wed, 24 Aug 2022 11:36:37 +0100
    +Subject: [PATCH 2/4] net: sfp: move Alcatel Lucent 3FE46541AA fixup
    +
    +Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
    +---
    + drivers/net/phy/sfp.c | 12 +++++++-----
    + drivers/net/phy/sfp.h | 1 +
    + 2 files changed, 8 insertions(+), 5 deletions(-)
    +
    +diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
    +index 3dd502db9dd6..10dae35c4dac 100644
    +--- a/drivers/net/phy/sfp.c
    ++++ b/drivers/net/phy/sfp.c
    +@@ -310,6 +310,11 @@ static const struct of_device_id sfp_of_match[] = {
    + };
    + MODULE_DEVICE_TABLE(of, sfp_of_match);
    +
    ++static void sfp_fixup_3fe46541aa(struct sfp *sfp)
    ++{
    ++ sfp->module_t_start_up = T_START_UP_BAD_GPON;
    ++}
    ++
    + static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
    + unsigned long *modes)
    + {
    +@@ -340,6 +345,7 @@ static const struct sfp_quirk sfp_quirks[] = {
    + .vendor = "ALCATELLUCENT",
    + .part = "3FE46541AA",
    + .modes = sfp_quirk_2500basex,
    ++ .fixup = sfp_fixup_3fe46541aa,
    + }, {
    + // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd
    + // NRZ in their EEPROM
    +@@ -2029,11 +2035,7 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
    + if (ret < 0)
    + return ret;
    +
    +- if (!memcmp(id.base.vendor_name, "ALCATELLUCENT ", 16) &&
    +- !memcmp(id.base.vendor_pn, "3FE46541AA ", 16))
    +- sfp->module_t_start_up = T_START_UP_BAD_GPON;
    +- else
    +- sfp->module_t_start_up = T_START_UP;
    ++ sfp->module_t_start_up = T_START_UP;
    +
    + if (!memcmp(id.base.vendor_name, "HUAWEI ", 16) &&
    + !memcmp(id.base.vendor_pn, "MA5671A ", 16))
    +diff --git a/drivers/net/phy/sfp.h b/drivers/net/phy/sfp.h
    +index 03f1d47fe6ca..7ad06deae76c 100644
    +--- a/drivers/net/phy/sfp.h
    ++++ b/drivers/net/phy/sfp.h
    +@@ -10,6 +10,7 @@ struct sfp_quirk {
    + const char *vendor;
    + const char *part;
    + void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes);
    ++ void (*fixup)(struct sfp *sfp);
    + };
    +
    + struct sfp_socket_ops {
    +--
    +2.34.1
    +
    diff --git a/target/linux/generic/pending-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch b/target/linux/generic/pending-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch
    new file mode 100644
    index 0000000000..de61189e4b
    --- /dev/null
    +++ b/target/linux/generic/pending-5.15/112-net-sfp-move-Huawei-MA5671A-fixup.patch
    @@ -0,0 +1,50 @@
    +From 43c90bc96f5713a60ec8937d33f2d47dcf5f8875 Mon Sep 17 00:00:00 2001
    +From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
    +Date: Wed, 24 Aug 2022 11:36:42 +0100
    +Subject: [PATCH 3/4] net: sfp: move Huawei MA5671A fixup
    +
    +Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
    +---
    + 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 10dae35c4dac..9bedf974109e 100644
    +--- a/drivers/net/phy/sfp.c
    ++++ b/drivers/net/phy/sfp.c
    +@@ -315,6 +315,11 @@ static void sfp_fixup_3fe46541aa(struct sfp *sfp)
    + sfp->module_t_start_up = T_START_UP_BAD_GPON;
    + }
    +
    ++static void sfp_fixup_ma5671a(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_ma5671a,
    + }, {
    + // 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
    +
    diff --git a/target/linux/generic/pending-5.15/113-net-sfp-add-support-for-HALNy-GPON-SFP.patch b/target/linux/generic/pending-5.15/113-net-sfp-add-support-for-HALNy-GPON-SFP.patch
    new file mode 100644
    index 0000000000..dcbb920c3e
    --- /dev/null
    +++ b/target/linux/generic/pending-5.15/113-net-sfp-add-support-for-HALNy-GPON-SFP.patch
    @@ -0,0 +1,28 @@
    +From 347ca979b47886dd53fcdc0b0155c6d5823f576f Mon Sep 17 00:00:00 2001
    +From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
    +Date: Wed, 24 Aug 2022 11:36:48 +0100
    +Subject: [PATCH 4/4] net: sfp: add support for HALNy GPON SFP
    +
    +More broken modules...
    +
    +Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
    +---
    + drivers/net/phy/sfp-bus.c | 2 +-
    + 1 file changed, 1 insertion(+), 1 deletion(-)
    +
    +diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
    +index 267182d32bd5..4566348a6d05 100644
    +--- a/drivers/net/phy/sfp-bus.c
    ++++ b/drivers/net/phy/sfp-bus.c
    +@@ -283,7 +283,7 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
    + phylink_set(modes, 2500baseX_Full);
    + }
    +
    +- if (bus->sfp_quirk)
    ++ if (bus->sfp_quirk && bus->sfp_quirk->modes)
    + bus->sfp_quirk->modes(id, modes);
    +
    + bitmap_or(support, support, modes, __ETHTOOL_LINK_MODE_MASK_NBITS);
    +--
    +2.34.1
    +
    --
    2.34.1
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment