--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -567,6 +567,8 @@ static const struct sfp_quirk sfp_quirks
+@@ -588,6 +588,8 @@ static const struct sfp_quirk sfp_quirks
SFP_QUIRK_F("Turris", "RTSFP-2.5G", sfp_fixup_rollball),
SFP_QUIRK_F("Turris", "RTSFP-10", sfp_fixup_rollball),
SFP_QUIRK_F("Turris", "RTSFP-10G", sfp_fixup_rollball),
+++ /dev/null
-From 95aca8602ef70ffd3d971675751c81826e124f90 Mon Sep 17 00:00:00 2001
-From: John Pavlick <jspavlick@posteo.net>
-Date: Mon, 6 Apr 2026 13:23:33 +0000
-Subject: [PATCH] net: sfp: add quirks for Hisense and HSGQ GPON ONT SFP
- modules
-
-Several GPON ONT SFP sticks based on Realtek RTL960x report
-1000BASE-LX at 1300MBd in their EEPROM but can operate at 2500base-X.
-On hosts capable of 2500base-X (e.g. Banana Pi R3 / MT7986), the
-kernel negotiates only 1G because it trusts the incorrect EEPROM data.
-
-Add quirks for:
-- Hisense-Leox LXT-010S-H
-- Hisense ZNID-GPON-2311NA
-- HSGQ HSGQ-XPON-Stick
-
-Each quirk advertises 2500base-X and ignores TX_FAULT during the
-module's ~40s Linux boot time.
-
-Tested on Banana Pi R3 (MT7986) with OpenWrt 25.12.1, confirmed
-2.5Gbps link and full throughput with flow offloading.
-
-Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
-Suggested-by: Marcin Nita <marcin.nita@leolabs.pl>
-Signed-off-by: John Pavlick <jspavlick@posteo.net>
-Link: https://patch.msgid.link/20260406132321.72563-1-jspavlick@posteo.net
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
----
- drivers/net/phy/sfp.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/drivers/net/phy/sfp.c
-+++ b/drivers/net/phy/sfp.c
-@@ -538,6 +538,22 @@ static const struct sfp_quirk sfp_quirks
- SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex,
- sfp_fixup_ignore_tx_fault_and_los),
-
-+ // Hisense LXT-010S-H is a GPON ONT SFP (sold as LEOX LXT-010S-H) that
-+ // can operate at 2500base-X, but reports 1000BASE-LX / 1300MBd in its
-+ // EEPROM
-+ SFP_QUIRK("Hisense-Leox", "LXT-010S-H", sfp_quirk_2500basex,
-+ sfp_fixup_ignore_tx_fault),
-+
-+ // Hisense ZNID-GPON-2311NA can operate at 2500base-X, but reports
-+ // 1000BASE-LX / 1300MBd in its EEPROM
-+ SFP_QUIRK("Hisense", "ZNID-GPON-2311NA", sfp_quirk_2500basex,
-+ sfp_fixup_ignore_tx_fault),
-+
-+ // HSGQ HSGQ-XPON-Stick can operate at 2500base-X, but reports
-+ // 1000BASE-LX / 1300MBd in its EEPROM
-+ SFP_QUIRK("HSGQ", "HSGQ-XPON-Stick", sfp_quirk_2500basex,
-+ sfp_fixup_ignore_tx_fault),
-+
- // Lantech 8330-262D-E and 8330-265D can operate at 2500base-X, but
- // incorrectly report 2500MBd NRZ in their EEPROM.
- // Some 8330-265D modules have inverted LOS, while all of them report
-LINUX_VERSION-6.18 = .23
-LINUX_KERNEL_HASH-6.18.23 = 2a2d8e76bfcd135ab861bb9795211574eeff6d4ede9cc920f7c137587e835134
+LINUX_VERSION-6.18 = .24
+LINUX_KERNEL_HASH-6.18.24 = c207c557ce58103b4dda30e26da5203f3d8467c6dadc53d709f6d83ae1d1255f
struct rtnl_link {
rtnl_doit_func doit;
-@@ -5317,7 +5317,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -5331,7 +5331,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
brport_nla_put_flag(skb, flags, mask,
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
brport_nla_put_flag(skb, flags, mask,
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -580,6 +580,7 @@ static const struct sfp_quirk sfp_quirks
+@@ -601,6 +601,7 @@ static const struct sfp_quirk sfp_quirks
SFP_QUIRK_S("OEM", "SFP-2.5G-BX10-U", sfp_quirk_2500basex),
SFP_QUIRK_F("OEM", "RTSFP-10", sfp_fixup_rollball_cc),
SFP_QUIRK_F("OEM", "RTSFP-10G", sfp_fixup_rollball_cc),
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -586,6 +586,7 @@ static const struct sfp_quirk sfp_quirks
+@@ -607,6 +607,7 @@ static const struct sfp_quirk sfp_quirks
SFP_QUIRK_F("Turris", "RTSFP-10G", sfp_fixup_rollball),
SFP_QUIRK_S("ZOERAX", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -845,6 +845,29 @@ static int sfp_i2c_mdiobus_create(struct
+@@ -866,6 +866,29 @@ static int sfp_i2c_mdiobus_create(struct
return 0;
}
static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
{
mdiobus_unregister(sfp->i2c_mii);
-@@ -2019,9 +2042,15 @@ static void sfp_sm_fault(struct sfp *sfp
+@@ -2040,9 +2063,15 @@ static void sfp_sm_fault(struct sfp *sfp
static int sfp_sm_add_mdio_bus(struct sfp *sfp)
{
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -804,21 +804,29 @@ static int sfp_smbus_byte_write(struct s
+@@ -825,21 +825,29 @@ static int sfp_smbus_byte_write(struct s
static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
{
#include <linux/workqueue.h>
#include "sfp.h"
-@@ -753,50 +754,101 @@ static int sfp_i2c_write(struct sfp *sfp
+@@ -774,50 +775,101 @@ static int sfp_i2c_write(struct sfp *sfp
return ret == ARRAY_SIZE(msgs) ? len : 0;
}
}
return data - (u8 *)buf;
-@@ -805,17 +857,32 @@ static int sfp_smbus_byte_write(struct s
+@@ -826,17 +878,32 @@ static int sfp_smbus_byte_write(struct s
static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
{
size_t max_block_size;
projects / thirdparty / openwrt.git / commitdiff
