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

net: dsa: microchip: init predictable IPV to queue mapping for all non KSZ8xxx variants 



Init priority to queue mapping in the way as it shown in IEEE 802.1Q
mapping example.

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 c631250a

drivers/net/dsa/microchip/ksz_common.c

+33 −24
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/of_net.h>

#include <linux/micrel_phy.h>

#include <net/dsa.h>

#include <net/ieee8021q.h>

#include <net/pkt_cls.h>

#include <net/switchdev.h>
@@ -2720,9 +2721,33 @@ static int ksz_port_mdb_del(struct dsa_switch *ds, int port, 
	return dev->dev_ops->mdb_del(dev, port, mdb, db);

}



static int ksz9477_set_default_prio_queue_mapping(struct ksz_device *dev,

						  int port)

{

	u32 queue_map = 0;

	int ipv;



	for (ipv = 0; ipv < dev->info->num_ipvs; ipv++) {

		int queue;



		/* Traffic Type (TT) is corresponding to the Internal Priority

		 * Value (IPV) in the switch. Traffic Class (TC) is

		 * corresponding to the queue in the switch.

		 */

		queue = ieee8021q_tt_to_tc(ipv, dev->info->num_tx_queues);

		if (queue < 0)

			return queue;



		queue_map |= queue << (ipv * KSZ9477_PORT_TC_MAP_S);

	}



	return ksz_pwrite32(dev, port, KSZ9477_PORT_MRI_TC_MAP__4, queue_map);

}



static int ksz_port_setup(struct dsa_switch *ds, int port)

{

	struct ksz_device *dev = ds->priv;

	int ret;



	if (!dsa_is_user_port(ds, port))

		return 0;
@@ -2730,6 +2755,12 @@ static int ksz_port_setup(struct dsa_switch *ds, int port) 
	/* setup user port */

	dev->dev_ops->port_setup(dev, port, false);



	if (!is_ksz8(dev)) {

		ret = ksz9477_set_default_prio_queue_mapping(dev, port);

		if (ret)

			return ret;

	}



	/* port_stp_state_set() will be called after to enable the port so

	 * there is no need to do anything.

	 */
@@ -3589,8 +3620,7 @@ static int ksz_tc_ets_add(struct ksz_device *dev, int port, 


static int ksz_tc_ets_del(struct ksz_device *dev, int port)

{

	int ret, queue, tc_prio, s;

	u32 queue_map = 0;

	int ret, queue;



	/* To restore the default chip configuration, set all queues to use the

	 * WRR scheduler with a weight of 1.
@@ -3602,31 +3632,10 @@ static int ksz_tc_ets_del(struct ksz_device *dev, int port) 
			return ret;

	}



	switch (dev->info->num_tx_queues) {

	case 2:

		s = 2;

		break;

	case 4:

		s = 1;

		break;

	case 8:

		s = 0;

		break;

	default:

		return -EINVAL;

	}



	/* Revert the queue mapping for TC-priority to its default setting on

	 * the chip.

	 */

	for (tc_prio = 0; tc_prio < dev->info->num_ipvs; tc_prio++) {

		int queue;



		queue = tc_prio >> s;

		queue_map |= queue << (tc_prio * KSZ9477_PORT_TC_MAP_S);

	}



	return ksz_pwrite32(dev, port, KSZ9477_PORT_MRI_TC_MAP__4, queue_map);

	return ksz9477_set_default_prio_queue_mapping(dev, port);

}



static int ksz_tc_ets_validate(struct ksz_device *dev, int port,