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

net: stmmac: Fix issues when number of Queues >= 4 



When queues >= 4 we use different registers but we were not subtracting
the offset of 4. Fix this.

Found out by Coverity.

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

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

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ static void dwmac4_rx_queue_priority(struct mac_device_info *hw, 
	u32 value;



	base_register = (queue < 4) ? GMAC_RXQ_CTRL2 : GMAC_RXQ_CTRL3;

	if (queue >= 4)

		queue -= 4;



	value = readl(ioaddr + base_register);
@@ -102,6 +104,8 @@ static void dwmac4_tx_queue_priority(struct mac_device_info *hw, 
	u32 value;



	base_register = (queue < 4) ? GMAC_TXQ_PRTY_MAP0 : GMAC_TXQ_PRTY_MAP1;

	if (queue >= 4)

		queue -= 4;



	value = readl(ioaddr + base_register);

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

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ static void dwxgmac2_rx_queue_prio(struct mac_device_info *hw, u32 prio, 
	u32 value, reg;



	reg = (queue < 4) ? XGMAC_RXQ_CTRL2 : XGMAC_RXQ_CTRL3;

	if (queue >= 4)

		queue -= 4;



	value = readl(ioaddr + reg);

	value &= ~XGMAC_PSRQ(queue);
@@ -171,6 +173,8 @@ static void dwxgmac2_map_mtl_to_dma(struct mac_device_info *hw, u32 queue, 
	u32 value, reg;



	reg = (queue < 4) ? XGMAC_MTL_RXQ_DMA_MAP0 : XGMAC_MTL_RXQ_DMA_MAP1;

	if (queue >= 4)

		queue -= 4;



	value = readl(ioaddr + reg);

	value &= ~XGMAC_QxMDMACH(queue);

CRA Git | Maintained and supported by SUSTech CRA and CCSE