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

Commit b6cd6d18 authored by Jose Abreu's avatar Jose Abreu Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit e8df7e8c233a18d2704e37ecff47583b494789d3 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 45e7e4e6

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

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,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);
@@ -105,6 +107,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
@@ -106,6 +106,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);
@@ -169,6 +171,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);