net: dsa: microchip: bypass dev_ops for phy_read()/phy_write()

phy_read() and phy_write() are handled through common functions that
redirect the treatment to ksz_dev_ops callbacks. This layer of
indirection isn't needed since we now have a dsa_switch_ops for each
kind of switch

Remove one indirection layer for KSZ switches, by connecting the
ksz_dev_ops::phy_r() and ksz_dev_ops::phy_w() operations directly to
dsa_switch_ops.
Remove the now unused phy_r()/phy_w() callbacks from ksz_dev_ops.

Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
Link: https://patch.msgid.link/20260521-clean-ksz-2nd-series-v3-8-75c38971c19a@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c
index 09968aec6506395f5614d3e6d6d46892f5e8a224..0f84b2e7d25d832021942e66352f94d34eb4c1a8 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8.c
+++ b/drivers/net/dsa/microchip/ksz8.c
@@ -1057,6 +1057,19 @@ static int ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val)
        return 0;
 }
 
+static int ksz8_phy_read16(struct dsa_switch *ds, int addr, int reg)
+{
+       struct ksz_device *dev = ds->priv;
+       u16 val = 0xffff;
+       int ret;
+
+       ret = ksz8_r_phy(dev, addr, reg, &val);
+       if (ret)
+               return ret;
+
+       return val;
+}
+
 /**
  * ksz8_w_phy_ctrl - Translates and writes to the SMI interface from a MIIM PHY
  *                  Control register (Reg. 31).
@@ -1266,6 +1279,18 @@ static int ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val)
        return 0;
 }
 
+static int ksz8_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)
+{
+       struct ksz_device *dev = ds->priv;
+       int ret;
+
+       ret = ksz8_w_phy(dev, addr, reg, val);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 static void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member)
 {
        int offset = P_MIRROR_CTRL;
@@ -2194,6 +2219,19 @@ static int ksz8463_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val)
        return 0;
 }
 
+static int ksz8463_phy_read16(struct dsa_switch *ds, int addr, int reg)
+{
+       struct ksz_device *dev = ds->priv;
+       u16 val = 0xffff;
+       int ret;
+
+       ret = ksz8463_r_phy(dev, addr, reg, &val);
+       if (ret)
+               return ret;
+
+       return val;
+}
+
 static int ksz8463_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val)
 {
        u16 sw_reg = 0;
@@ -2222,6 +2260,18 @@ static int ksz8463_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val)
        return 0;
 }
 
+static int ksz8463_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)
+{
+       struct ksz_device *dev = ds->priv;
+       int ret;
+
+       ret = ksz8463_w_phy(dev, addr, reg, val);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 static int ksz8_switch_init(struct ksz_device *dev)
 {
        dev->cpu_port = fls(dev->info->cpu_ports) - 1;
@@ -2330,8 +2380,6 @@ const struct phylink_mac_ops ksz8_phylink_mac_ops = {
 const struct ksz_dev_ops ksz8463_dev_ops = {
        .get_port_addr = ksz8463_get_port_addr,
        .cfg_port_member = ksz8_cfg_port_member,
-       .r_phy = ksz8463_r_phy,
-       .w_phy = ksz8463_w_phy,
        .r_mib_cnt = ksz8_r_mib_cnt,
        .r_mib_pkt = ksz8_r_mib_pkt,
        .r_mib_stat64 = ksz88xx_r_mib_stats64,
@@ -2343,8 +2391,6 @@ const struct ksz_dev_ops ksz8463_dev_ops = {
 const struct ksz_dev_ops ksz87xx_dev_ops = {
        .get_port_addr = ksz8_get_port_addr,
        .cfg_port_member = ksz8_cfg_port_member,
-       .r_phy = ksz8_r_phy,
-       .w_phy = ksz8_w_phy,
        .r_mib_cnt = ksz8_r_mib_cnt,
        .r_mib_pkt = ksz8_r_mib_pkt,
        .r_mib_stat64 = ksz_r_mib_stats64,
@@ -2359,8 +2405,6 @@ const struct ksz_dev_ops ksz87xx_dev_ops = {
 const struct ksz_dev_ops ksz88xx_dev_ops = {
        .get_port_addr = ksz8_get_port_addr,
        .cfg_port_member = ksz8_cfg_port_member,
-       .r_phy = ksz8_r_phy,
-       .w_phy = ksz8_w_phy,
        .r_mib_cnt = ksz8_r_mib_cnt,
        .r_mib_pkt = ksz8_r_mib_pkt,
        .r_mib_stat64 = ksz88xx_r_mib_stats64,
@@ -2378,8 +2422,8 @@ const struct dsa_switch_ops ksz8463_switch_ops = {
        .get_phy_flags          = ksz_get_phy_flags,
        .setup                  = ksz8_setup,
        .teardown               = ksz_teardown,
-       .phy_read               = ksz_phy_read16,
-       .phy_write              = ksz_phy_write16,
+       .phy_read               = ksz8463_phy_read16,
+       .phy_write              = ksz8463_phy_write16,
        .phylink_get_caps       = ksz8_phylink_get_caps,
        .port_setup             = ksz8_dsa_port_setup,
        .get_strings            = ksz_get_strings,
@@ -2438,8 +2482,8 @@ const struct dsa_switch_ops ksz87xx_switch_ops = {
        .get_phy_flags          = ksz_get_phy_flags,
        .setup                  = ksz8_setup,
        .teardown               = ksz_teardown,
-       .phy_read               = ksz_phy_read16,
-       .phy_write              = ksz_phy_write16,
+       .phy_read               = ksz8_phy_read16,
+       .phy_write              = ksz8_phy_write16,
        .phylink_get_caps       = ksz8_phylink_get_caps,
        .port_setup             = ksz8_dsa_port_setup,
        .get_strings            = ksz_get_strings,
@@ -2498,8 +2542,8 @@ const struct dsa_switch_ops ksz88xx_switch_ops = {
        .get_phy_flags          = ksz_get_phy_flags,
        .setup                  = ksz8_setup,
        .teardown               = ksz_teardown,
-       .phy_read               = ksz_phy_read16,
-       .phy_write              = ksz_phy_write16,
+       .phy_read               = ksz8_phy_read16,
+       .phy_write              = ksz8_phy_write16,
        .phylink_get_caps       = ksz8_phylink_get_caps,
        .port_setup             = ksz8_dsa_port_setup,
        .get_strings            = ksz_get_strings,

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index aac7fc478eda8e46dc95c2bde681925afe344ed8..c1395322e54bac7839ff697b492013361fd222f9 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -575,6 +575,19 @@ static int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)
        return 0;
 }
 
+static int ksz9477_phy_read16(struct dsa_switch *ds, int addr, int reg)
+{
+       struct ksz_device *dev = ds->priv;
+       u16 val = 0xffff;
+       int ret;
+
+       ret = ksz9477_r_phy(dev, addr, reg, &val);
+       if (ret)
+               return ret;
+
+       return val;
+}
+
 static int ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val)
 {
        u32 mask, val32;
@@ -600,6 +613,18 @@ static int ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val)
        return ksz_prmw32(dev, addr, 0x100 + (reg << 1), mask, val32);
 }
 
+static int ksz9477_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)
+{
+       struct ksz_device *dev = ds->priv;
+       int ret;
+
+       ret = ksz9477_w_phy(dev, addr, reg, val);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 void ksz9477_cfg_port_member(struct ksz_device *dev, int port, u8 member)
 {
        ksz_pwrite32(dev, port, REG_PORT_VLAN_MEMBERSHIP__4, member);
@@ -1912,8 +1937,6 @@ const struct phylink_mac_ops ksz9477_phylink_mac_ops = {
 const struct ksz_dev_ops ksz9477_dev_ops = {
        .get_port_addr = ksz9477_get_port_addr,
        .cfg_port_member = ksz9477_cfg_port_member,
-       .r_phy = ksz9477_r_phy,
-       .w_phy = ksz9477_w_phy,
        .r_mib_cnt = ksz9477_r_mib_cnt,
        .r_mib_pkt = ksz9477_r_mib_pkt,
        .r_mib_stat64 = ksz_r_mib_stats64,
@@ -1932,8 +1955,8 @@ const struct dsa_switch_ops ksz9477_switch_ops = {
        .get_phy_flags          = ksz_get_phy_flags,
        .setup                  = ksz9477_setup,
        .teardown               = ksz_teardown,
-       .phy_read               = ksz_phy_read16,
-       .phy_write              = ksz_phy_write16,
+       .phy_read               = ksz9477_phy_read16,
+       .phy_write              = ksz9477_phy_write16,
        .phylink_get_caps       = ksz9477_phylink_get_caps,
        .port_setup             = ksz9477_dsa_port_setup,
        .set_ageing_time        = ksz9477_set_ageing_time,

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 3c09bc8ffaec4e5b317d300c9acad677f1124bed..57c8abfe0147deb67bc86820c90754c2cf8dad91 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -2838,31 +2838,6 @@ void ksz_init_mib_timer(struct ksz_device *dev)
        }
 }
 
-int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg)
-{
-       struct ksz_device *dev = ds->priv;
-       u16 val = 0xffff;
-       int ret;
-
-       ret = dev->dev_ops->r_phy(dev, addr, reg, &val);
-       if (ret)
-               return ret;
-
-       return val;
-}
-
-int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)
-{
-       struct ksz_device *dev = ds->priv;
-       int ret;
-
-       ret = dev->dev_ops->w_phy(dev, addr, reg, val);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
 u32 ksz_get_phy_flags(struct dsa_switch *ds, int port)
 {
        struct ksz_device *dev = ds->priv;

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index c66d75347c6cb6308853aedb9fa9aec3c80d3b25..b67038cf1bd09084cf229f63139d487db7a235bd 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -398,8 +398,6 @@ struct ksz_dev_ops {
         *  - Negative error code on failure (e.g., invalid configuration).
         */
        int (*create_phy_addr_map)(struct ksz_device *dev, bool side_mdio);
