* [PATCH net-next v3 1/2] net: sfp: move sfp_strlen() above the quirk fixups
2026-11-20 6:37 [PATCH net-next v3 0/2] net: sfp: skip PHY probe on bridge-less OEM SFP-10G-T Daniel Pawlik
@ 2026-11-20 6:37 ` Daniel Pawlik
2026-11-20 12:52 ` Andrew Lunn
2026-11-20 6:37 ` [PATCH net-next v3 2/2] net: sfp: skip PHY probe on bridge-less OEM SFP-10G-T revisions A and B Daniel Pawlik
1 sibling, 1 reply; 5+ messages in thread
From: Daniel Pawlik @ 2026-11-20 6:37 UTC (permalink / raw)
To: andrew, hkallweit1, linux
Cc: netdev, andrew+netdev, davem, edumazet, kuba, pabeni, horms,
kabel, petr.wozniak, maxime.chevallier, olek2, Daniel Pawlik
sfp_strlen() is defined after the quirk table, so the fixups that the
table references cannot use it. Move it above the fixups so that the
next patch can match a vendor revision with the same space and NUL
padding rules as the vendor name and part number matching.
No functional change.
Signed-off-by: Daniel Pawlik <pawlik.dan@gmail.com>
---
drivers/net/phy/sfp.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 915156743701..8406ad8ee786 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -482,6 +482,20 @@ static void sfp_fixup_rollball_cc(struct sfp *sfp)
sfp->id.base.extended_cc = SFF8024_ECC_10GBASE_T_SFI;
}
+static size_t sfp_strlen(const char *str, size_t maxlen)
+{
+ size_t size, i;
+
+ /* Trailing characters should be filled with space chars, but
+ * some manufacturers can't read SFF-8472 and use NUL.
+ */
+ for (i = 0, size = 0; i < maxlen; i++)
+ if (str[i] != ' ' && str[i] != '\0')
+ size = i + 1;
+
+ return size;
+}
+
static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
struct sfp_module_caps *caps)
{
@@ -660,20 +674,6 @@ static const struct sfp_quirk sfp_quirks[] = {
SFP_QUIRK_S("ZOERAX", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
};
-static size_t sfp_strlen(const char *str, size_t maxlen)
-{
- size_t size, i;
-
- /* Trailing characters should be filled with space chars, but
- * some manufacturers can't read SFF-8472 and use NUL.
- */
- for (i = 0, size = 0; i < maxlen; i++)
- if (str[i] != ' ' && str[i] != '\0')
- size = i + 1;
-
- return size;
-}
-
static bool sfp_match(const char *qs, const char *str, size_t len, bool prefix)
{
size_t qs_len;
--
2.56.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net-next v3 2/2] net: sfp: skip PHY probe on bridge-less OEM SFP-10G-T revisions A and B
2026-11-20 6:37 [PATCH net-next v3 0/2] net: sfp: skip PHY probe on bridge-less OEM SFP-10G-T Daniel Pawlik
2026-11-20 6:37 ` [PATCH net-next v3 1/2] net: sfp: move sfp_strlen() above the quirk fixups Daniel Pawlik
@ 2026-11-20 6:37 ` Daniel Pawlik
2026-11-20 12:56 ` Andrew Lunn
1 sibling, 1 reply; 5+ messages in thread
From: Daniel Pawlik @ 2026-11-20 6:37 UTC (permalink / raw)
To: andrew, hkallweit1, linux
Cc: netdev, andrew+netdev, davem, edumazet, kuba, pabeni, horms,
kabel, petr.wozniak, maxime.chevallier, olek2, Daniel Pawlik
"OEM SFP-10G-T" modules with vendor revision "A" have no RollBall
I2C-to-MDIO bridge: page 3 of the 0x51 EEPROM passively echoes written
bytes, so every RollBall command times out. With instrumented mdio-i2c,
the CMD register reads back exactly the written command byte (0x02)
forever, with no DONE and no I2C errors. 0x56 reads back all 0xff, so the
PHY is not reachable at all. A genuine RollBall module with the same
vendor and part number (revision "02", AQR113C PHY) on the same board
answers DONE on the first poll and its PHY attaches within ~2 seconds.
A rev B module with an RTL8261BE PHY, reported on the OpenWrt tracker,
hits the same RollBall timeouts. The bridge probe added by
commit 8fe125892f40 ("net: phy: sfp: probe for RollBall I2C-to-MDIO
bridge in mdio-i2c"), since reverted, found no bridge on it, after
which the module worked.
That module reaches this quirk entry only because its part number is
"SFP-10G-T" at that point: it is a rate-adapting module which reports
"SFP-10G-T" with a 2.5G or faster peer and "SFP-10G-T-I" with a 1G
peer, and only the former matches this entry, which is the sole entry
forcing RollBall on it. The "SFP-10G-T-I" variant matches no quirk and
keeps the default behaviour either way.
Because the SFP-10G-T quirk forces RollBall, the kernel retries the PHY
probe 25 times at ~21 seconds per attempt, i.e. for over nine minutes,
before giving up and falling back to inband mode. Each attempt runs from
sfp_timeout() with rtnl_lock held, so for the whole window every rtnl
user on the system stalls in ~21 second chunks, including the state
machines of other SFP cages: insertion and removal of a module in another
cage is only processed after the current attempt ends. In one test, a
module pulled from the other cage kept being polled by phylib until the
attempt ended, triggering a WARN from phy_error_precise().
Give the SFP-10G-T entry its own fixup that skips the PHY probe for
revisions "A" and "B", while keeping the forced extended compliance code
so that the module still links up in 10GBASE-R inband mode as before.
Other revisions keep the RollBall fixup unchanged.
Tested on a Banana Pi BPI-R4 with rev A and rev 02 modules: the rev A
module links up at 10G ~16 s after insertion instead of over nine
minutes, and the rev 02 module is unaffected. No rev B module was
available for testing; its match is based on the report above.[1]
[1] https://github.com/openwrt/openwrt/pull/22910
Signed-off-by: Daniel Pawlik <pawlik.dan@gmail.com>
Link: https://lore.kernel.org/netdev/20260624084814.20972-1-petr.wozniak@gmail.com/
---
drivers/net/phy/sfp.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 8406ad8ee786..431c0f773d35 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -496,6 +496,30 @@ static size_t sfp_strlen(const char *str, size_t maxlen)
return size;
}
+static void sfp_fixup_oem_10gt(struct sfp *sfp)
+{
+ char rev = sfp->id.base.vendor_rev[0];
+
+ /* Revisions A and B of this module have no RollBall I2C-to-MDIO
+ * bridge (on rev A, page 3 of the 0x51 EEPROM just echoes written
+ * bytes), so every RollBall command times out and the PHY probe
+ * keeps retrying for over nine minutes, holding rtnl_lock for ~20
+ * seconds per attempt. The PHY is not accessible at all, so use the
+ * module without one.
+ */
+ if (sfp_strlen(sfp->id.base.vendor_rev, 4) == 1 &&
+ (rev == 'A' || rev == 'B')) {
+ dev_info(sfp->dev,
+ "rev %c has no RollBall MDIO bridge, not probing for a PHY\n",
+ rev);
+ sfp->mdio_protocol = MDIO_I2C_NONE;
+ sfp->id.base.extended_cc = SFF8024_ECC_10GBASE_T_SFI;
+ return;
+ }
+
+ sfp_fixup_rollball_cc(sfp);
+}
+
static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
struct sfp_module_caps *caps)
{
@@ -643,7 +667,7 @@ static const struct sfp_quirk sfp_quirks[] = {
// OEM SFP-GE-T is a 1000Base-T module with broken TX_FAULT indicator
SFP_QUIRK_F("OEM", "SFP-GE-T", sfp_fixup_ignore_tx_fault),
- SFP_QUIRK_F("OEM", "SFP-10G-T", sfp_fixup_rollball_cc),
+ SFP_QUIRK_F("OEM", "SFP-10G-T", sfp_fixup_oem_10gt),
SFP_QUIRK_S("OEM", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
SFP_QUIRK_S("OEM", "SFP-2.5G-BX10-D", sfp_quirk_2500basex),
SFP_QUIRK_S("OEM", "SFP-2.5G-BX10-U", sfp_quirk_2500basex),
--
2.56.1
^ permalink raw reply related [flat|nested] 5+ messages in thread