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

Commit abe80fdc authored by Joao Pinto's avatar Joao Pinto Committed by David S. Miller
Browse files

net: stmmac: RX queue routing configuration 



This patch adds the configuration of RX queues' routing.

Signed-off-by: default avatarJoao Pinto <jpinto@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8f5102a

Documentation/devicetree/bindings/net/stmmac.txt

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,12 @@ Optional properties: 
			- snps,dcb-algorithm: Queue to be enabled as DCB

			- snps,avb-algorithm: Queue to be enabled as AVB

		- snps,map-to-dma-channel: Channel to map

		- Specifiy specific packet routing:

			- snps,route-avcp: AV Untagged Control packets

			- snps,route-ptp: PTP Packets

			- snps,route-dcbcp: DCB Control Packets

			- snps,route-up: Untagged Packets

			- snps,route-multi-broad: Multicast & Broadcast Packets

		- snps,priority: RX queue priority (Range: 0x0 to 0xF)

- Multiple TX Queues parameters: below the list of all the parameters to

				 configure the multiple TX queues:

drivers/net/ethernet/stmicro/stmmac/common.h

+17 −0
Original line number Diff line number Diff line
@@ -246,6 +246,15 @@ struct stmmac_extra_stats { 
#define STMMAC_TX_MAX_FRAMES	256

#define STMMAC_TX_FRAMES	64



/* Packets types */

enum packets_types {

	PACKET_AVCPQ = 0x1, /* AV Untagged Control packets */

	PACKET_PTPQ = 0x2, /* PTP Packets */

	PACKET_DCBCPQ = 0x3, /* DCB Control Packets */

	PACKET_UPQ = 0x4, /* Untagged Packets */

	PACKET_MCBCQ = 0x5, /* Multicast & Broadcast Packets */

};



/* Rx IPC status */

enum rx_frame_status {

	good_frame = 0x0,
@@ -473,6 +482,9 @@ struct stmmac_ops { 
	void (*rx_queue_prio)(struct mac_device_info *hw, u32 prio, u32 queue);

	/* TX Queues Priority */

	void (*tx_queue_prio)(struct mac_device_info *hw, u32 prio, u32 queue);

	/* RX Queues Routing */

	void (*rx_queue_routing)(struct mac_device_info *hw, u8 packet,

				 u32 queue);

	/* Program RX Algorithms */

	void (*prog_mtl_rx_algorithms)(struct mac_device_info *hw, u32 rx_alg);

	/* Program TX Algorithms */
@@ -581,6 +593,11 @@ struct mac_device_info { 
	unsigned int ps;

};



struct stmmac_rx_routing {

	u32 reg_mask;

	u32 reg_shift;

};



struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins,

					int perfect_uc_entries,

					int *synopsys_id);

drivers/net/ethernet/stmicro/stmmac/dwmac4.h

+16 −0
Original line number Diff line number Diff line
@@ -44,6 +44,22 @@ 
#define GMAC_ADDR_HIGH(reg)		(0x300 + reg * 8)

#define GMAC_ADDR_LOW(reg)		(0x304 + reg * 8)



/* RX Queues Routing */

#define GMAC_RXQCTRL_AVCPQ_MASK		GENMASK(2, 0)

#define GMAC_RXQCTRL_AVCPQ_SHIFT	0

#define GMAC_RXQCTRL_PTPQ_MASK		GENMASK(6, 4)

#define GMAC_RXQCTRL_PTPQ_SHIFT		4

#define GMAC_RXQCTRL_DCBCPQ_MASK	GENMASK(10, 8)

#define GMAC_RXQCTRL_DCBCPQ_SHIFT	8

#define GMAC_RXQCTRL_UPQ_MASK		GENMASK(14, 12)

#define GMAC_RXQCTRL_UPQ_SHIFT		12

#define GMAC_RXQCTRL_MCBCQ_MASK		GENMASK(18, 16)

#define GMAC_RXQCTRL_MCBCQ_SHIFT	16

#define GMAC_RXQCTRL_MCBCQEN		BIT(20)

#define GMAC_RXQCTRL_MCBCQEN_SHIFT	20

#define GMAC_RXQCTRL_TACPQE		BIT(21)

#define GMAC_RXQCTRL_TACPQE_SHIFT	21



/* MAC Packet Filtering */

#define GMAC_PACKET_FILTER_PR		BIT(0)

#define GMAC_PACKET_FILTER_HMC		BIT(2)

drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c

+34 −0
Original line number Diff line number Diff line
@@ -109,6 +109,39 @@ static void dwmac4_tx_queue_priority(struct mac_device_info *hw, 
	writel(value, ioaddr + base_register);

}



static void dwmac4_tx_queue_routing(struct mac_device_info *hw,

				    u8 packet, u32 queue)

{

	void __iomem *ioaddr = hw->pcsr;

	u32 value;



	const struct stmmac_rx_routing route_possibilities[] = {

		{ GMAC_RXQCTRL_AVCPQ_MASK, GMAC_RXQCTRL_AVCPQ_SHIFT },

		{ GMAC_RXQCTRL_PTPQ_MASK, GMAC_RXQCTRL_PTPQ_SHIFT },

		{ GMAC_RXQCTRL_DCBCPQ_MASK, GMAC_RXQCTRL_DCBCPQ_SHIFT },

		{ GMAC_RXQCTRL_UPQ_MASK, GMAC_RXQCTRL_UPQ_SHIFT },

		{ GMAC_RXQCTRL_MCBCQ_MASK, GMAC_RXQCTRL_MCBCQ_SHIFT },

	};



	value = readl(ioaddr + GMAC_RXQ_CTRL1);



	/* routing configuration */

	value &= ~route_possibilities[packet - 1].reg_mask;

	value |= (queue << route_possibilities[packet-1].reg_shift) &

		 route_possibilities[packet - 1].reg_mask;



	/* some packets require extra ops */

	if (packet == PACKET_AVCPQ) {

		value &= ~GMAC_RXQCTRL_TACPQE;

		value |= 0x1 << GMAC_RXQCTRL_TACPQE_SHIFT;

	} else if (packet == PACKET_MCBCQ) {

		value &= ~GMAC_RXQCTRL_MCBCQEN;

		value |= 0x1 << GMAC_RXQCTRL_MCBCQEN_SHIFT;

	}



	writel(value, ioaddr + GMAC_RXQ_CTRL1);

}



static void dwmac4_prog_mtl_rx_algorithms(struct mac_device_info *hw,

					  u32 rx_alg)

{
@@ -640,6 +673,7 @@ static const struct stmmac_ops dwmac4_ops = { 
	.rx_queue_enable = dwmac4_rx_queue_enable,

	.rx_queue_prio = dwmac4_rx_queue_priority,

	.tx_queue_prio = dwmac4_tx_queue_priority,

	.rx_queue_routing = dwmac4_tx_queue_routing,

	.prog_mtl_rx_algorithms = dwmac4_prog_mtl_rx_algorithms,

	.prog_mtl_tx_algorithms = dwmac4_prog_mtl_tx_algorithms,

	.set_mtl_tx_queue_weight = dwmac4_set_mtl_tx_queue_weight,

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+25 −0
Original line number Diff line number Diff line
@@ -2332,6 +2332,27 @@ static void stmmac_mac_config_tx_queues_prio(struct stmmac_priv *priv) 
	}

}



/**

 *  stmmac_mac_config_rx_queues_routing - Configure RX Queue Routing

 *  @priv: driver private structure

 *  Description: It is used for configuring the RX queue routing

 */

static void stmmac_mac_config_rx_queues_routing(struct stmmac_priv *priv)

{

	u32 rx_queues_count = priv->plat->rx_queues_to_use;

	u32 queue;

	u8 packet;



	for (queue = 0; queue < rx_queues_count; queue++) {

		/* no specific packet type routing specified for the queue */

		if (priv->plat->rx_queues_cfg[queue].pkt_route == 0x0)

			continue;



		packet = priv->plat->rx_queues_cfg[queue].pkt_route;

		priv->hw->mac->rx_queue_prio(priv->hw, packet, queue);

	}

}



/**

 *  stmmac_mtl_configuration - Configure MTL

 *  @priv: driver private structure
@@ -2377,6 +2398,10 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) 
	/* Set TX priorities */

	if (tx_queues_count > 1 && priv->hw->mac->tx_queue_prio)

		stmmac_mac_config_tx_queues_prio(priv);



	/* Set RX routing */

	if (rx_queues_count > 1 && priv->hw->mac->rx_queue_routing)

		stmmac_mac_config_rx_queues_routing(priv);

}



/**