Commit ea1078d9 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by David S. Miller
Browse files

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: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Acked-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bcb8968

drivers/net/dsa/microchip/ksz8795.c

+0 −6
Original line number Diff line number Diff line
@@ -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

drivers/net/dsa/microchip/ksz9477.c

+0 −6
Original line number Diff line number Diff line
@@ -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,