Skip to content

Commit c631250

Browse files
oleremdavem330
authored andcommitted
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>
1 parent a1ea577 commit c631250

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

drivers/net/dsa/microchip/ksz_common.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
12281228
.num_tx_queues = 4,
12291229
.num_ipvs = 8,
12301230
.tc_cbs_supported = true,
1231-
.tc_ets_supported = true,
12321231
.ops = &ksz9477_dev_ops,
12331232
.phylink_mac_ops = &ksz9477_phylink_mac_ops,
12341233
.mib_names = ksz9477_mib_names,
@@ -1380,7 +1379,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
13801379
.num_tx_queues = 4,
13811380
.num_ipvs = 8,
13821381
.tc_cbs_supported = true,
1383-
.tc_ets_supported = true,
13841382
.ops = &ksz9477_dev_ops,
13851383
.phylink_mac_ops = &ksz9477_phylink_mac_ops,
13861384
.mib_names = ksz9477_mib_names,
@@ -1510,7 +1508,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
15101508
.num_tx_queues = 4,
15111509
.num_ipvs = 8,
15121510
.tc_cbs_supported = true,
1513-
.tc_ets_supported = true,
15141511
.ops = &ksz9477_dev_ops,
15151512
.phylink_mac_ops = &ksz9477_phylink_mac_ops,
15161513
.mib_names = ksz9477_mib_names,
@@ -1540,7 +1537,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
15401537
.num_tx_queues = 4,
15411538
.num_ipvs = 8,
15421539
.tc_cbs_supported = true,
1543-
.tc_ets_supported = true,
15441540
.ops = &ksz9477_dev_ops,
15451541
.phylink_mac_ops = &ksz9477_phylink_mac_ops,
15461542
.mib_names = ksz9477_mib_names,
@@ -1575,7 +1571,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
15751571
.num_tx_queues = 4,
15761572
.num_ipvs = 8,
15771573
.tc_cbs_supported = true,
1578-
.tc_ets_supported = true,
15791574
.ops = &ksz9477_dev_ops,
15801575
.mib_names = ksz9477_mib_names,
15811576
.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1608,7 +1603,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
16081603
.num_tx_queues = 8,
16091604
.num_ipvs = 8,
16101605
.tc_cbs_supported = true,
1611-
.tc_ets_supported = true,
16121606
.ops = &lan937x_dev_ops,
16131607
.phylink_mac_ops = &lan937x_phylink_mac_ops,
16141608
.mib_names = ksz9477_mib_names,
@@ -1637,7 +1631,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
16371631
.num_tx_queues = 8,
16381632
.num_ipvs = 8,
16391633
.tc_cbs_supported = true,
1640-
.tc_ets_supported = true,
16411634
.ops = &lan937x_dev_ops,
16421635
.phylink_mac_ops = &lan937x_phylink_mac_ops,
16431636
.mib_names = ksz9477_mib_names,
@@ -1666,7 +1659,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
16661659
.num_tx_queues = 8,
16671660
.num_ipvs = 8,
16681661
.tc_cbs_supported = true,
1669-
.tc_ets_supported = true,
16701662
.ops = &lan937x_dev_ops,
16711663
.phylink_mac_ops = &lan937x_phylink_mac_ops,
16721664
.mib_names = ksz9477_mib_names,
@@ -1699,7 +1691,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
16991691
.num_tx_queues = 8,
17001692
.num_ipvs = 8,
17011693
.tc_cbs_supported = true,
1702-
.tc_ets_supported = true,
17031694
.ops = &lan937x_dev_ops,
17041695
.phylink_mac_ops = &lan937x_phylink_mac_ops,
17051696
.mib_names = ksz9477_mib_names,
@@ -1732,7 +1723,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
17321723
.num_tx_queues = 8,
17331724
.num_ipvs = 8,
17341725
.tc_cbs_supported = true,
1735-
.tc_ets_supported = true,
17361726
.ops = &lan937x_dev_ops,
17371727
.phylink_mac_ops = &lan937x_phylink_mac_ops,
17381728
.mib_names = ksz9477_mib_names,
@@ -3681,7 +3671,7 @@ static int ksz_tc_setup_qdisc_ets(struct dsa_switch *ds, int port,
36813671
struct ksz_device *dev = ds->priv;
36823672
int ret;
36833673

3684-
if (!dev->info->tc_ets_supported)
3674+
if (is_ksz8(dev))
36853675
return -EOPNOTSUPP;
36863676

36873677
if (qopt->parent != TC_H_ROOT) {

drivers/net/dsa/microchip/ksz_common.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ struct ksz_chip_data {
6464
u8 num_tx_queues;
6565
u8 num_ipvs; /* number of Internal Priority Values */
6666
bool tc_cbs_supported;
67-
bool tc_ets_supported;
6867
const struct ksz_dev_ops *ops;
6968
const struct phylink_mac_ops *phylink_mac_ops;
7069
bool ksz87xx_eee_link_erratum;

0 commit comments

Comments
 (0)