net: sfp: convert sfp quirks to modify struct sfp_module_support

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>

diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 35030c527fbed41e196e183dd643ed8ae8e6f9c0..b77190494b0458211caeff21c8e52217c067e4d8 100644 (file)
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -373,9 +373,8 @@ static void sfp_init_module(struct sfp_bus *bus,
        sfp_module_parse_port(bus, id);
        sfp_module_parse_may_have_phy(bus, id);
 
-       if (quirk && quirk->modes)
-               quirk->modes(id, bus->caps.link_modes,
-                            bus->caps.interfaces);
+       if (quirk && quirk->support)
+               quirk->support(id, &bus->caps);
 }
 
 /**

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 4cd1d6c51dc2a0cdfec738deea6c2bb2fab648ba..d49f91ac2e50ad11180cae056f0b5cd41698ac16 100644 (file)
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -440,45 +440,44 @@ static void sfp_fixup_rollball_cc(struct sfp *sfp)
 }
 
 static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
-                               unsigned long *modes,
-                               unsigned long *interfaces)
+                               struct sfp_module_caps *caps)
 {
-       linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT, modes);
-       __set_bit(PHY_INTERFACE_MODE_2500BASEX, interfaces);
+       linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT,
+                        caps->link_modes);
+       __set_bit(PHY_INTERFACE_MODE_2500BASEX, caps->interfaces);
 }
 
 static void sfp_quirk_disable_autoneg(const struct sfp_eeprom_id *id,
-                                     unsigned long *modes,
-                                     unsigned long *interfaces)
+                                     struct sfp_module_caps *caps)
 {
-       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,
-                              unsigned long *modes,
-                              unsigned long *interfaces)
+                              struct sfp_module_caps *caps)
 {
        /* Copper 2.5G SFP */
-       linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, modes);
-       __set_bit(PHY_INTERFACE_MODE_2500BASEX, interfaces);
-       sfp_quirk_disable_autoneg(id, modes, interfaces);
+       linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
+                        caps->link_modes);
+       __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,
-                                     unsigned long *modes,
-                                     unsigned long *interfaces)
+                                     struct sfp_module_caps *caps)
 {
        /* Ubiquiti U-Fiber Instant module claims that support all transceiver
         * types including 10G Ethernet which is not truth. So clear all claimed
         * modes and set only one mode which module supports: 1000baseX_Full.
         */
-       linkmode_zero(modes);
-       linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, modes);
+       linkmode_zero(caps->link_modes);
+       linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
+                        caps->link_modes);
 }
 
-#define SFP_QUIRK(_v, _p, _m, _f) \
-       { .vendor = _v, .part = _p, .modes = _m, .fixup = _f, }
-#define SFP_QUIRK_M(_v, _p, _m) SFP_QUIRK(_v, _p, _m, NULL)
+#define SFP_QUIRK(_v, _p, _s, _f) \
+       { .vendor = _v, .part = _p, .support = _s, .fixup = _f, }
+#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)
 
 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
        // 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
        // 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
        // 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
        // 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-10G-T", sfp_fixup_rollball_cc),
-       SFP_QUIRK_M("OEM", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
-       SFP_QUIRK_M("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-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_F("OEM", "RTSFP-10", sfp_fixup_rollball_cc),
        SFP_QUIRK_F("OEM", "RTSFP-10G", sfp_fixup_rollball_cc),
        SFP_QUIRK_F("Turris", "RTSFP-2.5G", sfp_fixup_rollball),

diff --git a/drivers/net/phy/sfp.h b/drivers/net/phy/sfp.h
index 1fd097dccb9fc7072531fcd562710b1c5ee40a5b..879dff7afe6a4149583cce088c19acca4607d085 100644 (file)
--- a/drivers/net/phy/sfp.h
+++ b/drivers/net/phy/sfp.h
@@ -9,8 +9,8 @@ struct sfp;
 struct sfp_quirk {
        const char *vendor;
        const char *part;
-       void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes,
-                     unsigned long *interfaces);
+       void (*support)(const struct sfp_eeprom_id *id,
+                       struct sfp_module_caps *caps);
        void (*fixup)(struct sfp *sfp);
 };