Skip to content

Commit ea1078d

Browse files
oleremdavem330
authored andcommitted
net: dsa: microchip: let DCB code do PCP and DSCP policy configuration
802.1P (PCP) and DiffServ (DSCP) are handled now by DCB code. Let it do all needed initial configuration. 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 3bcb896 commit ea1078d

2 files changed

Lines changed: 0 additions & 12 deletions

File tree

drivers/net/dsa/microchip/ksz8795.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,16 +1565,10 @@ void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port)
15651565

15661566
ksz8_port_queue_split(dev, port, queues);
15671567

1568-
/* disable DiffServ priority */
1569-
ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_DIFFSERV_ENABLE, false);
1570-
15711568
/* replace priority */
15721569
ksz_port_cfg(dev, port, P_802_1P_CTRL,
15731570
masks[PORT_802_1P_REMAPPING], false);
15741571

1575-
/* enable 802.1p priority */
1576-
ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_ENABLE, true);
1577-
15781572
if (cpu_port)
15791573
member = dsa_user_ports(ds);
15801574
else

drivers/net/dsa/microchip/ksz9477.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,18 +1158,12 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)
11581158
/* enable broadcast storm limit */
11591159
ksz_port_cfg(dev, port, P_BCAST_STORM_CTRL, PORT_BROADCAST_STORM, true);
11601160

1161-
/* disable DiffServ priority */
1162-
ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_DIFFSERV_PRIO_ENABLE, false);
1163-
11641161
/* replace priority */
11651162
ksz_port_cfg(dev, port, REG_PORT_MRI_MAC_CTRL, PORT_USER_PRIO_CEILING,
11661163
false);
11671164
ksz9477_port_cfg32(dev, port, REG_PORT_MTI_QUEUE_CTRL_0__4,
11681165
MTI_PVID_REPLACE, false);
11691166

1170-
/* enable 802.1p priority */
1171-
ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_PRIO_ENABLE, true);
1172-
11731167
/* force flow control for non-PHY ports only */
11741168
ksz_port_cfg(dev, port, REG_PORT_CTRL_0,
11751169
PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,

0 commit comments

Comments
 (0)