* [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks
@ 2026-05-15 8:38 Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 1/8] net: dsa: microchip: don't reset on shutdown or driver removal Bastien Curutchet
` (7 more replies)
0 siblings, 8 replies; 11+ messages in thread
From: Bastien Curutchet @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric), Vladimir Oltean
Hi all,
This series continues the rework of the KSZ driver initiated by a previous
series (see [1]), following the discussion we had here [2].
The KSZ driver got way too convoluted over time because it uses a common
framework to handle more than 20 switches split in 5 families (see below
table)
+----------+---------+---------+---------+---------+---------+
| Family | KSZ8463 | KSZ87xx | KSZ88xx | KSZ9477 | LAN937X |
+----------+---------+---------+---------+---------+---------+
| Switches | KSZ8463 | KSZ8795 | KSZ88X3 | KSZ8563 | LAN9370 |
| | | KSZ8794 | KSZ8864 | KSZ9477 | LAN9371 |
| | | KSZ8765 | KSZ8895 | KSZ9896 | LAN9372 |
| | | | | KSZ9897 | LAN9373 |
| | | | | KSZ9893 | LAN9374 |
| | | | | KSZ9563 | |
| | | | | KSZ8567 | |
| | | | | KSZ9567 | |
| | | | | LAN9646 | |
+----------+---------+---------+---------+---------+---------+
The previous series ([1]) replaced the unique dsa_swicth_ops struct used
by all the KSZ families with one dsa_switch_ops struct for each family.
These dsa_switch_ops structs still rely on common functions that redirect
the calls to ksz_dev_ops operations which are custom to each switch
family. Many of hese ksz_dev_ops callbacks have a direct equivalent in the
struct dsa_switch_ops. This series directly connects the implementations of
these ksz_dev_ops operations to the relevant dsa_switch_ops attribute
to get rid of one unnecessary level of indirection.
On top of this on-going rework I added PTP and periodic output support for
the KSZ8463 (which was my first goal). There are more than 60 patches for
all this so this series will be followed by several others and if you
want to see the full picture we can check my github ([3]).
I haven't finished yet to group all the patches into meaningful series
but here is more or less what I plan to do next:
- A series will split again some operations to get rid of the
if (is_kszXYZ) branches.
- Maybe another series will be needed to completely move out of
ksz_common.c everything that isn't truly common to all the switches
- A series will add PTP support for the KSZ8463
- A final series will add periodic output support for the KSZ8463
FYI, I only have a KSZ8463 so, unfortunately, I can't test other switches.
[1]: https://lore.kernel.org/r/20260505-clean-ksz-driver-v1-0-05d70fa42461@bootlin.com
[2]: https://lore.kernel.org/r/20260304-ksz8463-ptp-v6-0-3f4c47954c71@bootlin.com)
[3]: https://github.com/bastien-curutchet/linux/tree/ksz_rework
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
Changes in v2:
- Remove patches 1 to 7 since they were applied on net-next
- PATCH 6 (previously 13): Create a LAN937x-specific port_setup()
instead of using the KSZ9477 one
- Link to v1: https://lore.kernel.org/r/20260512-clean-ksz-2nd-series-v1-0-c00f6ce037fa@bootlin.com
---
Bastien Curutchet (Schneider Electric) (3):
net: dsa: microchip: bypass dev_ops for port_setup()
net: dsa: microchip: call DSA's phy_{read/write} to do mdio {read/write}
net: dsa: microchip: bypass dev_ops for phy_read()/phy_write()
Vladimir Oltean (5):
net: dsa: microchip: don't reset on shutdown or driver removal
net: dsa: microchip: bypass dev_ops->setup() and teardown() for lan937x
net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz9477
net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz8
net: dsa: microchip: remove dev_ops->setup() and teardown()
drivers/net/dsa/microchip/ksz8.c | 235 ++++++++++++++++++++++++------
drivers/net/dsa/microchip/ksz9477.c | 184 ++++++++++++++++++++---
drivers/net/dsa/microchip/ksz_common.c | 241 +++----------------------------
drivers/net/dsa/microchip/ksz_common.h | 22 +--
drivers/net/dsa/microchip/lan937x_main.c | 169 ++++++++++++++++++----
5 files changed, 520 insertions(+), 331 deletions(-)
---
base-commit: 822d4a8e390a08ccfaf2abb347ae670b230b196f
change-id: 20260511-clean-ksz-2nd-series-3b755ec99cf0
Best regards,
--
Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH net-next v2 1/8] net: dsa: microchip: don't reset on shutdown or driver removal
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
@ 2026-05-15 8:38 ` Bastien Curutchet
2026-05-20 2:10 ` Jakub Kicinski
2026-05-15 8:38 ` [PATCH net-next v2 2/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for lan937x Bastien Curutchet
` (6 subsequent siblings)
7 siblings, 1 reply; 11+ messages in thread
From: Bastien Curutchet @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric), Vladimir Oltean
From: Vladimir Oltean <vladimir.oltean@nxp.com>
The ksz_switch driver is one of the few which reset the switch when
unbinding the driver or shutting down - in the same category with
ar9331_sw_remove(), bcm_sf2_sw_remove(), and ks8995_remove(),
vsc73xx_remove() and lan9303_remove().
I don't think there exists any requirement to do this, and in fact it
does create complications for WoL, as the code already shows.
My issue with this logic is that it is the only thing keeping
dev_ops->reset() necessary, which I would like to remove after
individual KSZ switch families get their own setup() and teardown()
methods that don't go through dev_ops.
Don't reset the switch when unbinding the driver or shutting down.
Remove the exit callbacks from the ksz_dev_ops.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
drivers/net/dsa/microchip/ksz8.c | 8 --------
drivers/net/dsa/microchip/ksz9477.c | 6 ------
drivers/net/dsa/microchip/ksz_common.c | 32 ++++++++------------------------
drivers/net/dsa/microchip/ksz_common.h | 1 -
drivers/net/dsa/microchip/lan937x_main.c | 6 ------
5 files changed, 8 insertions(+), 45 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c
index 825133e9ce6e6..ccbc3480717f0 100644
--- a/drivers/net/dsa/microchip/ksz8.c
+++ b/drivers/net/dsa/microchip/ksz8.c
@@ -2109,11 +2109,6 @@ static int ksz8_switch_init(struct ksz_device *dev)
return 0;
}
-static void ksz8_switch_exit(struct ksz_device *dev)
-{
- ksz8_reset_switch(dev);
-}
-
static enum dsa_tag_protocol ksz8463_get_tag_protocol(struct dsa_switch *ds,
int port,
enum dsa_tag_protocol mp)
@@ -2226,7 +2221,6 @@ const struct ksz_dev_ops ksz8463_dev_ops = {
.enable_stp_addr = ksz8_enable_stp_addr,
.reset = ksz8_reset_switch,
.init = ksz8_switch_init,
- .exit = ksz8_switch_exit,
};
const struct ksz_dev_ops ksz87xx_dev_ops = {
@@ -2245,7 +2239,6 @@ const struct ksz_dev_ops ksz87xx_dev_ops = {
.enable_stp_addr = ksz8_enable_stp_addr,
.reset = ksz8_reset_switch,
.init = ksz8_switch_init,
- .exit = ksz8_switch_exit,
.pme_write8 = ksz8_pme_write8,
.pme_pread8 = ksz8_pme_pread8,
.pme_pwrite8 = ksz8_pme_pwrite8,
@@ -2267,7 +2260,6 @@ const struct ksz_dev_ops ksz88xx_dev_ops = {
.enable_stp_addr = ksz8_enable_stp_addr,
.reset = ksz8_reset_switch,
.init = ksz8_switch_init,
- .exit = ksz8_switch_exit,
.pme_write8 = ksz8_pme_write8,
.pme_pread8 = ksz8_pme_pread8,
.pme_pwrite8 = ksz8_pme_pwrite8,
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 65fd07ef73ad0..88a5ff62aae89 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1624,11 +1624,6 @@ static int ksz9477_switch_init(struct ksz_device *dev)
return 0;
}
-static void ksz9477_switch_exit(struct ksz_device *dev)
-{
- ksz9477_reset_switch(dev);
-}
-
static enum dsa_tag_protocol ksz9477_get_tag_protocol(struct dsa_switch *ds,
int port,
enum dsa_tag_protocol mp)
@@ -1803,7 +1798,6 @@ const struct ksz_dev_ops ksz9477_dev_ops = {
.enable_stp_addr = ksz9477_enable_stp_addr,
.reset = ksz9477_reset_switch,
.init = ksz9477_switch_init,
- .exit = ksz9477_switch_exit,
.pcs_create = ksz9477_pcs_create,
};
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 4a7bcd1a93927..78d77a60a6ce2 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -4170,16 +4170,15 @@ int ksz_set_wol(struct dsa_switch *ds, int port,
* the wol_enabled flag accordingly to reflect whether WoL is active on any
* port.
*/
-static void ksz_wol_pre_shutdown(struct ksz_device *dev, bool *wol_enabled)
+static void ksz_wol_pre_shutdown(struct ksz_device *dev)
{
const struct ksz_dev_ops *ops = dev->dev_ops;
const u16 *regs = dev->info->regs;
u8 pme_pin_en = PME_ENABLE;
+ bool wol_enabled = false;
struct dsa_port *dp;
int ret;
- *wol_enabled = false;
-
if (!is_ksz9477(dev) && !ksz_is_ksz87xx(dev))
return;
@@ -4192,7 +4191,7 @@ static void ksz_wol_pre_shutdown(struct ksz_device *dev, bool *wol_enabled)
ret = ops->pme_pread8(dev, dp->index,
regs[REG_PORT_PME_CTRL], &pme_ctrl);
if (!ret && pme_ctrl)
- *wol_enabled = true;
+ wol_enabled = true;
/* make sure there are no pending wake events which would
* prevent the device from going to sleep/shutdown.
@@ -4201,7 +4200,7 @@ static void ksz_wol_pre_shutdown(struct ksz_device *dev, bool *wol_enabled)
}
/* Now we are save to enable PME pin. */
- if (*wol_enabled) {
+ if (wol_enabled) {
if (dev->pme_active_high)
pme_pin_en |= PME_POLARITY;
ops->pme_write8(dev, regs[REG_SW_PME_CTRL], pme_pin_en);
@@ -4480,20 +4479,12 @@ EXPORT_SYMBOL(ksz_switch_alloc);
* @dev: The switch device structure.
*
* This function is responsible for initiating a shutdown sequence for the
- * switch device. It invokes the reset operation defined in the device
- * operations, if available, to reset the switch. Subsequently, it calls the
- * DSA framework's shutdown function to ensure a proper shutdown of the DSA
- * switch.
+ * switch device. Subsequently, it calls the DSA framework's shutdown function
+ * to ensure a proper shutdown of the DSA switch.
*/
void ksz_switch_shutdown(struct ksz_device *dev)
{
- bool wol_enabled = false;
-
- ksz_wol_pre_shutdown(dev, &wol_enabled);
-
- if (dev->dev_ops->reset && !wol_enabled)
- dev->dev_ops->reset(dev);
-
+ ksz_wol_pre_shutdown(dev);
dsa_switch_shutdown(dev->ds);
}
EXPORT_SYMBOL(ksz_switch_shutdown);
@@ -4943,10 +4934,8 @@ int ksz_switch_register(struct ksz_device *dev)
}
ret = dsa_register_switch(dev->ds);
- if (ret) {
- dev->dev_ops->exit(dev);
+ if (ret)
return ret;
- }
/* Read MIB counters every 30 seconds to avoid overflow. */
dev->mib_read_interval = msecs_to_jiffies(5000);
@@ -4966,12 +4955,7 @@ void ksz_switch_remove(struct ksz_device *dev)
cancel_delayed_work_sync(&dev->mib_read);
}
- dev->dev_ops->exit(dev);
dsa_unregister_switch(dev->ds);
-
- if (dev->reset_gpio)
- gpiod_set_value_cansleep(dev->reset_gpio, 1);
-
}
EXPORT_SYMBOL(ksz_switch_remove);
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index f6dad256a550f..1cdb6661729a6 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -421,7 +421,6 @@ struct ksz_dev_ops {
int (*enable_stp_addr)(struct ksz_device *dev);
int (*reset)(struct ksz_device *dev);
int (*init)(struct ksz_device *dev);
- void (*exit)(struct ksz_device *dev);
int (*pcs_create)(struct ksz_device *dev);
};
diff --git a/drivers/net/dsa/microchip/lan937x_main.c b/drivers/net/dsa/microchip/lan937x_main.c
index f84548168b371..778e32f568df4 100644
--- a/drivers/net/dsa/microchip/lan937x_main.c
+++ b/drivers/net/dsa/microchip/lan937x_main.c
@@ -668,11 +668,6 @@ static void lan937x_teardown(struct dsa_switch *ds)
}
-static void lan937x_switch_exit(struct ksz_device *dev)
-{
- lan937x_reset_switch(dev);
-}
-
static enum dsa_tag_protocol lan937x_get_tag_protocol(struct dsa_switch *ds,
int port,
enum dsa_tag_protocol mp)
@@ -723,7 +718,6 @@ const struct ksz_dev_ops lan937x_dev_ops = {
.enable_stp_addr = ksz9477_enable_stp_addr,
.reset = lan937x_reset_switch,
.init = lan937x_switch_init,
- .exit = lan937x_switch_exit,
};
const struct dsa_switch_ops lan937x_switch_ops = {
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next v2 2/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for lan937x
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 1/8] net: dsa: microchip: don't reset on shutdown or driver removal Bastien Curutchet
@ 2026-05-15 8:38 ` Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 3/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz9477 Bastien Curutchet
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Bastien Curutchet @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric), Vladimir Oltean
From: Vladimir Oltean <vladimir.oltean@nxp.com>
The KSZ switch families are sufficiently different that a common
ds->ops->setup() - ksz_setup() with micro-managed dev_ops->reset(),
dev_ops->pcs_create(), dev_ops->config_cpu_port(),
dev_ops->enable_stp_addr(), dev_ops->setup() seems to be too convoluted.
I am proposing to make each KSZ switch family part ways for
dsa_switch_ops :: setup() and teardown(), to allow them greater
flexibility. This here is the implementation for lan937x, which is
nothing other than a copy of ksz_setup() with the dev_ops function
pointers replaced with direct function calls.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
drivers/net/dsa/microchip/ksz_common.c | 12 ++--
drivers/net/dsa/microchip/ksz_common.h | 6 ++
drivers/net/dsa/microchip/lan937x_main.c | 116 ++++++++++++++++++++++++++++---
3 files changed, 116 insertions(+), 18 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 78d77a60a6ce2..c2624b1930f51 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -2488,7 +2488,7 @@ static int ksz_parse_dt_phy_config(struct ksz_device *dev, struct mii_bus *bus,
*
* Return: 0 on success, or a negative error code on failure.
*/
-static int ksz_mdio_register(struct ksz_device *dev)
+int ksz_mdio_register(struct ksz_device *dev)
{
struct device_node *parent_bus_node;
struct mii_bus *parent_bus = NULL;
@@ -2644,7 +2644,7 @@ static const struct irq_domain_ops ksz_irq_domain_ops = {
.xlate = irq_domain_xlate_twocell,
};
-static void ksz_irq_free(struct ksz_irq *kirq)
+void ksz_irq_free(struct ksz_irq *kirq)
{
int irq, virq;
@@ -2713,7 +2713,7 @@ static int ksz_irq_common_setup(struct ksz_device *dev, struct ksz_irq *kirq)
return ret;
}
-static int ksz_girq_setup(struct ksz_device *dev)
+int ksz_girq_setup(struct ksz_device *dev)
{
struct ksz_irq *girq = &dev->girq;
@@ -2728,7 +2728,7 @@ static int ksz_girq_setup(struct ksz_device *dev)
return ksz_irq_common_setup(dev, girq);
}
-static int ksz_pirq_setup(struct ksz_device *dev, u8 p)
+int ksz_pirq_setup(struct ksz_device *dev, u8 p)
{
struct ksz_irq *pirq = &dev->ports[p].pirq;
@@ -2745,8 +2745,6 @@ static int ksz_pirq_setup(struct ksz_device *dev, u8 p)
return ksz_irq_common_setup(dev, pirq);
}
-static int ksz_parse_drive_strength(struct ksz_device *dev);
-
int ksz_setup(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
@@ -4698,7 +4696,7 @@ static int ksz88x3_drive_strength_write(struct ksz_device *dev,
*
* Return: 0 on success, error code otherwise
*/
-static int ksz_parse_drive_strength(struct ksz_device *dev)
+int ksz_parse_drive_strength(struct ksz_device *dev)
{
struct ksz_driver_strength_prop of_props[] = {
[KSZ_DRIVER_STRENGTH_HI] = {
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 1cdb6661729a6..5fad56c2d067a 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -518,6 +518,12 @@ int ksz_hsr_leave(struct dsa_switch *ds, int port,
int ksz_suspend(struct dsa_switch *ds);
int ksz_resume(struct dsa_switch *ds);
+int ksz_mdio_register(struct ksz_device *dev);
+int ksz_pirq_setup(struct ksz_device *dev, u8 p);
+int ksz_girq_setup(struct ksz_device *dev);
+void ksz_irq_free(struct ksz_irq *kirq);
+int ksz_parse_drive_strength(struct ksz_device *dev);
+
/* Common register access functions */
static inline struct regmap *ksz_regmap_8(struct ksz_device *dev)
{
diff --git a/drivers/net/dsa/microchip/lan937x_main.c b/drivers/net/dsa/microchip/lan937x_main.c
index 778e32f568df4..ecb072cd99819 100644
--- a/drivers/net/dsa/microchip/lan937x_main.c
+++ b/drivers/net/dsa/microchip/lan937x_main.c
@@ -626,8 +626,49 @@ static int lan937x_switch_init(struct ksz_device *dev)
static int lan937x_setup(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
+ u16 storm_mask, storm_rate;
+ struct dsa_port *dp;
+ struct ksz_port *p;
+ const u16 *regs;
int ret;
+ regs = dev->info->regs;
+
+ dev->vlan_cache = devm_kcalloc(dev->dev, sizeof(struct vlan_table),
+ dev->info->num_vlans, GFP_KERNEL);
+ if (!dev->vlan_cache)
+ return -ENOMEM;
+
+ ret = lan937x_reset_switch(dev);
+ if (ret) {
+ dev_err(ds->dev, "failed to reset switch\n");
+ return ret;
+ }
+
+ ret = ksz_parse_drive_strength(dev);
+ if (ret)
+ return ret;
+
+ /* set broadcast storm protection 10% rate */
+ storm_mask = BROADCAST_STORM_RATE;
+ storm_rate = (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100;
+ regmap_update_bits(ksz_regmap_16(dev), regs[S_BROADCAST_CTRL],
+ storm_mask, storm_rate);
+
+ lan937x_config_cpu_port(ds);
+
+ ksz9477_enable_stp_addr(dev);
+
+ ds->num_tx_queues = dev->info->num_tx_queues;
+
+ regmap_update_bits(ksz_regmap_8(dev), regs[S_MULTICAST_CTRL],
+ MULTICAST_STORM_DISABLE, MULTICAST_STORM_DISABLE);
+
+ ksz_init_mib_timer(dev);
+
+ ds->configure_vlan_while_not_filtering = false;
+ ds->dscp_prio_mapping_is_global = true;
+
/* The VLAN aware is a global setting. Mixed vlan
* filterings are not supported.
*/
@@ -659,13 +700,71 @@ static int lan937x_setup(struct dsa_switch *ds)
return ret;
/* Disable global VPHY support. Related to CPU interface only? */
- return ksz_rmw32(dev, REG_SW_CFG_STRAP_OVR, SW_VPHY_DISABLE,
- SW_VPHY_DISABLE);
-}
+ ret = ksz_rmw32(dev, REG_SW_CFG_STRAP_OVR, SW_VPHY_DISABLE,
+ SW_VPHY_DISABLE);
+ if (ret < 0)
+ return ret;
-static void lan937x_teardown(struct dsa_switch *ds)
-{
+ /* Start with learning disabled on standalone user ports, and enabled
+ * on the CPU port. In lack of other finer mechanisms, learning on the
+ * CPU port will avoid flooding bridge local addresses on the network
+ * in some cases.
+ */
+ p = &dev->ports[dev->cpu_port];
+ p->learning = true;
+ if (dev->irq > 0) {
+ ret = ksz_girq_setup(dev);
+ if (ret)
+ return ret;
+
+ dsa_switch_for_each_user_port(dp, dev->ds) {
+ ret = ksz_pirq_setup(dev, dp->index);
+ if (ret)
+ goto port_release;
+
+ ret = ksz_ptp_irq_setup(ds, dp->index);
+ if (ret)
+ goto pirq_release;
+ }
+ }
+
+ ret = ksz_ptp_clock_register(ds);
+ if (ret) {
+ dev_err(dev->dev, "Failed to register PTP clock: %d\n",
+ ret);
+ goto port_release;
+ }
+
+ ret = ksz_mdio_register(dev);
+ if (ret < 0) {
+ dev_err(dev->dev, "failed to register the mdio");
+ goto out_ptp_clock_unregister;
+ }
+
+ ret = ksz_dcb_init(dev);
+ if (ret)
+ goto out_ptp_clock_unregister;
+
+ /* start switch */
+ regmap_update_bits(ksz_regmap_8(dev), regs[S_START_CTRL],
+ SW_START, SW_START);
+
+ return 0;
+
+out_ptp_clock_unregister:
+ ksz_ptp_clock_unregister(ds);
+port_release:
+ if (dev->irq > 0) {
+ dsa_switch_for_each_user_port_continue_reverse(dp, dev->ds) {
+ ksz_ptp_irq_free(ds, dp->index);
+pirq_release:
+ ksz_irq_free(&dev->ports[dp->index].pirq);
+ }
+ ksz_irq_free(&dev->girq);
+ }
+
+ return ret;
}
static enum dsa_tag_protocol lan937x_get_tag_protocol(struct dsa_switch *ds,
@@ -698,8 +797,6 @@ const struct phylink_mac_ops lan937x_phylink_mac_ops = {
};
const struct ksz_dev_ops lan937x_dev_ops = {
- .setup = lan937x_setup,
- .teardown = lan937x_teardown,
.get_port_addr = ksz9477_get_port_addr,
.cfg_port_member = ksz9477_cfg_port_member,
.port_setup = lan937x_port_setup,
@@ -713,10 +810,7 @@ const struct ksz_dev_ops lan937x_dev_ops = {
.freeze_mib = ksz9477_freeze_mib,
.port_init_cnt = ksz9477_port_init_cnt,
.setup_rgmii_delay = lan937x_setup_rgmii_delay,
- .config_cpu_port = lan937x_config_cpu_port,
.tc_cbs_set_cinc = lan937x_tc_cbs_set_cinc,
- .enable_stp_addr = ksz9477_enable_stp_addr,
- .reset = lan937x_reset_switch,
.init = lan937x_switch_init,
};
@@ -724,7 +818,7 @@ const struct dsa_switch_ops lan937x_switch_ops = {
.get_tag_protocol = lan937x_get_tag_protocol,
.connect_tag_protocol = lan937x_connect_tag_protocol,
.get_phy_flags = ksz_get_phy_flags,
- .setup = ksz_setup,
+ .setup = lan937x_setup,
.teardown = ksz_teardown,
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next v2 3/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz9477
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 1/8] net: dsa: microchip: don't reset on shutdown or driver removal Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 2/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for lan937x Bastien Curutchet
@ 2026-05-15 8:38 ` Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 4/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz8 Bastien Curutchet
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Bastien Curutchet @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric), Vladimir Oltean
From: Vladimir Oltean <vladimir.oltean@nxp.com>
The KSZ switch families are sufficiently different that a common
ds->ops->setup() - ksz_setup() with micro-managed dev_ops->reset(),
dev_ops->pcs_create(), dev_ops->config_cpu_port(),
dev_ops->enable_stp_addr(), dev_ops->setup() seems to be too convoluted.
I am proposing to make each KSZ switch family part ways for
dsa_switch_ops :: setup() and teardown(), to allow them greater
flexibility. This here is the implementation for ksz9477, which is
nothing other than a copy of ksz_setup() with the dev_ops function
pointers replaced with direct function calls.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
drivers/net/dsa/microchip/ksz9477.c | 127 +++++++++++++++++++++++++++++++++---
1 file changed, 118 insertions(+), 9 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 88a5ff62aae89..7385aa4e788a1 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1477,9 +1477,54 @@ int ksz9477_enable_stp_addr(struct ksz_device *dev)
static int ksz9477_setup(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
- const u16 *regs = dev->info->regs;
- int ret = 0;
+ u16 storm_mask, storm_rate;
+ struct dsa_port *dp;
+ struct ksz_port *p;
+ const u16 *regs;
+ int ret;
+
+ regs = dev->info->regs;
+
+ dev->vlan_cache = devm_kcalloc(dev->dev, sizeof(struct vlan_table),
+ dev->info->num_vlans, GFP_KERNEL);
+ if (!dev->vlan_cache)
+ return -ENOMEM;
+
+ ret = ksz9477_reset_switch(dev);
+ if (ret) {
+ dev_err(ds->dev, "failed to reset switch\n");
+ return ret;
+ }
+
+ ret = ksz_parse_drive_strength(dev);
+ if (ret)
+ return ret;
+ if (ksz_has_sgmii_port(dev)) {
+ ret = ksz9477_pcs_create(dev);
+ if (ret)
+ return ret;
+ }
+
+ /* set broadcast storm protection 10% rate */
+ storm_mask = BROADCAST_STORM_RATE;
+ storm_rate = (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100;
+ regmap_update_bits(ksz_regmap_16(dev), regs[S_BROADCAST_CTRL],
+ storm_mask, storm_rate);
+
+ ksz9477_config_cpu_port(ds);
+
+ ksz9477_enable_stp_addr(dev);
+
+ ds->num_tx_queues = dev->info->num_tx_queues;
+
+ regmap_update_bits(ksz_regmap_8(dev), regs[S_MULTICAST_CTRL],
+ MULTICAST_STORM_DISABLE, MULTICAST_STORM_DISABLE);
+
+ ksz_init_mib_timer(dev);
+
+ ds->configure_vlan_while_not_filtering = false;
+ ds->dscp_prio_mapping_is_global = true;
ds->mtu_enforcement_ingress = true;
/* Required for port partitioning. */
@@ -1512,7 +1557,76 @@ static int ksz9477_setup(struct dsa_switch *ds)
* be enabled by ksz_wol_pre_shutdown(). Otherwise, some PMICs
* do not like PME events changes before shutdown.
*/
- return ksz_write8(dev, regs[REG_SW_PME_CTRL], 0);
+ ret = ksz_write8(dev, regs[REG_SW_PME_CTRL], 0);
+ if (ret < 0)
+ return ret;
+
+ /* Start with learning disabled on standalone user ports, and enabled
+ * on the CPU port. In lack of other finer mechanisms, learning on the
+ * CPU port will avoid flooding bridge local addresses on the network
+ * in some cases.
+ */
+ p = &dev->ports[dev->cpu_port];
+ p->learning = true;
+
+ if (dev->irq > 0) {
+ ret = ksz_girq_setup(dev);
+ if (ret)
+ return ret;
+
+ dsa_switch_for_each_user_port(dp, dev->ds) {
+ ret = ksz_pirq_setup(dev, dp->index);
+ if (ret)
+ goto port_release;
+
+ if (dev->info->ptp_capable) {
+ ret = ksz_ptp_irq_setup(ds, dp->index);
+ if (ret)
+ goto pirq_release;
+ }
+ }
+ }
+
+ if (dev->info->ptp_capable) {
+ ret = ksz_ptp_clock_register(ds);
+ if (ret) {
+ dev_err(dev->dev, "Failed to register PTP clock: %d\n",
+ ret);
+ goto port_release;
+ }
+ }
+
+ ret = ksz_mdio_register(dev);
+ if (ret < 0) {
+ dev_err(dev->dev, "failed to register the mdio");
+ goto out_ptp_clock_unregister;
+ }
+
+ ret = ksz_dcb_init(dev);
+ if (ret)
+ goto out_ptp_clock_unregister;
+
+ /* start switch */
+ regmap_update_bits(ksz_regmap_8(dev), regs[S_START_CTRL],
+ SW_START, SW_START);
+
+ return 0;
+
+out_ptp_clock_unregister:
+ if (dev->info->ptp_capable)
+ ksz_ptp_clock_unregister(ds);
+port_release:
+ if (dev->irq > 0) {
+ dsa_switch_for_each_user_port_continue_reverse(dp, dev->ds) {
+ if (dev->info->ptp_capable)
+ ksz_ptp_irq_free(ds, dp->index);
+pirq_release:
+ ksz_irq_free(&dev->ports[dp->index].pirq);
+ }
+ ksz_irq_free(&dev->girq);
+ }
+
+ return ret;
}
u32 ksz9477_get_port_addr(int port, int offset)
@@ -1779,7 +1893,6 @@ const struct phylink_mac_ops ksz9477_phylink_mac_ops = {
};
const struct ksz_dev_ops ksz9477_dev_ops = {
- .setup = ksz9477_setup,
.get_port_addr = ksz9477_get_port_addr,
.cfg_port_member = ksz9477_cfg_port_member,
.port_setup = ksz9477_port_setup,
@@ -1793,19 +1906,15 @@ const struct ksz_dev_ops ksz9477_dev_ops = {
.pme_write8 = ksz_write8,
.pme_pread8 = ksz_pread8,
.pme_pwrite8 = ksz_pwrite8,
- .config_cpu_port = ksz9477_config_cpu_port,
.tc_cbs_set_cinc = ksz9477_tc_cbs_set_cinc,
- .enable_stp_addr = ksz9477_enable_stp_addr,
- .reset = ksz9477_reset_switch,
.init = ksz9477_switch_init,
- .pcs_create = ksz9477_pcs_create,
};
const struct dsa_switch_ops ksz9477_switch_ops = {
.get_tag_protocol = ksz9477_get_tag_protocol,
.connect_tag_protocol = ksz9477_connect_tag_protocol,
.get_phy_flags = ksz_get_phy_flags,
- .setup = ksz_setup,
+ .setup = ksz9477_setup,
.teardown = ksz_teardown,
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next v2 4/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz8
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
` (2 preceding siblings ...)
2026-05-15 8:38 ` [PATCH net-next v2 3/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz9477 Bastien Curutchet
@ 2026-05-15 8:38 ` Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 5/8] net: dsa: microchip: remove dev_ops->setup() and teardown() Bastien Curutchet
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Bastien Curutchet @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric), Vladimir Oltean
From: Vladimir Oltean <vladimir.oltean@nxp.com>
The KSZ switch families are sufficiently different that a common
ds->ops->setup() - ksz_setup() with micro-managed dev_ops->reset(),
dev_ops->pcs_create(), dev_ops->config_cpu_port(),
dev_ops->enable_stp_addr(), dev_ops->setup() seems to be too convoluted.
I am proposing to make each KSZ switch family part ways for
dsa_switch_ops :: setup() and teardown(), to allow them greater
flexibility. This here is the implementation for ksz8, which is
nothing other than a copy of ksz_setup() with the dev_ops function
pointers replaced with direct function calls.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
drivers/net/dsa/microchip/ksz8.c | 139 +++++++++++++++++++++++++++++++++------
1 file changed, 119 insertions(+), 20 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c
index ccbc3480717f0..acc898c68f985 100644
--- a/drivers/net/dsa/microchip/ksz8.c
+++ b/drivers/net/dsa/microchip/ksz8.c
@@ -1935,9 +1935,52 @@ static int ksz8_enable_stp_addr(struct ksz_device *dev)
static int ksz8_setup(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
- const u16 *regs = dev->info->regs;
- int i, ret = 0;
+ u16 storm_mask, storm_rate;
+ struct dsa_port *dp;
+ struct ksz_port *p;
+ const u16 *regs;
+ int i, ret;
+
+ regs = dev->info->regs;
+
+ dev->vlan_cache = devm_kcalloc(dev->dev, sizeof(struct vlan_table),
+ dev->info->num_vlans, GFP_KERNEL);
+ if (!dev->vlan_cache)
+ return -ENOMEM;
+
+ ret = ksz8_reset_switch(dev);
+ if (ret) {
+ dev_err(ds->dev, "failed to reset switch\n");
+ return ret;
+ }
+
+ ret = ksz_parse_drive_strength(dev);
+ if (ret)
+ return ret;
+
+ /* set broadcast storm protection 10% rate */
+ storm_mask = BROADCAST_STORM_RATE;
+ storm_rate = (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100;
+ if (ksz_is_ksz8463(dev)) {
+ storm_mask = swab16(storm_mask);
+ storm_rate = swab16(storm_rate);
+ }
+ regmap_update_bits(ksz_regmap_16(dev), regs[S_BROADCAST_CTRL],
+ storm_mask, storm_rate);
+
+ ksz8_config_cpu_port(ds);
+
+ ksz8_enable_stp_addr(dev);
+
+ ds->num_tx_queues = dev->info->num_tx_queues;
+
+ regmap_update_bits(ksz_regmap_8(dev), regs[S_MULTICAST_CTRL],
+ MULTICAST_STORM_DISABLE, MULTICAST_STORM_DISABLE);
+
+ ksz_init_mib_timer(dev);
+ ds->configure_vlan_while_not_filtering = false;
+ ds->dscp_prio_mapping_is_global = true;
ds->mtu_enforcement_ingress = true;
/* We rely on software untagging on the CPU port, so that we
@@ -1987,12 +2030,80 @@ static int ksz8_setup(struct dsa_switch *ds)
ret = ksz8_pme_write8(dev, regs[REG_SW_PME_CTRL], 0);
if (!ret)
ret = ksz_rmw8(dev, REG_INT_ENABLE, INT_PME, 0);
+ if (ret)
+ return ret;
}
- if (!ret)
- return ksz8_handle_global_errata(ds);
- else
+ ret = ksz8_handle_global_errata(ds);
+ if (ret)
return ret;
+
+ /* Start with learning disabled on standalone user ports, and enabled
+ * on the CPU port. In lack of other finer mechanisms, learning on the
+ * CPU port will avoid flooding bridge local addresses on the network
+ * in some cases.
+ */
+ p = &dev->ports[dev->cpu_port];
+ p->learning = true;
+
+ if (dev->irq > 0) {
+ ret = ksz_girq_setup(dev);
+ if (ret)
+ return ret;
+
+ dsa_switch_for_each_user_port(dp, dev->ds) {
+ ret = ksz_pirq_setup(dev, dp->index);
+ if (ret)
+ goto port_release;
+
+ if (dev->info->ptp_capable) {
+ ret = ksz_ptp_irq_setup(ds, dp->index);
+ if (ret)
+ goto pirq_release;
+ }
+ }
+ }
+
+ if (dev->info->ptp_capable) {
+ ret = ksz_ptp_clock_register(ds);
+ if (ret) {
+ dev_err(dev->dev, "Failed to register PTP clock: %d\n",
+ ret);
+ goto port_release;
+ }
+ }
+
+ ret = ksz_mdio_register(dev);
+ if (ret < 0) {
+ dev_err(dev->dev, "failed to register the mdio");
+ goto out_ptp_clock_unregister;
+ }
+
+ ret = ksz_dcb_init(dev);
+ if (ret)
+ goto out_ptp_clock_unregister;
+
+ /* start switch */
+ regmap_update_bits(ksz_regmap_8(dev), regs[S_START_CTRL],
+ SW_START, SW_START);
+
+ return 0;
+
+out_ptp_clock_unregister:
+ if (dev->info->ptp_capable)
+ ksz_ptp_clock_unregister(ds);
+port_release:
+ if (dev->irq > 0) {
+ dsa_switch_for_each_user_port_continue_reverse(dp, dev->ds) {
+ if (dev->info->ptp_capable)
+ ksz_ptp_irq_free(ds, dp->index);
+pirq_release:
+ ksz_irq_free(&dev->ports[dp->index].pirq);
+ }
+ ksz_irq_free(&dev->girq);
+ }
+
+ return ret;
}
static void ksz8_phylink_get_caps(struct dsa_switch *ds, int port,
@@ -2206,7 +2317,6 @@ const struct phylink_mac_ops ksz8_phylink_mac_ops = {
};
const struct ksz_dev_ops ksz8463_dev_ops = {
- .setup = ksz8_setup,
.get_port_addr = ksz8463_get_port_addr,
.cfg_port_member = ksz8_cfg_port_member,
.port_setup = ksz8_port_setup,
@@ -2217,14 +2327,10 @@ const struct ksz_dev_ops ksz8463_dev_ops = {
.r_mib_stat64 = ksz88xx_r_mib_stats64,
.freeze_mib = ksz8_freeze_mib,
.port_init_cnt = ksz8_port_init_cnt,
- .config_cpu_port = ksz8_config_cpu_port,
- .enable_stp_addr = ksz8_enable_stp_addr,
- .reset = ksz8_reset_switch,
.init = ksz8_switch_init,
};
const struct ksz_dev_ops ksz87xx_dev_ops = {
- .setup = ksz8_setup,
.get_port_addr = ksz8_get_port_addr,
.cfg_port_member = ksz8_cfg_port_member,
.port_setup = ksz8_port_setup,
@@ -2235,9 +2341,6 @@ const struct ksz_dev_ops ksz87xx_dev_ops = {
.r_mib_stat64 = ksz_r_mib_stats64,
.freeze_mib = ksz8_freeze_mib,
.port_init_cnt = ksz8_port_init_cnt,
- .config_cpu_port = ksz8_config_cpu_port,
- .enable_stp_addr = ksz8_enable_stp_addr,
- .reset = ksz8_reset_switch,
.init = ksz8_switch_init,
.pme_write8 = ksz8_pme_write8,
.pme_pread8 = ksz8_pme_pread8,
@@ -2245,7 +2348,6 @@ const struct ksz_dev_ops ksz87xx_dev_ops = {
};
const struct ksz_dev_ops ksz88xx_dev_ops = {
- .setup = ksz8_setup,
.get_port_addr = ksz8_get_port_addr,
.cfg_port_member = ksz8_cfg_port_member,
.port_setup = ksz8_port_setup,
@@ -2256,9 +2358,6 @@ const struct ksz_dev_ops ksz88xx_dev_ops = {
.r_mib_stat64 = ksz88xx_r_mib_stats64,
.freeze_mib = ksz8_freeze_mib,
.port_init_cnt = ksz8_port_init_cnt,
- .config_cpu_port = ksz8_config_cpu_port,
- .enable_stp_addr = ksz8_enable_stp_addr,
- .reset = ksz8_reset_switch,
.init = ksz8_switch_init,
.pme_write8 = ksz8_pme_write8,
.pme_pread8 = ksz8_pme_pread8,
@@ -2269,7 +2368,7 @@ const struct dsa_switch_ops ksz8463_switch_ops = {
.get_tag_protocol = ksz8463_get_tag_protocol,
.connect_tag_protocol = ksz8463_connect_tag_protocol,
.get_phy_flags = ksz_get_phy_flags,
- .setup = ksz_setup,
+ .setup = ksz8_setup,
.teardown = ksz_teardown,
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
@@ -2329,7 +2428,7 @@ const struct dsa_switch_ops ksz87xx_switch_ops = {
.get_tag_protocol = ksz87xx_get_tag_protocol,
.connect_tag_protocol = ksz87xx_connect_tag_protocol,
.get_phy_flags = ksz_get_phy_flags,
- .setup = ksz_setup,
+ .setup = ksz8_setup,
.teardown = ksz_teardown,
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
@@ -2389,7 +2488,7 @@ const struct dsa_switch_ops ksz88xx_switch_ops = {
.get_tag_protocol = ksz88xx_get_tag_protocol,
.connect_tag_protocol = ksz88xx_connect_tag_protocol,
.get_phy_flags = ksz_get_phy_flags,
- .setup = ksz_setup,
+ .setup = ksz8_setup,
.teardown = ksz_teardown,
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next v2 5/8] net: dsa: microchip: remove dev_ops->setup() and teardown()
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
` (3 preceding siblings ...)
2026-05-15 8:38 ` [PATCH net-next v2 4/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz8 Bastien Curutchet
@ 2026-05-15 8:38 ` Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 6/8] net: dsa: microchip: bypass dev_ops for port_setup() Bastien Curutchet (Schneider Electric)
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Bastien Curutchet @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric), Vladimir Oltean
From: Vladimir Oltean <vladimir.oltean@nxp.com>
All switch families have been converted to have their own
ds->ops->setup() methods and to call the common ksz_teardown().
Remove the no longer used ksz_setup() function and the associated
ksz_dev_ops callbacks.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
drivers/net/dsa/microchip/ksz_common.c | 133 ---------------------------------
drivers/net/dsa/microchip/ksz_common.h | 8 --
2 files changed, 141 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index c2624b1930f51..60edb02846481 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -2745,136 +2745,6 @@ int ksz_pirq_setup(struct ksz_device *dev, u8 p)
return ksz_irq_common_setup(dev, pirq);
}
-int ksz_setup(struct dsa_switch *ds)
-{
- struct ksz_device *dev = ds->priv;
- u16 storm_mask, storm_rate;
- struct dsa_port *dp;
- struct ksz_port *p;
- const u16 *regs;
- int ret;
-
- regs = dev->info->regs;
-
- dev->vlan_cache = devm_kcalloc(dev->dev, sizeof(struct vlan_table),
- dev->info->num_vlans, GFP_KERNEL);
- if (!dev->vlan_cache)
- return -ENOMEM;
-
- ret = dev->dev_ops->reset(dev);
- if (ret) {
- dev_err(ds->dev, "failed to reset switch\n");
- return ret;
- }
-
- ret = ksz_parse_drive_strength(dev);
- if (ret)
- return ret;
-
- if (ksz_has_sgmii_port(dev) && dev->dev_ops->pcs_create) {
- ret = dev->dev_ops->pcs_create(dev);
- if (ret)
- return ret;
- }
-
- /* set broadcast storm protection 10% rate */
- storm_mask = BROADCAST_STORM_RATE;
- storm_rate = (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100;
- if (ksz_is_ksz8463(dev)) {
- storm_mask = swab16(storm_mask);
- storm_rate = swab16(storm_rate);
- }
- regmap_update_bits(ksz_regmap_16(dev), regs[S_BROADCAST_CTRL],
- storm_mask, storm_rate);
-
- dev->dev_ops->config_cpu_port(ds);
-
- dev->dev_ops->enable_stp_addr(dev);
-
- ds->num_tx_queues = dev->info->num_tx_queues;
-
- regmap_update_bits(ksz_regmap_8(dev), regs[S_MULTICAST_CTRL],
- MULTICAST_STORM_DISABLE, MULTICAST_STORM_DISABLE);
-
- ksz_init_mib_timer(dev);
-
- ds->configure_vlan_while_not_filtering = false;
- ds->dscp_prio_mapping_is_global = true;
-
- if (dev->dev_ops->setup) {
- ret = dev->dev_ops->setup(ds);
- if (ret)
- return ret;
- }
-
- /* Start with learning disabled on standalone user ports, and enabled
- * on the CPU port. In lack of other finer mechanisms, learning on the
- * CPU port will avoid flooding bridge local addresses on the network
- * in some cases.
- */
- p = &dev->ports[dev->cpu_port];
- p->learning = true;
-
- if (dev->irq > 0) {
- ret = ksz_girq_setup(dev);
- if (ret)
- return ret;
-
- dsa_switch_for_each_user_port(dp, dev->ds) {
- ret = ksz_pirq_setup(dev, dp->index);
- if (ret)
- goto port_release;
-
- if (dev->info->ptp_capable) {
- ret = ksz_ptp_irq_setup(ds, dp->index);
- if (ret)
- goto pirq_release;
- }
- }
- }
-
- if (dev->info->ptp_capable) {
- ret = ksz_ptp_clock_register(ds);
- if (ret) {
- dev_err(dev->dev, "Failed to register PTP clock: %d\n",
- ret);
- goto port_release;
- }
- }
-
- ret = ksz_mdio_register(dev);
- if (ret < 0) {
- dev_err(dev->dev, "failed to register the mdio");
- goto out_ptp_clock_unregister;
- }
-
- ret = ksz_dcb_init(dev);
- if (ret)
- goto out_ptp_clock_unregister;
-
- /* start switch */
- regmap_update_bits(ksz_regmap_8(dev), regs[S_START_CTRL],
- SW_START, SW_START);
-
- return 0;
-
-out_ptp_clock_unregister:
- if (dev->info->ptp_capable)
- ksz_ptp_clock_unregister(ds);
-port_release:
- if (dev->irq > 0) {
- dsa_switch_for_each_user_port_continue_reverse(dp, dev->ds) {
- if (dev->info->ptp_capable)
- ksz_ptp_irq_free(ds, dp->index);
-pirq_release:
- ksz_irq_free(&dev->ports[dp->index].pirq);
- }
- ksz_irq_free(&dev->girq);
- }
-
- return ret;
-}
-
void ksz_teardown(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
@@ -2893,9 +2763,6 @@ void ksz_teardown(struct dsa_switch *ds)
ksz_irq_free(&dev->girq);
}
-
- if (dev->dev_ops->teardown)
- dev->dev_ops->teardown(ds);
}
static void port_r_cnt(struct ksz_device *dev, int port)
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 5fad56c2d067a..f80034488cd1b 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -359,8 +359,6 @@ struct alu_struct {
};
struct ksz_dev_ops {
- int (*setup)(struct dsa_switch *ds);
- void (*teardown)(struct dsa_switch *ds);
u32 (*get_port_addr)(int port, int offset);
void (*cfg_port_member)(struct ksz_device *dev, int port, u8 member);
void (*port_setup)(struct ksz_device *dev, int port, bool cpu_port);
@@ -417,12 +415,7 @@ struct ksz_dev_ops {
void (*port_init_cnt)(struct ksz_device *dev, int port);
void (*setup_rgmii_delay)(struct ksz_device *dev, int port);
int (*tc_cbs_set_cinc)(struct ksz_device *dev, int port, u32 val);
- void (*config_cpu_port)(struct dsa_switch *ds);
- int (*enable_stp_addr)(struct ksz_device *dev);
- int (*reset)(struct ksz_device *dev);
int (*init)(struct ksz_device *dev);
-
- int (*pcs_create)(struct ksz_device *dev);
};
struct ksz_device *ksz_switch_alloc(struct device *base,
@@ -433,7 +426,6 @@ void ksz_switch_remove(struct ksz_device *dev);
int ksz_switch_suspend(struct device *dev);
int ksz_switch_resume(struct device *dev);
-int ksz_setup(struct dsa_switch *ds);
void ksz_teardown(struct dsa_switch *ds);
int ksz_port_setup(struct dsa_switch *ds, int port);
void ksz_port_teardown(struct dsa_switch *ds, int port);
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next v2 6/8] net: dsa: microchip: bypass dev_ops for port_setup()
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
` (4 preceding siblings ...)
2026-05-15 8:38 ` [PATCH net-next v2 5/8] net: dsa: microchip: remove dev_ops->setup() and teardown() Bastien Curutchet
@ 2026-05-15 8:38 ` Bastien Curutchet (Schneider Electric)
2026-05-15 8:38 ` [PATCH net-next v2 7/8] net: dsa: microchip: call DSA's phy_{read/write} to do mdio {read/write} Bastien Curutchet (Schneider Electric)
2026-05-15 8:38 ` [PATCH net-next v2 8/8] net: dsa: microchip: bypass dev_ops for phy_read()/phy_write() Bastien Curutchet (Schneider Electric)
7 siblings, 0 replies; 11+ messages in thread
From: Bastien Curutchet (Schneider Electric) @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric)
port_setup() is handled through a common function that redirects
the treatment to ksz_dev_ops callbacks. This layer of indirection
isn't needed since we now have a dsa_switch_ops for each switch family
Remove one indirection layer for KSZ switches, by connecting the
ksz_dev_ops :: port_setup() operations directly to dsa_switch_ops.
Make ksz9477_set_default_prio_queue_mapping() non-static since it's used
by ksz_common for tc operations and by ksz9477.c for this port_setup().
Remove the now unused port_setup() callback from ksz_dev_ops.
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
drivers/net/dsa/microchip/ksz8.c | 20 ++++++++++++++------
drivers/net/dsa/microchip/ksz9477.c | 20 ++++++++++++++++++--
drivers/net/dsa/microchip/ksz_common.c | 27 +--------------------------
drivers/net/dsa/microchip/ksz_common.h | 3 +--
drivers/net/dsa/microchip/lan937x_main.c | 20 ++++++++++++++++++--
5 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c
index acc898c68f985..09968aec65063 100644
--- a/drivers/net/dsa/microchip/ksz8.c
+++ b/drivers/net/dsa/microchip/ksz8.c
@@ -1692,6 +1692,17 @@ static void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port)
ksz8_pme_pwrite8(dev, port, regs[REG_PORT_PME_CTRL], 0);
}
+static int ksz8_dsa_port_setup(struct dsa_switch *ds, int port)
+{
+ struct ksz_device *dev = ds->priv;
+
+ if (!dsa_is_user_port(ds, port))
+ return 0;
+
+ ksz8_port_setup(dev, port, false);
+ return ksz_dcb_init_port(dev, port);
+}
+
static void ksz88x3_config_rmii_clk(struct ksz_device *dev)
{
struct dsa_port *cpu_dp = dsa_to_port(dev->ds, dev->cpu_port);
@@ -2319,7 +2330,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,
- .port_setup = ksz8_port_setup,
.r_phy = ksz8463_r_phy,
.w_phy = ksz8463_w_phy,
.r_mib_cnt = ksz8_r_mib_cnt,
@@ -2333,7 +2343,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,
- .port_setup = ksz8_port_setup,
.r_phy = ksz8_r_phy,
.w_phy = ksz8_w_phy,
.r_mib_cnt = ksz8_r_mib_cnt,
@@ -2350,7 +2359,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,
- .port_setup = ksz8_port_setup,
.r_phy = ksz8_r_phy,
.w_phy = ksz8_w_phy,
.r_mib_cnt = ksz8_r_mib_cnt,
@@ -2373,7 +2381,7 @@ const struct dsa_switch_ops ksz8463_switch_ops = {
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
.phylink_get_caps = ksz8_phylink_get_caps,
- .port_setup = ksz_port_setup,
+ .port_setup = ksz8_dsa_port_setup,
.get_strings = ksz_get_strings,
.get_ethtool_stats = ksz_get_ethtool_stats,
.get_sset_count = ksz_sset_count,
@@ -2433,7 +2441,7 @@ const struct dsa_switch_ops ksz87xx_switch_ops = {
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
.phylink_get_caps = ksz8_phylink_get_caps,
- .port_setup = ksz_port_setup,
+ .port_setup = ksz8_dsa_port_setup,
.get_strings = ksz_get_strings,
.get_ethtool_stats = ksz_get_ethtool_stats,
.get_sset_count = ksz_sset_count,
@@ -2493,7 +2501,7 @@ const struct dsa_switch_ops ksz88xx_switch_ops = {
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
.phylink_get_caps = ksz8_phylink_get_caps,
- .port_setup = ksz_port_setup,
+ .port_setup = ksz8_dsa_port_setup,
.get_strings = ksz_get_strings,
.get_ethtool_stats = ksz_get_ethtool_stats,
.get_sset_count = ksz_sset_count,
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 7385aa4e788a1..aac7fc478eda8 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1309,6 +1309,23 @@ static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)
ksz_pwrite8(dev, port, regs[REG_PORT_PME_CTRL], 0);
}
+static int ksz9477_dsa_port_setup(struct dsa_switch *ds, int port)
+{
+ struct ksz_device *dev = ds->priv;
+ int ret;
+
+ if (!dsa_is_user_port(ds, port))
+ return 0;
+
+ ksz9477_port_setup(dev, port, false);
+
+ ret = ksz9477_set_default_prio_queue_mapping(dev, port);
+ if (ret)
+ return ret;
+
+ return ksz_dcb_init_port(dev, port);
+}
+
static void ksz9477_config_cpu_port(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
@@ -1895,7 +1912,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,
- .port_setup = ksz9477_port_setup,
.r_phy = ksz9477_r_phy,
.w_phy = ksz9477_w_phy,
.r_mib_cnt = ksz9477_r_mib_cnt,
@@ -1919,7 +1935,7 @@ const struct dsa_switch_ops ksz9477_switch_ops = {
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
.phylink_get_caps = ksz9477_phylink_get_caps,
- .port_setup = ksz_port_setup,
+ .port_setup = ksz9477_dsa_port_setup,
.set_ageing_time = ksz9477_set_ageing_time,
.get_strings = ksz_get_strings,
.get_ethtool_stats = ksz_get_ethtool_stats,
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 60edb02846481..f44974cf4e595 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -2947,8 +2947,7 @@ void ksz_port_bridge_leave(struct dsa_switch *ds, int port,
*/
}
-static int ksz9477_set_default_prio_queue_mapping(struct ksz_device *dev,
- int port)
+int ksz9477_set_default_prio_queue_mapping(struct ksz_device *dev, int port)
{
u32 queue_map = 0;
int ipm;
@@ -2970,30 +2969,6 @@ static int ksz9477_set_default_prio_queue_mapping(struct ksz_device *dev,
return ksz_pwrite32(dev, port, KSZ9477_PORT_MRI_TC_MAP__4, queue_map);
}
-int ksz_port_setup(struct dsa_switch *ds, int port)
-{
- struct ksz_device *dev = ds->priv;
- int ret;
-
- if (!dsa_is_user_port(ds, port))
- return 0;
-
- /* setup user port */
- dev->dev_ops->port_setup(dev, port, false);
-
- if (!is_ksz8(dev)) {
- ret = ksz9477_set_default_prio_queue_mapping(dev, port);
- if (ret)
- return ret;
- }
-
- /* port_stp_state_set() will be called after to enable the port so
- * there is no need to do anything.
- */
-
- return ksz_dcb_init_port(dev, port);
-}
-
void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)
{
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 f80034488cd1b..c66d75347c6cb 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -361,7 +361,6 @@ struct alu_struct {
struct ksz_dev_ops {
u32 (*get_port_addr)(int port, int offset);
void (*cfg_port_member)(struct ksz_device *dev, int port, u8 member);
- void (*port_setup)(struct ksz_device *dev, int port, bool cpu_port);
/**
* @mdio_bus_preinit: Function pointer to pre-initialize the MDIO bus
@@ -427,7 +426,6 @@ int ksz_switch_suspend(struct device *dev);
int ksz_switch_resume(struct device *dev);
void ksz_teardown(struct dsa_switch *ds);
-int ksz_port_setup(struct dsa_switch *ds, int port);
void ksz_port_teardown(struct dsa_switch *ds, int port);
void ksz_init_mib_timer(struct ksz_device *dev);
@@ -515,6 +513,7 @@ int ksz_pirq_setup(struct ksz_device *dev, u8 p);
int ksz_girq_setup(struct ksz_device *dev);
void ksz_irq_free(struct ksz_irq *kirq);
int ksz_parse_drive_strength(struct ksz_device *dev);
+int ksz9477_set_default_prio_queue_mapping(struct ksz_device *dev, int port);
/* Common register access functions */
static inline struct regmap *ksz_regmap_8(struct ksz_device *dev)
diff --git a/drivers/net/dsa/microchip/lan937x_main.c b/drivers/net/dsa/microchip/lan937x_main.c
index ecb072cd99819..690f99da0bfee 100644
--- a/drivers/net/dsa/microchip/lan937x_main.c
+++ b/drivers/net/dsa/microchip/lan937x_main.c
@@ -411,6 +411,23 @@ static void lan937x_port_setup(struct ksz_device *dev, int port, bool cpu_port)
dev->dev_ops->cfg_port_member(dev, port, member);
}
+static int lan937x_dsa_port_setup(struct dsa_switch *ds, int port)
+{
+ struct ksz_device *dev = ds->priv;
+ int ret;
+
+ if (!dsa_is_user_port(ds, port))
+ return 0;
+
+ lan937x_port_setup(dev, port, false);
+
+ ret = ksz9477_set_default_prio_queue_mapping(dev, port);
+ if (ret)
+ return ret;
+
+ return ksz_dcb_init_port(dev, port);
+}
+
static void lan937x_config_cpu_port(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
@@ -799,7 +816,6 @@ const struct phylink_mac_ops lan937x_phylink_mac_ops = {
const struct ksz_dev_ops lan937x_dev_ops = {
.get_port_addr = ksz9477_get_port_addr,
.cfg_port_member = ksz9477_cfg_port_member,
- .port_setup = lan937x_port_setup,
.mdio_bus_preinit = lan937x_mdio_bus_preinit,
.create_phy_addr_map = lan937x_create_phy_addr_map,
.r_phy = lan937x_r_phy,
@@ -823,7 +839,7 @@ const struct dsa_switch_ops lan937x_switch_ops = {
.phy_read = ksz_phy_read16,
.phy_write = ksz_phy_write16,
.phylink_get_caps = lan937x_phylink_get_caps,
- .port_setup = ksz_port_setup,
+ .port_setup = lan937x_dsa_port_setup,
.set_ageing_time = lan937x_set_ageing_time,
.get_strings = ksz_get_strings,
.get_ethtool_stats = ksz_get_ethtool_stats,
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next v2 7/8] net: dsa: microchip: call DSA's phy_{read/write} to do mdio {read/write}
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
` (5 preceding siblings ...)
2026-05-15 8:38 ` [PATCH net-next v2 6/8] net: dsa: microchip: bypass dev_ops for port_setup() Bastien Curutchet (Schneider Electric)
@ 2026-05-15 8:38 ` Bastien Curutchet (Schneider Electric)
2026-05-15 8:38 ` [PATCH net-next v2 8/8] net: dsa: microchip: bypass dev_ops for phy_read()/phy_write() Bastien Curutchet (Schneider Electric)
7 siblings, 0 replies; 11+ messages in thread
From: Bastien Curutchet (Schneider Electric) @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric)
ksz_sw_mdio_read() and ksz_sw_mdio_write() respectively call
ksz_dev_ops::phy_r() and ksz_dev_ops::phy_w() just like
dsa_switch_ops::phy_read() and dsa_switch_ops::phy_write() do.
Call dsa_switch_ops::phy_read() from ksz_sw_mdio_read() and
dsa_switch_ops::phy_write() from ksz_sw_mdio_write() so we'll be able
to get rid of the useless indirections provided by ksz_dev_ops in
upcoming patch.
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
drivers/net/dsa/microchip/ksz_common.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index f44974cf4e595..0d66592dff703 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -2260,22 +2260,18 @@ static void ksz_update_port_member(struct ksz_device *dev, int port)
static int ksz_sw_mdio_read(struct mii_bus *bus, int addr, int regnum)
{
struct ksz_device *dev = bus->priv;
- u16 val;
- int ret;
-
- ret = dev->dev_ops->r_phy(dev, addr, regnum, &val);
- if (ret < 0)
- return ret;
+ struct dsa_switch *ds = dev->ds;
- return val;
+ return ds->ops->phy_read(ds, addr, regnum);
}
static int ksz_sw_mdio_write(struct mii_bus *bus, int addr, int regnum,
u16 val)
{
struct ksz_device *dev = bus->priv;
+ struct dsa_switch *ds = dev->ds;
- return dev->dev_ops->w_phy(dev, addr, regnum, val);
+ return ds->ops->phy_write(ds, addr, regnum, val);
}
/**
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next v2 8/8] net: dsa: microchip: bypass dev_ops for phy_read()/phy_write()
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
` (6 preceding siblings ...)
2026-05-15 8:38 ` [PATCH net-next v2 7/8] net: dsa: microchip: call DSA's phy_{read/write} to do mdio {read/write} Bastien Curutchet (Schneider Electric)
@ 2026-05-15 8:38 ` Bastien Curutchet (Schneider Electric)
7 siblings, 0 replies; 11+ messages in thread
From: Bastien Curutchet (Schneider Electric) @ 2026-05-15 8:38 UTC (permalink / raw)
To: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Russell King, Richard Cochran
Cc: Pascal Eberhard, Miquèl Raynal, Thomas Petazzoni,
Tristram Ha, netdev, linux-kernel,
Bastien Curutchet (Schneider Electric)
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>
---
drivers/net/dsa/microchip/ksz8.c | 68 ++++++++++++++++++++++++++------
drivers/net/dsa/microchip/ksz9477.c | 31 +++++++++++++--
drivers/net/dsa/microchip/ksz_common.c | 25 ------------
drivers/net/dsa/microchip/ksz_common.h | 4 --
drivers/net/dsa/microchip/lan937x_main.c | 29 ++++++++++----
5 files changed, 104 insertions(+), 53 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c
index 09968aec65063..0f84b2e7d25d8 100644
--- 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 aac7fc478eda8..c1395322e54ba 100644
--- 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 0d66592dff703..95aa3ab5b5719 100644
--- 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 c66d75347c6cb..b67038cf1bd09 100644
--- 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 690f99da0bfee..536153886f7b8 100644
--- 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,
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH net-next v2 1/8] net: dsa: microchip: don't reset on shutdown or driver removal
2026-05-15 8:38 ` [PATCH net-next v2 1/8] net: dsa: microchip: don't reset on shutdown or driver removal Bastien Curutchet
@ 2026-05-20 2:10 ` Jakub Kicinski
2026-05-20 6:23 ` Bastien Curutchet
0 siblings, 1 reply; 11+ messages in thread
From: Jakub Kicinski @ 2026-05-20 2:10 UTC (permalink / raw)
To: Bastien Curutchet
Cc: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Paolo Abeni, Russell King,
Richard Cochran, Pascal Eberhard, Miquèl Raynal,
Thomas Petazzoni, Tristram Ha, netdev, linux-kernel,
Vladimir Oltean
On Fri, 15 May 2026 10:38:36 +0200 Bastien Curutchet wrote:
> @@ -4170,16 +4170,15 @@ int ksz_set_wol(struct dsa_switch *ds, int port,
> * the wol_enabled flag accordingly to reflect whether WoL is active on any
> * port.
> */
> -static void ksz_wol_pre_shutdown(struct ksz_device *dev, bool *wol_enabled)
> +static void ksz_wol_pre_shutdown(struct ksz_device *dev)
this needs a kdoc update, did I not report it on v1?
Maybe I forgot. scripts/kernel-doc is buggy, unfortunately
and doesn't catch it. The fix is on the way.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH net-next v2 1/8] net: dsa: microchip: don't reset on shutdown or driver removal
2026-05-20 2:10 ` Jakub Kicinski
@ 2026-05-20 6:23 ` Bastien Curutchet
0 siblings, 0 replies; 11+ messages in thread
From: Bastien Curutchet @ 2026-05-20 6:23 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Woojung Huh, UNGLinuxDriver, Andrew Lunn, Vladimir Oltean,
David S. Miller, Eric Dumazet, Paolo Abeni, Russell King,
Richard Cochran, Pascal Eberhard, Miquèl Raynal,
Thomas Petazzoni, Tristram Ha, netdev, linux-kernel,
Vladimir Oltean
Hi Jakub,
On 5/20/26 4:10 AM, Jakub Kicinski wrote:
> On Fri, 15 May 2026 10:38:36 +0200 Bastien Curutchet wrote:
>> @@ -4170,16 +4170,15 @@ int ksz_set_wol(struct dsa_switch *ds, int port,
>> * the wol_enabled flag accordingly to reflect whether WoL is active on any
>> * port.
>> */
>> -static void ksz_wol_pre_shutdown(struct ksz_device *dev, bool *wol_enabled)
>> +static void ksz_wol_pre_shutdown(struct ksz_device *dev)
>
> this needs a kdoc update, did I not report it on v1?
> Maybe I forgot. scripts/kernel-doc is buggy, unfortunately
> and doesn't catch it. The fix is on the way.
Ok, I'll fix it in v3. I don't think that you reported it on v1.
Best regards,
Bastien
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2026-05-20 6:23 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-15 8:38 [PATCH net-next v2 0/8] net: dsa: microchip: Remove unnecessary ksz_dev_ops callbacks Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 1/8] net: dsa: microchip: don't reset on shutdown or driver removal Bastien Curutchet
2026-05-20 2:10 ` Jakub Kicinski
2026-05-20 6:23 ` Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 2/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for lan937x Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 3/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz9477 Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 4/8] net: dsa: microchip: bypass dev_ops->setup() and teardown() for ksz8 Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 5/8] net: dsa: microchip: remove dev_ops->setup() and teardown() Bastien Curutchet
2026-05-15 8:38 ` [PATCH net-next v2 6/8] net: dsa: microchip: bypass dev_ops for port_setup() Bastien Curutchet (Schneider Electric)
2026-05-15 8:38 ` [PATCH net-next v2 7/8] net: dsa: microchip: call DSA's phy_{read/write} to do mdio {read/write} Bastien Curutchet (Schneider Electric)
2026-05-15 8:38 ` [PATCH net-next v2 8/8] net: dsa: microchip: bypass dev_ops for phy_read()/phy_write() Bastien Curutchet (Schneider Electric)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox