net: phy: aquantia: rename some aqr107 functions according to generation

Establish a more intuitive function naming convention in this driver.
A GenX PHY must only call aqr_genY_ functions, where Y <= X.

Loosely speaking, aqr107_ is representative of Gen2 and above, except for:
- aqr107_config_init()
- aqr107_suspend()
- aqr107_resume()
- aqr107_wait_processor_intensive_op()

which are also called by AQR105, so these are renamed to Gen1.

Actually aqr107_config_init() is renamed to aqr_gen1_config_init() when
called by AQR105, and aqr_gen2_config_init() when called by all other
PHYs. The Gen2 function calls the Gen1 function, so there is no
functional change. This prefaces further Gen2-specific initialization
steps which must be omitted for AQR105. These will be added to
aqr_gen2_config_init().

In fact, many PHY drivers call an aqr*_config_init() beneath their
generation's feature set: AQR114C is a Gen4 PHY which calls
aqr_gen2_config_init(), even though AQR113C, also a Gen4 PHY which
differs only in maximum link speed, calls the richer
aqr113c_config_init() which also sets phydev->possible_interfaces.
Many of the more subtle inconsistencies of this kind will be fixed up in
later changes.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20250821152022.1065237-5-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
index 7ac0b685a3177464231c0aff81a0999139d3377e..8136f7843a373862588a8318fbaffa50858ec164 100644 (file)
--- a/drivers/net/phy/aquantia/aquantia_main.c
+++ b/drivers/net/phy/aquantia/aquantia_main.c
@@ -811,7 +811,7 @@ static int aqr107_config_mdi(struct phy_device *phydev)
                              mdi_conf | PMAPMD_RSVD_VEND_PROV_MDI_FORCE);
 }
 
-static int aqr107_config_init(struct phy_device *phydev)
+static int aqr_gen1_config_init(struct phy_device *phydev)
 {
        struct aqr107_priv *priv = phydev->priv;
        u32 led_idx;
@@ -860,6 +860,11 @@ static int aqr107_config_init(struct phy_device *phydev)
        return 0;
 }
 
+static int aqr_gen2_config_init(struct phy_device *phydev)
+{
+       return aqr_gen1_config_init(phydev);
+}
+
 static int aqcs109_config_init(struct phy_device *phydev)
 {
        int ret;
@@ -921,7 +926,7 @@ static void aqr107_link_change_notify(struct phy_device *phydev)
                phydev_info(phydev, "Aquantia 1000Base-T2 mode active\n");
 }
 
-static int aqr107_wait_processor_intensive_op(struct phy_device *phydev)
+static int aqr_gen1_wait_processor_intensive_op(struct phy_device *phydev)
 {
        int val, err;
 
@@ -945,8 +950,8 @@ static int aqr107_wait_processor_intensive_op(struct phy_device *phydev)
        return 0;
 }
 
