* [PATCH net-next v3 0/2] net: sfp: add ODI quirk and sort SFP quirk entries @ 2026-11-18 16:23 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 16:23 ` [PATCH net-next v3 2/2] net: sfp: sort OEM and Turris SFP quirks github 0 siblings, 2 replies; 6+ messages in thread From: github @ 2026-11-18 16:23 UTC (permalink / raw) To: Russell King, Andrew Lunn, Heiner Kallweit Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev, linux-kernel From: Israel Cueto <github@bumblecito.com> This series adds 2500Base-X support for the ODI DFP-34X-2C3 XPON SFP module and performs a cleanup of the SFP quirk table. The first patch adds the ODI module quirk. The module was tested on a Horaco ZX-SWTGW2C8F switch, establishing a 2500 Mb/s link with speed and duplex forced and autonegotiation disabled. The second patch is an independent table-ordering cleanup, sorting the OEM and Turris entries without changing existing quirk behavior. Thanks to Andrew Lunn for the suggestion to include the additional ordering cleanup. Israel Cueto (2): net: sfp: add 2500base-X quirk for ODI DFP-34X-2C3 net: sfp: sort OEM and Turris SFP quirks drivers/net/phy/sfp.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) -- 2.34.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v3 1/2] net: sfp: add 2500base-X quirk for ODI DFP-34X-2C3 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 ` github 2026-11-18 18:15 ` Andrew Lunn 2026-11-18 16:23 ` [PATCH net-next v3 2/2] net: sfp: sort OEM and Turris SFP quirks github 1 sibling, 1 reply; 6+ messages in thread From: github @ 2026-11-18 16:23 UTC (permalink / raw) To: Russell King, Andrew Lunn, Heiner Kallweit Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev, linux-kernel From: Israel Cueto <github@bumblecito.com> The ODI DFP-34X-2C3 XPON SFP module supports 2500Base-X. Add a quirk to enable 2500Base-X support for this module. Tested on a Horaco ZX-SWTGW2C8F switch with an ODI DFP-34X-2C3 module. A 2500 Mb/s link was established with speed and duplex forced and autonegotiation disabled. Signed-off-by: Israel Cueto <github@bumblecito.com> --- drivers/net/phy/sfp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 915156743..960ac89cc 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -614,6 +614,9 @@ static const struct sfp_quirk sfp_quirks[] = { SFP_QUIRK("Lantech", "8330-265D", sfp_quirk_2500basex, sfp_fixup_ignore_los), + // 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 -- 2.34.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v3 1/2] net: sfp: add 2500base-X quirk for ODI DFP-34X-2C3 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> 0 siblings, 1 reply; 6+ messages in thread From: Andrew Lunn @ 2026-11-18 18:15 UTC (permalink / raw) To: github Cc: Russell King, Heiner Kallweit, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev, linux-kernel On Wed, Nov 18, 2026 at 04:23:22PM +0000, github@bumblecito.com wrote: > From: Israel Cueto <github@bumblecito.com> > > The ODI DFP-34X-2C3 XPON SFP module supports 2500Base-X. > > Add a quirk to enable 2500Base-X support for this module. > > Tested on a Horaco ZX-SWTGW2C8F switch with an ODI > DFP-34X-2C3 module. A 2500 Mb/s link was established > with speed and duplex forced and autonegotiation disabled. What happens without the quirk? Does it establish a link using 1000baseX? I'm just trying to ensure this is not going to break anybodies working system. Andrew ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <4fb66a63-b483-4777-9fe4-b94ccbe733b3@SynologyNAS>]
* Re: [PATCH net-next v3 1/2] net: sfp: add 2500base-X quirk for ODI DFP-34X-2C3 [not found] ` <4fb66a63-b483-4777-9fe4-b94ccbe733b3@SynologyNAS> @ 2026-11-18 20:32 ` Andrew Lunn 0 siblings, 0 replies; 6+ messages in thread From: Andrew Lunn @ 2026-11-18 20:32 UTC (permalink / raw) To: icue.retsam.diman Cc: github, Russell King, Heiner Kallweit, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev, linux-kernel On Wed, Nov 18, 2026 at 02:08:44PM -0600, icue.retsam.diman wrote: > > Hi Andrew, > > I tested the module without the quirk using an unmodified OpenWrt SNAPSHOT build (r38465-2ccaccdb98) for the GoodTop GT-SWTXG8FM (realtek/rtl930x). > > The ODI DFP-34X-2C3 successfully establishes a 1000base-X link with autonegotiation enabled. > > The ethtool lan8 output confirms: > > Advertised link modes: 1000baseX/Full > > Link partner advertised link modes: 1000baseX/Full > > Advertised auto-negotiation: Yes > > Link partner advertised auto-negotiation: Yes > > Speed: 1000Mb/s > > Duplex: Full > > Auto-negotiation: on > > Link detected: yes > > With the quirk, I was able to establish a 2500 Mb/s link with speed and duplex forced and autonegotiation disabled. > > Therefore, the module works with 1000base-X autonegotiation without the quirk, while the quirk enables 2500base-X operation. Thanks for testing. You could add a Tested-by: if you want. That will help get the change merge. What i was afraid of is that for some reason 2500BaseX is rejected by the other end, and it will only work at 1000BaseX. For a traditional SFP, that would be true if the SFP on the other end of the fibre could only do 1000BaseX. But this is not a traditional SFP, it is XPON. Can the OLT say no to 2500BaseX, or is this purely down to what the ONT can do? Andrew ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v3 2/2] net: sfp: sort OEM and Turris SFP quirks 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 16:23 ` github 2026-11-18 18:11 ` Andrew Lunn 1 sibling, 1 reply; 6+ messages in thread From: github @ 2026-11-18 16:23 UTC (permalink / raw) To: Russell King, Andrew Lunn, Heiner Kallweit Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev, linux-kernel 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v3 2/2] net: sfp: sort OEM and Turris SFP quirks 2026-11-18 16:23 ` [PATCH net-next v3 2/2] net: sfp: sort OEM and Turris SFP quirks github @ 2026-11-18 18:11 ` Andrew Lunn 0 siblings, 0 replies; 6+ messages in thread From: Andrew Lunn @ 2026-11-18 18:11 UTC (permalink / raw) To: github Cc: Russell King, Heiner Kallweit, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev, linux-kernel On Wed, Nov 18, 2026 at 04:23:23PM +0000, github@bumblecito.com wrote: > 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> Thanks for spending the extra time to do this. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-11-18 20:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 16:23 ` [PATCH net-next v3 2/2] net: sfp: sort OEM and Turris SFP quirks github
2026-11-18 18:11 ` Andrew Lunn
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®