Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b9147c authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: bcm_sf2: Configure traffic classes to queue mapping 



By default, all traffic goes to queue 0, re-configure the traffic
classes to quality of service mapping such that priority X maps to queue
X, where X is from 0 through 7.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf9f2648

drivers/net/dsa/bcm_sf2.c

+9 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, 
{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	s8 cpu_port = ds->dst[ds->index].cpu_port;

	unsigned int i;

	u32 reg;



	/* Clear the memory power down */
@@ -240,6 +241,14 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, 
	if (priv->brcm_tag_mask & BIT(port))

		bcm_sf2_brcm_hdr_setup(priv, port);



	/* Configure Traffic Class to QoS mapping, allow each priority to map

	 * to a different queue number

	 */

	reg = core_readl(priv, CORE_PORT_TC2_QOS_MAP_PORT(port));

	for (i = 0; i < 8; i++)

		reg |= i << (PRT_TO_QID_SHIFT * i);

	core_writel(priv, reg, CORE_PORT_TC2_QOS_MAP_PORT(port));



	/* Clear the Rx and Tx disable bits and set to no spanning tree */

	core_writel(priv, 0, CORE_G_PCTL_PORT(port));

drivers/net/dsa/bcm_sf2_regs.h

+4 −0
Original line number Diff line number Diff line
@@ -238,6 +238,10 @@ enum bcm_sf2_reg_offs { 
#define  P_TXQ_PSM_VDD(x)		(P_TXQ_PSM_VDD_MASK << \

					((x) * P_TXQ_PSM_VDD_SHIFT))



#define CORE_PORT_TC2_QOS_MAP_PORT(x)	(0xc1c0 + ((x) * 0x10))

#define  PRT_TO_QID_MASK		0x3

#define  PRT_TO_QID_SHIFT		3



#define CORE_PORT_VLAN_CTL_PORT(x)	(0xc400 + ((x) * 0x8))

#define  PORT_VLAN_CTRL_MASK		0x1ff