]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: phy: aquantia: promote AQR813 and AQR114C to aqr_gen4_config_init()
authorVladimir Oltean <vladimir.oltean@nxp.com>
Thu, 21 Aug 2025 15:20:21 +0000 (18:20 +0300)
committerJakub Kicinski <kuba@kernel.org>
Mon, 25 Aug 2025 17:54:16 +0000 (10:54 -0700)
I'm not sure whether there is any similar real-life problem on AQR813
and AQR114C as were seen on the PHYs that these commit were written for:
a7f3abcf6357 ("net: phy: aquantia: only poll GLOBAL_CFG regs on
  aqr113, aqr113c and aqr115c")
bed90b06b681 ("net: phy: aquantia: clear PMD Global Transmit Disable
  bit during init")

but the inconsistency in handling between PHYs of the same generation is
striking. Apart from different firmware builds with different
provisioning, the only difference between these PHYs should be the max
link speed and/or the number of ports.

Let's try and see if there's any problem if all PHYs from the same
generation use the same config_init() method.

Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Cc: Robert Marko <robimarko@gmail.com>
Cc: Paweł Owoc <frut3k7@gmail.com>
Cc: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20250821152022.1065237-15-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/aquantia/aquantia_main.c

index eb4409fdad347281c544585a501c6df30aade7e2..dd83205a8869c55ea1101af88166e9b3bcc9be98 100644 (file)
@@ -1324,7 +1324,7 @@ static struct phy_driver aqr_driver[] = {
        .name           = "Aquantia AQR114C",
        .probe          = aqr107_probe,
        .get_rate_matching = aqr_gen2_get_rate_matching,
-       .config_init    = aqr_gen2_config_init,
+       .config_init    = aqr_gen4_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,
@@ -1374,7 +1374,7 @@ static struct phy_driver aqr_driver[] = {
        .name           = "Aquantia AQR813",
        .probe          = aqr107_probe,
        .get_rate_matching = aqr_gen2_get_rate_matching,
-       .config_init    = aqr_gen2_config_init,
+       .config_init    = aqr_gen4_config_init,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,