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

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

net: stmmac: xgmac: Clear previous RX buffer size 



[ Upstream commit 11d55fd9975f8e46a0e5e19c14899544e81e1e15 ]

When switching between buffer sizes we need to clear the previous value.

Fixes: d6ddfacd ("net: stmmac: Add DMA related callbacks for XGMAC2")
Signed-off-by: default avatarJose Abreu <Jose.Abreu@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 57d547a4

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

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ 
#define XGMAC_DMA_CH_RX_CONTROL(x)	(0x00003108 + (0x80 * (x)))

#define XGMAC_RxPBL			GENMASK(21, 16)

#define XGMAC_RxPBL_SHIFT		16

#define XGMAC_RBSZ			GENMASK(14, 1)

#define XGMAC_RBSZ_SHIFT		1

#define XGMAC_RXST			BIT(0)

#define XGMAC_DMA_CH_TxDESC_LADDR(x)	(0x00003114 + (0x80 * (x)))

#define XGMAC_DMA_CH_RxDESC_LADDR(x)	(0x0000311c + (0x80 * (x)))

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

+2 −1
Original line number Diff line number Diff line
@@ -379,7 +379,8 @@ static void dwxgmac2_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan) 
	u32 value;



	value = readl(ioaddr + XGMAC_DMA_CH_RX_CONTROL(chan));

	value |= bfsize << 1;

	value &= ~XGMAC_RBSZ;

	value |= bfsize << XGMAC_RBSZ_SHIFT;

	writel(value, ioaddr + XGMAC_DMA_CH_RX_CONTROL(chan));

}