Commit e30f33a5 authored by Arun Ramadoss's avatar Arun Ramadoss Committed by Jakub Kicinski
Browse files

net: dsa: microchip: enable port queues for tc mqprio 



LAN937x family of switches has 8 queues per port where the KSZ switches
has 4 queues per port. By default, only one queue per port is enabled.
The queues are configurable in 2, 4 or 8. This patch add 8 number of
queues for LAN937x and 4 for other switches.
In the tag_ksz.c file, prioirty of the packet is queried using the skb
buffer and the corresponding value is updated in the tag.

Signed-off-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3176eb82

drivers/net/dsa/microchip/ksz9477.c

+18 −0
Original line number Diff line number Diff line
@@ -980,6 +980,22 @@ int ksz9477_set_ageing_time(struct ksz_device *dev, unsigned int msecs) 
	return ksz_write8(dev, REG_SW_LUE_CTRL_0, value);

}



void ksz9477_port_queue_split(struct ksz_device *dev, int port)

{

	u8 data;



	if (dev->info->num_tx_queues == 8)

		data = PORT_EIGHT_QUEUE;

	else if (dev->info->num_tx_queues == 4)

		data = PORT_FOUR_QUEUE;

	else if (dev->info->num_tx_queues == 2)

		data = PORT_TWO_QUEUE;

	else

		data = PORT_SINGLE_QUEUE;



	ksz_prmw8(dev, port, REG_PORT_CTRL_0, PORT_QUEUE_SPLIT_MASK, data);

}



void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)

{

	struct dsa_switch *ds = dev->ds;
@@ -991,6 +1007,8 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port) 
		ksz_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_TAIL_TAG_ENABLE,

			     true);



	ksz9477_port_queue_split(dev, port);



	ksz_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_MAC_LOOPBACK, false);



	/* set back pressure */

drivers/net/dsa/microchip/ksz9477.h

+1 −0
Original line number Diff line number Diff line
@@ -56,5 +56,6 @@ int ksz9477_reset_switch(struct ksz_device *dev); 
int ksz9477_dsa_init(struct ksz_device *dev);

int ksz9477_switch_init(struct ksz_device *dev);

void ksz9477_switch_exit(struct ksz_device *dev);

void ksz9477_port_queue_split(struct ksz_device *dev, int port);



#endif

drivers/net/dsa/microchip/ksz9477_reg.h

+5 −1
Original line number Diff line number Diff line
@@ -850,7 +850,11 @@ 
#define PORT_FORCE_TX_FLOW_CTRL		BIT(4)

#define PORT_FORCE_RX_FLOW_CTRL		BIT(3)

#define PORT_TAIL_TAG_ENABLE		BIT(2)

#define PORT_QUEUE_SPLIT_ENABLE		0x3

#define PORT_QUEUE_SPLIT_MASK		GENMASK(1, 0)

#define PORT_EIGHT_QUEUE		0x3

#define PORT_FOUR_QUEUE			0x2

#define PORT_TWO_QUEUE			0x1

#define PORT_SINGLE_QUEUE		0x0



#define REG_PORT_CTRL_1			0x0021

drivers/net/dsa/microchip/ksz_common.c

+18 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x07,	/* can be configured as cpu port */

		.port_cnt = 3,		/* total port count */

		.port_nirqs = 3,

		.num_tx_queues = 4,

		.ops = &ksz9477_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1106,6 +1107,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.num_statics = 8,

		.cpu_ports = 0x10,	/* can be configured as cpu port */

		.port_cnt = 5,		/* total cpu and user ports */

		.num_tx_queues = 4,

		.ops = &ksz8_dev_ops,

		.ksz87xx_eee_link_erratum = true,

		.mib_names = ksz9477_mib_names,
@@ -1144,6 +1146,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.num_statics = 8,

		.cpu_ports = 0x10,	/* can be configured as cpu port */

		.port_cnt = 5,		/* total cpu and user ports */

		.num_tx_queues = 4,

		.ops = &ksz8_dev_ops,

		.ksz87xx_eee_link_erratum = true,

		.mib_names = ksz9477_mib_names,
