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

Commit 7035aad8 authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: xgmac: Implement tx_queue_prio() 



Implement the TX Queue Priority callback in XGMAC core.

Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5656ac55

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

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ 
#define XGMAC_MTL_RXQ_DMA_MAP1		0x00001034

#define XGMAC_QxMDMACH(x)		GENMASK((x) * 8 + 3, (x) * 8)

#define XGMAC_QxMDMACH_SHIFT(x)		((x) * 8)

#define XGMAC_TC_PRTY_MAP0		0x00001040

#define XGMAC_TC_PRTY_MAP1		0x00001044

#define XGMAC_PSTC(x)			GENMASK((x) * 8 + 7, (x) * 8)

#define XGMAC_PSTC_SHIFT(x)		((x) * 8)

#define XGMAC_MTL_TXQ_OPMODE(x)		(0x00001100 + (0x80 * (x)))

#define XGMAC_TQS			GENMASK(25, 16)

#define XGMAC_TQS_SHIFT			16

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

+18 −1
Original line number Diff line number Diff line
@@ -118,6 +118,23 @@ static void dwxgmac2_rx_queue_prio(struct mac_device_info *hw, u32 prio, 
	writel(value, ioaddr + reg);

}



static void dwxgmac2_tx_queue_prio(struct mac_device_info *hw, u32 prio,

				   u32 queue)

{

	void __iomem *ioaddr = hw->pcsr;

	u32 value, reg;



	reg = (queue < 4) ? XGMAC_TC_PRTY_MAP0 : XGMAC_TC_PRTY_MAP1;

	if (queue >= 4)

		queue -= 4;



	value = readl(ioaddr + reg);

	value &= ~XGMAC_PSTC(queue);

	value |= (prio << XGMAC_PSTC_SHIFT(queue)) & XGMAC_PSTC(queue);



	writel(value, ioaddr + reg);

}



static void dwxgmac2_prog_mtl_rx_algorithms(struct mac_device_info *hw,

					    u32 rx_alg)

{
@@ -428,7 +445,7 @@ const struct stmmac_ops dwxgmac210_ops = { 
	.rx_ipc = dwxgmac2_rx_ipc,

	.rx_queue_enable = dwxgmac2_rx_queue_enable,

	.rx_queue_prio = dwxgmac2_rx_queue_prio,

	.tx_queue_prio = NULL,

	.tx_queue_prio = dwxgmac2_tx_queue_prio,

	.rx_queue_routing = NULL,

	.prog_mtl_rx_algorithms = dwxgmac2_prog_mtl_rx_algorithms,

	.prog_mtl_tx_algorithms = dwxgmac2_prog_mtl_tx_algorithms,