mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 18:20:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: sfp: convert sfp quirks to modify struct sfp_module_support

Browse source 
In order to provide extensible module support properties, arrange for
the SFP quirks to modify any member of the sfp_module_support struct,
rather than just the ethtool link modes and interfaces.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uydVe-000000061WK-3KwI@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle) 2025-09-16 22:46:46 +01:00 committed by Jakub Kicinski
parent ddae6127af
commit a7dc35a9e4
3 changed files with 28 additions and 30 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/phy/sfp-bus.c
View file

@ -373,9 +373,8 @@ static void sfp_init_module(struct sfp_bus *bus,
sfp_module_parse_port(bus, id); sfp_module_parse_port(bus, id);
sfp_module_parse_may_have_phy(bus, id); sfp_module_parse_may_have_phy(bus, id);
if (quirk && quirk->modes) if (quirk && quirk->support)
quirk->modes(id, bus->caps.link_modes, quirk->support(id, &bus->caps);
bus->caps.interfaces);
} }
/** /**

49
drivers/net/phy/sfp.c
View file

@ -440,45 +440,44 @@ static void sfp_fixup_rollball_cc(struct sfp *sfp)
} }
static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id, static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
unsigned long *modes, struct sfp_module_caps *caps)
unsigned long *interfaces)
{ {
linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT, modes); linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT,
__set_bit(PHY_INTERFACE_MODE_2500BASEX, interfaces); caps->link_modes);
__set_bit(PHY_INTERFACE_MODE_2500BASEX, caps->interfaces);
} }
static void sfp_quirk_disable_autoneg(const struct sfp_eeprom_id *id, static void sfp_quirk_disable_autoneg(const struct sfp_eeprom_id *id,
unsigned long *modes, struct sfp_module_caps *caps)
unsigned long *interfaces)
{ {
linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, modes); linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, caps->link_modes);
} }
static void sfp_quirk_oem_2_5g(const struct sfp_eeprom_id *id, static void sfp_quirk_oem_2_5g(const struct sfp_eeprom_id *id,
unsigned long *modes, struct sfp_module_caps *caps)
unsigned long *interfaces)
{ {
/* Copper 2.5G SFP */ /* Copper 2.5G SFP */
linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, modes); linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
__set_bit(PHY_INTERFACE_MODE_2500BASEX, interfaces); caps->link_modes);
sfp_quirk_disable_autoneg(id, modes, interfaces); __set_bit(PHY_INTERFACE_MODE_2500BASEX, caps->interfaces);
sfp_quirk_disable_autoneg(id, caps);
} }
static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id, static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id,
unsigned long *modes, struct sfp_module_caps *caps)
unsigned long *interfaces)
{ {
/* Ubiquiti U-Fiber Instant module claims that support all transceiver /* Ubiquiti U-Fiber Instant module claims that support all transceiver
* types including 10G Ethernet which is not truth. So clear all claimed * types including 10G Ethernet which is not truth. So clear all claimed
* modes and set only one mode which module supports: 1000baseX_Full. * modes and set only one mode which module supports: 1000baseX_Full.
*/ */
linkmode_zero(modes); linkmode_zero(caps->link_modes);
linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, modes); linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
caps->link_modes);
} }
#define SFP_QUIRK(_v, _p, _m, _f) \ #define SFP_QUIRK(_v, _p, _s, _f) \
{ .vendor = _v, .part = _p, .modes = _m, .fixup = _f, } { .vendor = _v, .part = _p, .support = _s, .fixup = _f, }
#define SFP_QUIRK_M(_v, _p, _m) SFP_QUIRK(_v, _p, _m, NULL) #define SFP_QUIRK_S(_v, _p, _s) SFP_QUIRK(_v, _p, _s, NULL)
#define SFP_QUIRK_F(_v, _p, _f) SFP_QUIRK(_v, _p, NULL, _f) #define SFP_QUIRK_F(_v, _p, _f) SFP_QUIRK(_v, _p, NULL, _f)
static const struct sfp_quirk sfp_quirks[] = { static const struct sfp_quirk sfp_quirks[] = {
@ -514,7 +513,7 @@ static const struct sfp_quirk sfp_quirks[] = {
// HG MXPD-483II-F 2.5G supports 2500Base-X, but incorrectly reports // HG MXPD-483II-F 2.5G supports 2500Base-X, but incorrectly reports
// 2600MBd in their EERPOM // 2600MBd in their EERPOM
SFP_QUIRK_M("HG GENUINE", "MXPD-483II", sfp_quirk_2500basex), SFP_QUIRK_S("HG GENUINE", "MXPD-483II", sfp_quirk_2500basex),
// Huawei MA5671A can operate at 2500base-X, but report 1.2GBd NRZ in // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd NRZ in
// their EEPROM // their EEPROM
@ -523,9 +522,9 @@ static const struct sfp_quirk sfp_quirks[] = {
// Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report // Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report
// 2500MBd NRZ in their EEPROM // 2500MBd NRZ in their EEPROM
SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex), SFP_QUIRK_S("Lantech", "8330-262D-E", sfp_quirk_2500basex),
SFP_QUIRK_M("UBNT", "UF-INSTANT", sfp_quirk_ubnt_uf_instant), SFP_QUIRK_S("UBNT", "UF-INSTANT", sfp_quirk_ubnt_uf_instant),
// Walsun HXSX-ATR[CI]-1 don't identify as copper, and use the // Walsun HXSX-ATR[CI]-1 don't identify as copper, and use the
// Rollball protocol to talk to the PHY. // Rollball protocol to talk to the PHY.
@ -538,9 +537,9 @@ static const struct sfp_quirk sfp_quirks[] = {
SFP_QUIRK_F("OEM", "SFP-GE-T", sfp_fixup_ignore_tx_fault), 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_rollball_cc),
SFP_QUIRK_M("OEM", "SFP-2.5G-T", sfp_quirk_oem_2_5g), SFP_QUIRK_S("OEM", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
SFP_QUIRK_M("OEM", "SFP-2.5G-BX10-D", sfp_quirk_2500basex), SFP_QUIRK_S("OEM", "SFP-2.5G-BX10-D", sfp_quirk_2500basex),
SFP_QUIRK_M("OEM", "SFP-2.5G-BX10-U", sfp_quirk_2500basex), 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-10", sfp_fixup_rollball_cc),
SFP_QUIRK_F("OEM", "RTSFP-10G", sfp_fixup_rollball_cc), SFP_QUIRK_F("OEM", "RTSFP-10G", sfp_fixup_rollball_cc),
SFP_QUIRK_F("Turris", "RTSFP-2.5G", sfp_fixup_rollball), SFP_QUIRK_F("Turris", "RTSFP-2.5G", sfp_fixup_rollball),

4
drivers/net/phy/sfp.h
View file

@ -9,8 +9,8 @@ struct sfp;
struct sfp_quirk { struct sfp_quirk {
const char *vendor; const char *vendor;
const char *part; const char *part;
void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes, void (*support)(const struct sfp_eeprom_id *id,
unsigned long *interfaces); struct sfp_module_caps *caps);
void (*fixup)(struct sfp *sfp); void (*fixup)(struct sfp *sfp);
}; };