-       int (*r_phy)(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);
-       int (*w_phy)(struct ksz_device *dev, u16 phy, u16 reg, u16 val);
        void (*r_mib_cnt)(struct ksz_device *dev, int port, u16 addr,
                          u64 *cnt);
        void (*r_mib_pkt)(struct ksz_device *dev, int port, u16 addr,
@@ -442,8 +440,6 @@ void ksz_switch_macaddr_put(struct dsa_switch *ds);
 void ksz_switch_shutdown(struct ksz_device *dev);
 int ksz_handle_wake_reason(struct ksz_device *dev, int port);
 
-int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg);
-int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val);
 u32 ksz_get_phy_flags(struct dsa_switch *ds, int port);
 
 int ksz_sset_count(struct dsa_switch *ds, int port, int sset);

diff --git a/drivers/net/dsa/microchip/lan937x_main.c b/drivers/net/dsa/microchip/lan937x_main.c
index 690f99da0bfee633680f7b84e88ad3dd2f27e85b..536153886f7b8cea9e5adc38abcaeed4d8b2d5fa 100644 (file)
--- a/drivers/net/dsa/microchip/lan937x_main.c
+++ b/drivers/net/dsa/microchip/lan937x_main.c
@@ -334,14 +334,29 @@ static int lan937x_internal_phy_read(struct ksz_device *dev, int addr, int reg,
        return ksz_read16(dev, REG_VPHY_IND_DATA__2, val);
 }
 
