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

Commit d9e74276 authored by Michal Simek's avatar Michal Simek Committed by Greg Kroah-Hartman
Browse files

net: macb: Clean 64b dma addresses if they are not detected 



[ Upstream commit e1e5d8a9fe737d94ccc0ccbaf0c97f69a8f3e000 ]

Clear ADDR64 dma bit in DMACFG register in case that HW_DMA_CAP_64B is
not detected on 64bit system.
The issue was observed when bootloader(u-boot) does not check macb
feature at DCFG6 register (DAW64_OFFSET) and enabling 64bit dma support
by default. Then macb driver is reading DMACFG register back and only
adding 64bit dma configuration but not cleaning it out.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a5bdfc68

drivers/net/ethernet/cadence/macb_main.c

+1 −0
Original line number Diff line number Diff line
@@ -2000,6 +2000,7 @@ static void macb_configure_dma(struct macb *bp) 
		else

			dmacfg &= ~GEM_BIT(TXCOEN);



		dmacfg &= ~GEM_BIT(ADDR64);

#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

		if (bp->hw_dma_cap & HW_DMA_CAP_64B)

			dmacfg |= GEM_BIT(ADDR64);