net: dsa: microchip: enable ETS support for KSZ989X variants

I tested ETS support on KSZ9893, so it should work other KSZ989X
variants too, which was till not listed as support.

With this change we now officially not support only ksz8 family of
chips.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index acf10623c8e022eefcb0fade5aeec73db77079ee..403960ef7a10c5c215ce252c7ee59095483c4b7c 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -1228,7 +1228,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 4,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &ksz9477_dev_ops,
                .phylink_mac_ops = &ksz9477_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -1380,7 +1379,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 4,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &ksz9477_dev_ops,
                .phylink_mac_ops = &ksz9477_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -1510,7 +1508,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 4,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &ksz9477_dev_ops,
                .phylink_mac_ops = &ksz9477_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -1540,7 +1537,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 4,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &ksz9477_dev_ops,
                .phylink_mac_ops = &ksz9477_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -1575,7 +1571,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 4,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &ksz9477_dev_ops,
                .mib_names = ksz9477_mib_names,
                .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1608,7 +1603,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 8,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &lan937x_dev_ops,
                .phylink_mac_ops = &lan937x_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -1637,7 +1631,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 8,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &lan937x_dev_ops,
                .phylink_mac_ops = &lan937x_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -1666,7 +1659,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 8,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &lan937x_dev_ops,
                .phylink_mac_ops = &lan937x_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -1699,7 +1691,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 8,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &lan937x_dev_ops,
                .phylink_mac_ops = &lan937x_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -1732,7 +1723,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
                .num_tx_queues = 8,
                .num_ipvs = 8,
                .tc_cbs_supported = true,
-               .tc_ets_supported = true,
                .ops = &lan937x_dev_ops,
                .phylink_mac_ops = &lan937x_phylink_mac_ops,
                .mib_names = ksz9477_mib_names,
@@ -3681,7 +3671,7 @@ static int ksz_tc_setup_qdisc_ets(struct dsa_switch *ds, int port,
        struct ksz_device *dev = ds->priv;
        int ret;
 
-       if (!dev->info->tc_ets_supported)
+       if (is_ksz8(dev))
                return -EOPNOTSUPP;
 
        if (qopt->parent != TC_H_ROOT) {

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 42f445aef9c905ed7a1265e6de997cfdcabd3447..baf236792e1078a0cba6912b3b17ad789dda9d3d 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -64,7 +64,6 @@ struct ksz_chip_data {
        u8 num_tx_queues;
        u8 num_ipvs; /* number of Internal Priority Values */
        bool tc_cbs_supported;
-       bool tc_ets_supported;
        const struct ksz_dev_ops *ops;
        const struct phylink_mac_ops *phylink_mac_ops;
        bool ksz87xx_eee_link_erratum;