net: dsa: ocelot: use ds->num_tx_queues = OCELOT_NUM_TC for all models

Russell King points out that seville_vsc9953 populates
felix->info->num_tx_queues = 8, but this doesn't make it all the way
into ds->num_tx_queues (which is how the user interface netdev queues
get allocated) [1].

[1]: https://lore.kernel.org/all/20240415160150.yejcazpjqvn7vhxu@skbuf/

When num_tx_queues=0 for seville, this is implicitly converted to 1 by
dsa_user_create(), and this is good enough for basic operation for a
switch port. The tc qdisc offload layer works with netdev TX queues,
so for QoS offload we need to pretend we have multiple TX queues. The
VSC9953, like ocelot_ext, doesn't export QoS offload, so it doesn't
really matter. But we can definitely set num_tx_queues=8 for all
switches.

The felix->info->num_tx_queues construct itself seems unnecessary.
It was introduced by commit de143c0e274b ("net: dsa: felix: Configure
Time-Aware Scheduler via taprio offload") at a time when vsc9959
(LS1028A) was the only switch supported by the driver.

8 traffic classes, and 1 queue per traffic class, is a common
architectural feature of all switches in the family. So they could
all just set OCELOT_NUM_TC and be fine.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Colin Foster <colin.foster@in-advantage.com>
Tested-by: Colin Foster <colin.foster@in-advantage.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index e67a25f..e0bfea1 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -32,7 +32,6 @@ struct felix_info {
        const u32                       *port_modes;
        int                             num_mact_rows;
        int                             num_ports;
-       int                             num_tx_queues;
        struct vcap_props               *vcap;
        u16                             vcap_pol_base;
        u16                             vcap_pol_max;

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 20563ab..ec8b124 100644 (file)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -2658,7 +2658,6 @@ static const struct felix_info felix_info_vsc9959 = {
        .vcap_pol_max2          = 0,
        .num_mact_rows          = 2048,
        .num_ports              = VSC9959_NUM_PORTS,
-       .num_tx_queues          = OCELOT_NUM_TC,
        .quirks                 = FELIX_MAC_QUIRKS,
        .quirk_no_xtr_irq       = true,
        .ptp_caps               = &vsc9959_ptp_caps,
@@ -2711,7 +2710,8 @@ static int felix_pci_probe(struct pci_dev *pdev,
 
        ds->dev = dev;
        ds->num_ports = felix->info->num_ports;
-       ds->num_tx_queues = felix->info->num_tx_queues;
+       ds->num_tx_queues = OCELOT_NUM_TC;
+
        ds->ops = &felix_switch_ops;
        ds->phylink_mac_ops = &felix_phylink_mac_ops;
        ds->priv = ocelot;

diff --git a/drivers/net/dsa/ocelot/ocelot_ext.c b/drivers/net/dsa/ocelot/ocelot_ext.c
index c893f3e..9cd24f7 100644 (file)
--- a/drivers/net/dsa/ocelot/ocelot_ext.c
+++ b/drivers/net/dsa/ocelot/ocelot_ext.c
@@ -57,7 +57,6 @@ static const struct felix_info vsc7512_info = {
        .vcap                           = vsc7514_vcap_props,
        .num_mact_rows                  = 1024,
        .num_ports                      = VSC7514_NUM_PORTS,
-       .num_tx_queues                  = OCELOT_NUM_TC,
        .port_modes                     = vsc7512_port_modes,
        .phylink_mac_config             = ocelot_phylink_mac_config,
        .configure_serdes               = ocelot_port_configure_serdes,
@@ -90,7 +89,7 @@ static int ocelot_ext_probe(struct platform_device *pdev)
 
        ds->dev = dev;
        ds->num_ports = felix->info->num_ports;
-       ds->num_tx_queues = felix->info->num_tx_queues;
+       ds->num_tx_queues = OCELOT_NUM_TC;
 
        ds->ops = &felix_switch_ops;
        ds->phylink_mac_ops = &felix_phylink_mac_ops;

diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index e63247d..83bd0e1 100644 (file)
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -963,7 +963,6 @@ static const struct felix_info seville_info_vsc9953 = {
        .quirks                 = FELIX_MAC_QUIRKS,
        .num_mact_rows          = 2048,
        .num_ports              = VSC9953_NUM_PORTS,
-       .num_tx_queues          = OCELOT_NUM_TC,
        .mdio_bus_alloc         = vsc9953_mdio_bus_alloc,
        .mdio_bus_free          = vsc9953_mdio_bus_free,
        .port_modes             = vsc9953_port_modes,
@@ -1002,6 +1001,8 @@ static int seville_probe(struct platform_device *pdev)
 
        ds->dev = dev;
        ds->num_ports = felix->info->num_ports;
+       ds->num_tx_queues = OCELOT_NUM_TC;
+
        ds->ops = &felix_switch_ops;
        ds->phylink_mac_ops = &felix_phylink_mac_ops;
        ds->priv = ocelot;