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>

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 95f5a5a9898cd3d37e9aad3d95d26a73e7bba7f4..d27b9c36d73fca26dd763c47e9b3b696a232642a 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1565,16 +1565,10 @@ void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port)
 
        ksz8_port_queue_split(dev, port, queues);
 
-       /* disable DiffServ priority */
-       ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_DIFFSERV_ENABLE, false);
-
        /* replace priority */
        ksz_port_cfg(dev, port, P_802_1P_CTRL,
                     masks[PORT_802_1P_REMAPPING], false);
 
-       /* enable 802.1p priority */
-       ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_ENABLE, true);
-
        if (cpu_port)
                member = dsa_user_ports(ds);
        else

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 7f745628c84d13b07fb69bfa906cf380cb90ea95..f8ad7833f5d9df53abbdeb4cc453c9bf769c6ddb 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1158,18 +1158,12 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)
        /* enable broadcast storm limit */
        ksz_port_cfg(dev, port, P_BCAST_STORM_CTRL, PORT_BROADCAST_STORM, true);
 
-       /* disable DiffServ priority */
-       ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_DIFFSERV_PRIO_ENABLE, false);
-
        /* replace priority */
        ksz_port_cfg(dev, port, REG_PORT_MRI_MAC_CTRL, PORT_USER_PRIO_CEILING,
                     false);
        ksz9477_port_cfg32(dev, port, REG_PORT_MTI_QUEUE_CTRL_0__4,
                           MTI_PVID_REPLACE, false);
 
-       /* enable 802.1p priority */
-       ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_PRIO_ENABLE, true);
-
        /* force flow control for non-PHY ports only */
        ksz_port_cfg(dev, port, REG_PORT_CTRL_0,
                     PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,