-static int aqr107_get_rate_matching(struct phy_device *phydev,
-                                   phy_interface_t iface)
+static int aqr_gen2_get_rate_matching(struct phy_device *phydev,
+                                     phy_interface_t iface)
 {
        if (iface == PHY_INTERFACE_MODE_10GBASER ||
            iface == PHY_INTERFACE_MODE_2500BASEX ||
@@ -955,7 +960,7 @@ static int aqr107_get_rate_matching(struct phy_device *phydev,
        return RATE_MATCH_NONE;
 }
 
-static int aqr107_suspend(struct phy_device *phydev)
+static int aqr_gen1_suspend(struct phy_device *phydev)
 {
        int err;
 
@@ -964,10 +969,10 @@ static int aqr107_suspend(struct phy_device *phydev)
        if (err)
                return err;
 
-       return aqr107_wait_processor_intensive_op(phydev);
+       return aqr_gen1_wait_processor_intensive_op(phydev);
 }
 
-static int aqr107_resume(struct phy_device *phydev)
+static int aqr_gen1_resume(struct phy_device *phydev)
 {
        int err;
 
@@ -976,7 +981,7 @@ static int aqr107_resume(struct phy_device *phydev)
        if (err)
                return err;
 
-       return aqr107_wait_processor_intensive_op(phydev);
+       return aqr_gen1_wait_processor_intensive_op(phydev);
 }
 
 static const u16 aqr_global_cfg_regs[] = {
@@ -988,7 +993,7 @@ static const u16 aqr_global_cfg_regs[] = {
        VEND1_GLOBAL_CFG_10G
 };
 
-static int aqr107_fill_interface_modes(struct phy_device *phydev)
+static int aqr_gen2_fill_interface_modes(struct phy_device *phydev)
 {
        unsigned long *possible = phydev->possible_interfaces;
        struct aqr107_priv *priv = phydev->priv;
@@ -1089,11 +1094,11 @@ static int aqr113c_config_init(struct phy_device *phydev)
 
        priv->wait_on_global_cfg = true;
 
-       ret = aqr107_config_init(phydev);
+       ret = aqr_gen2_config_init(phydev);
        if (ret < 0)
                return ret;
 
-       ret = aqr107_fill_interface_modes(phydev);
+       ret = aqr_gen2_fill_interface_modes(phydev);
        if (ret)
                return ret;
 
@@ -1102,7 +1107,7 @@ static int aqr113c_config_init(struct phy_device *phydev)
        if (ret)
                return ret;
 
-       return aqr107_wait_processor_intensive_op(phydev);
+       return aqr_gen1_wait_processor_intensive_op(phydev);
 }
 
 static int aqr107_probe(struct phy_device *phydev)
@@ -1144,13 +1149,13 @@ static struct phy_driver aqr_driver[] = {
        .name           = "Aquantia AQR105",
        .get_features   = aqr105_get_features,
        .probe          = aqr107_probe,
-       .config_init    = aqr107_config_init,
+       .config_init    = aqr_gen1_config_init,
        .config_aneg    = aqr105_config_aneg,
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,
        .read_status    = aqr105_read_status,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
 },
 {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR106),
@@ -1164,16 +1169,16 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR107),
        .name           = "Aquantia AQR107",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
-       .config_init    = aqr107_config_init,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
+       .config_init    = aqr_gen2_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1188,7 +1193,7 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),
        .name           = "Aquantia AQCS109",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
        .config_init    = aqcs109_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
@@ -1196,8 +1201,8 @@ static struct phy_driver aqr_driver[] = {
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1213,16 +1218,16 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR111),
        .name           = "Aquantia AQR111",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
-       .config_init    = aqr107_config_init,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
+       .config_init    = aqr_gen2_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1238,16 +1243,16 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR111B0),
        .name           = "Aquantia AQR111B0",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
-       .config_init    = aqr107_config_init,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
+       .config_init    = aqr_gen2_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1276,10 +1281,10 @@ static struct phy_driver aqr_driver[] = {
        .handle_interrupt = aqr_handle_interrupt,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .read_status    = aqr107_read_status,
-       .get_rate_matching = aqr107_get_rate_matching,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1299,10 +1304,10 @@ static struct phy_driver aqr_driver[] = {
        .handle_interrupt = aqr_handle_interrupt,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .read_status    = aqr107_read_status,
-       .get_rate_matching = aqr107_get_rate_matching,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1317,10 +1322,10 @@ static struct phy_driver aqr_driver[] = {
        .handle_interrupt = aqr_handle_interrupt,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .read_status    = aqr107_read_status,
-       .get_rate_matching = aqr107_get_rate_matching,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1330,7 +1335,7 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
        .name           = "Aquantia AQR113",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
        .config_init    = aqr113c_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
@@ -1338,8 +1343,8 @@ static struct phy_driver aqr_driver[] = {
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1354,7 +1359,7 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR113C),
        .name           = "Aquantia AQR113C",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
        .config_init    = aqr113c_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
@@ -1362,8 +1367,8 @@ static struct phy_driver aqr_driver[] = {
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1378,16 +1383,16 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR114C),
        .name           = "Aquantia AQR114C",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
-       .config_init    = aqr107_config_init,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
+       .config_init    = aqr_gen2_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1403,7 +1408,7 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR115C),
        .name           = "Aquantia AQR115C",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
        .config_init    = aqr113c_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
@@ -1411,8 +1416,8 @@ static struct phy_driver aqr_driver[] = {
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,
@@ -1428,16 +1433,16 @@ static struct phy_driver aqr_driver[] = {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR813),
        .name           = "Aquantia AQR813",
        .probe          = aqr107_probe,
-       .get_rate_matching = aqr107_get_rate_matching,
-       .config_init    = aqr107_config_init,
+       .get_rate_matching = aqr_gen2_get_rate_matching,
+       .config_init    = aqr_gen2_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,
        .read_status    = aqr107_read_status,
        .get_tunable    = aqr107_get_tunable,
        .set_tunable    = aqr107_set_tunable,
-       .suspend        = aqr107_suspend,
-       .resume         = aqr107_resume,
+       .suspend        = aqr_gen1_suspend,
+       .resume         = aqr_gen1_resume,
        .get_sset_count = aqr107_get_sset_count,
        .get_strings    = aqr107_get_strings,
        .get_stats      = aqr107_get_stats,