-static int lan937x_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)
+static int lan937x_phy_read16(struct dsa_switch *ds, int addr, int reg)
 {
-       return lan937x_internal_phy_read(dev, addr, reg, data);
+       struct ksz_device *dev = ds->priv;
+       u16 val = 0xffff;
+       int ret;
+
+       ret =  lan937x_internal_phy_read(dev, addr, reg, &val);
+       if (ret)
+               return ret;
+
+       return val;
 }
 
-static int lan937x_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val)
+static int lan937x_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)
 {
-       return lan937x_internal_phy_write(dev, addr, reg, val);
+       struct ksz_device *dev = ds->priv;
+       int ret;
+
+       ret = lan937x_internal_phy_write(dev, addr, reg, val);
+       if (ret)
+               return ret;
+
+       return 0;
 }
 
 static int lan937x_reset_switch(struct ksz_device *dev)
@@ -818,8 +833,6 @@ const struct ksz_dev_ops lan937x_dev_ops = {
        .cfg_port_member = ksz9477_cfg_port_member,
        .mdio_bus_preinit = lan937x_mdio_bus_preinit,
        .create_phy_addr_map = lan937x_create_phy_addr_map,
-       .r_phy = lan937x_r_phy,
-       .w_phy = lan937x_w_phy,
        .r_mib_cnt = ksz9477_r_mib_cnt,
        .r_mib_pkt = ksz9477_r_mib_pkt,
        .r_mib_stat64 = ksz_r_mib_stats64,
@@ -836,8 +849,8 @@ const struct dsa_switch_ops lan937x_switch_ops = {
        .get_phy_flags          = ksz_get_phy_flags,
        .setup                  = lan937x_setup,
        .teardown               = ksz_teardown,
-       .phy_read               = ksz_phy_read16,
-       .phy_write              = ksz_phy_write16,
+       .phy_read               = lan937x_phy_read16,
+       .phy_write              = lan937x_phy_write16,
        .phylink_get_caps       = lan937x_phylink_get_caps,
        .port_setup             = lan937x_dsa_port_setup,
        .set_ageing_time        = lan937x_set_ageing_time,