From: github@bumblecito.com
To: Russell King <linux@armlinux.org.uk>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>
Cc: "David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next v3 2/2] net: sfp: sort OEM and Turris SFP quirks
Date: Wed, 18 Nov 2026 16:23:23 +0000 [thread overview]
Message-ID: <20261118162323.436219-3-github@bumblecito.com> (raw)
In-Reply-To: <20261118162323.436219-1-github@bumblecito.com>
From: Israel Cueto <github@bumblecito.com>
Keep OEM entries together in the vendor table's alphabetical order
and sort the OEM and Turris entries by part number.
This is a table-ordering cleanup only; preserve all existing quirk
matches and fixup functions.
Signed-off-by: Israel Cueto <github@bumblecito.com>
---
drivers/net/phy/sfp.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 960ac89cc..33349c355 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -617,33 +617,24 @@ static const struct sfp_quirk sfp_quirks[] = {
// ODI DFP-34X-2C3 XPON stick can operate at 2500base-X
SFP_QUIRK_S("ODI", "DFP-34X-2C3", sfp_quirk_2500basex),
- SFP_QUIRK_S("UBNT", "UF-INSTANT", sfp_quirk_ubnt_uf_instant),
-
- // Walsun HXSX-ATR[CI]-1 don't identify as copper, and use the
- // Rollball protocol to talk to the PHY.
- SFP_QUIRK_F("Walsun", "HXSX-ATRC-1", sfp_fixup_fs_10gt),
- SFP_QUIRK_F("Walsun", "HXSX-ATRI-1", sfp_fixup_fs_10gt),
-
- SFP_QUIRK_F("YV", "SFP+ONU-XGSPON", sfp_fixup_potron),
-
// HORACO HC-10GE-113C uses Rollball protocol to talk to the PHY.
SFP_QUIRK_F("OEM", "HC-10GE-113C", sfp_fixup_rollball),
+ SFP_QUIRK_F("OEM", "RTSFP-10", sfp_fixup_rollball_cc),
+ SFP_QUIRK_F("OEM", "RTSFP-10G", sfp_fixup_rollball_cc),
- // 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),
+ // OEM SFP+ONU-XGSPON is a XGS-PON ONT stick with broken TX_FAULT and
+ // LOS indicators and slow startup, just like potron.
+ SFP_QUIRK_F("OEM", "SFP+ONU-XGSPON", sfp_fixup_potron),
SFP_QUIRK_F("OEM", "SFP-10G-T", sfp_fixup_rollball_cc),
- 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),
SFP_QUIRK_S("OEM", "SFP-2.5G-LH03-B", sfp_quirk_2500basex),
SFP_QUIRK_S("OEM", "SFP-2.5G-LH20-A", sfp_quirk_2500basex),
- SFP_QUIRK_F("OEM", "RTSFP-10", sfp_fixup_rollball_cc),
- SFP_QUIRK_F("OEM", "RTSFP-10G", sfp_fixup_rollball_cc),
+ SFP_QUIRK_S("OEM", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
- // OEM SFP+ONU-XGSPON is a XGS-PON ONT stick with broken TX_FAULT and
- // LOS indicators and slow startup, just like potron.
- SFP_QUIRK_F("OEM", "SFP+ONU-XGSPON", sfp_fixup_potron),
+ // 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),
// OEM XGSPONST2001 is an XGS-PON ONT stick with broken TX_FAULT and
// LOS indicators and slow startup, just like potron. On cold
@@ -652,11 +643,20 @@ static const struct sfp_quirk sfp_quirks[] = {
// match the part as a prefix.
SFP_QUIRK_F_PREFIX("OEM", "XGSPONST2001", sfp_fixup_potron),
+ SFP_QUIRK_S("UBNT", "UF-INSTANT", sfp_quirk_ubnt_uf_instant),
+
+ // Walsun HXSX-ATR[CI]-1 don't identify as copper, and use the
+ // Rollball protocol to talk to the PHY.
+ SFP_QUIRK_F("Walsun", "HXSX-ATRC-1", sfp_fixup_fs_10gt),
+ SFP_QUIRK_F("Walsun", "HXSX-ATRI-1", sfp_fixup_fs_10gt),
+
+ SFP_QUIRK_F("YV", "SFP+ONU-XGSPON", sfp_fixup_potron),
+
SFP_QUIRK_S("TP-LINK", "TL-SM410U", sfp_quirk_oem_2_5g),
- 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),
+ SFP_QUIRK_F("Turris", "RTSFP-2.5G", sfp_fixup_rollball),
SFP_QUIRK_F("XikeStor", "SKT-2.5G-100M", sfp_fixup_xikestor_2_5g),
--
2.34.1
next prev parent reply other threads:[~2026-11-18 16:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 16:23 [PATCH net-next v3 0/2] net: sfp: add ODI quirk and sort SFP quirk entries github
2026-11-18 16:23 ` [PATCH net-next v3 1/2] net: sfp: add 2500base-X quirk for ODI DFP-34X-2C3 github
2026-11-18 18:15 ` Andrew Lunn
[not found] ` <4fb66a63-b483-4777-9fe4-b94ccbe733b3@SynologyNAS>
2026-11-18 20:32 ` Andrew Lunn
2026-11-18 23:38 ` Andrew Lunn
2026-11-18 16:23 ` github [this message]
2026-11-18 18:11 ` [PATCH net-next v3 2/2] net: sfp: sort OEM and Turris SFP quirks Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118162323.436219-3-github@bumblecito.com \
--to=github@bumblecito.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.