@@ -1168,6 +1171,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.num_statics = 8,

		.cpu_ports = 0x10,	/* can be configured as cpu port */

		.port_cnt = 5,		/* total cpu and user ports */

		.num_tx_queues = 4,

		.ops = &ksz8_dev_ops,

		.ksz87xx_eee_link_erratum = true,

		.mib_names = ksz9477_mib_names,
@@ -1192,6 +1196,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.num_statics = 8,

		.cpu_ports = 0x4,	/* can be configured as cpu port */

		.port_cnt = 3,

		.num_tx_queues = 4,

		.ops = &ksz8_dev_ops,

		.mib_names = ksz88xx_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz88xx_mib_names),
@@ -1213,6 +1218,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x7F,	/* can be configured as cpu port */

		.port_cnt = 7,		/* total physical port count */

		.port_nirqs = 4,

		.num_tx_queues = 4,

		.ops = &ksz9477_dev_ops,

		.phy_errata_9477 = true,

		.mib_names = ksz9477_mib_names,
@@ -1245,6 +1251,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x3F,	/* can be configured as cpu port */

		.port_cnt = 6,		/* total physical port count */

		.port_nirqs = 2,

		.num_tx_queues = 4,

		.ops = &ksz9477_dev_ops,

		.phy_errata_9477 = true,

		.mib_names = ksz9477_mib_names,
@@ -1277,6 +1284,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x7F,	/* can be configured as cpu port */

		.port_cnt = 7,		/* total physical port count */

		.port_nirqs = 2,

		.num_tx_queues = 4,

		.ops = &ksz9477_dev_ops,

		.phy_errata_9477 = true,

		.mib_names = ksz9477_mib_names,
@@ -1307,6 +1315,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x07,	/* can be configured as cpu port */

		.port_cnt = 3,		/* total port count */

		.port_nirqs = 2,

		.num_tx_queues = 4,

		.ops = &ksz9477_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1332,6 +1341,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x07,	/* can be configured as cpu port */

		.port_cnt = 3,		/* total port count */

		.port_nirqs = 3,

		.num_tx_queues = 4,

		.ops = &ksz9477_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1357,6 +1367,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x7F,	/* can be configured as cpu port */

		.port_cnt = 7,		/* total physical port count */

		.port_nirqs = 3,

		.num_tx_queues = 4,

		.ops = &ksz9477_dev_ops,

		.phy_errata_9477 = true,

		.mib_names = ksz9477_mib_names,
@@ -1387,6 +1398,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x10,	/* can be configured as cpu port */

		.port_cnt = 5,		/* total physical port count */

		.port_nirqs = 6,

		.num_tx_queues = 8,

		.ops = &lan937x_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1411,6 +1423,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x30,	/* can be configured as cpu port */

		.port_cnt = 6,		/* total physical port count */

		.port_nirqs = 6,

		.num_tx_queues = 8,

		.ops = &lan937x_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1435,6 +1448,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x30,	/* can be configured as cpu port */

		.port_cnt = 8,		/* total physical port count */

		.port_nirqs = 6,

		.num_tx_queues = 8,

		.ops = &lan937x_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1463,6 +1477,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x38,	/* can be configured as cpu port */

		.port_cnt = 5,		/* total physical port count */

		.port_nirqs = 6,

		.num_tx_queues = 8,

		.ops = &lan937x_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1491,6 +1506,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.cpu_ports = 0x30,	/* can be configured as cpu port */

		.port_cnt = 8,		/* total physical port count */

		.port_nirqs = 6,

		.num_tx_queues = 8,

		.ops = &lan937x_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -2065,6 +2081,8 @@ static int ksz_setup(struct dsa_switch *ds) 


	dev->dev_ops->enable_stp_addr(dev);



	ds->num_tx_queues = dev->info->num_tx_queues;



	regmap_update_bits(dev->regmap[0], regs[S_MULTICAST_CTRL],

			   MULTICAST_STORM_DISABLE, MULTICAST_STORM_DISABLE);

drivers/net/dsa/microchip/ksz_common.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct ksz_chip_data { 
	int cpu_ports;

	int port_cnt;

	u8 port_nirqs;

	u8 num_tx_queues;

	const struct ksz_dev_ops *ops;

	bool phy_errata_9477;

	bool ksz87xx_eee_link_erratum;