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

Commit 9739ab7e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

powerpc: enable a 30-bit ZONE_DMA for 32-bit pmac 



With the strict dma mask checking introduced with the switch to
the generic DMA direct code common wifi chips on 32-bit powerbooks
stopped working.  Add a 30-bit ZONE_DMA to the 32-bit pmac builds
to allow them to reliably allocate dma coherent memory.

Fixes: 65a21b71 ("powerpc/dma: remove dma_nommu_dma_supported")
Reported-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Tested-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 84b02824

arch/powerpc/include/asm/page.h

+7 −0
Original line number Diff line number Diff line
@@ -323,6 +323,13 @@ struct vm_area_struct; 
#endif /* __ASSEMBLY__ */

#include <asm/slice.h>



/*

 * Allow 30-bit DMA for very limited Broadcom wifi chips on many powerbooks.

 */

#ifdef CONFIG_PPC32

#define ARCH_ZONE_DMA_BITS 30

#else

#define ARCH_ZONE_DMA_BITS 31

#endif



#endif /* _ASM_POWERPC_PAGE_H */

arch/powerpc/mm/mem.c

+2 −1
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ void __init paging_init(void) 
	       (long int)((top_of_ram - total_ram) >> 20));



#ifdef CONFIG_ZONE_DMA

	max_zone_pfns[ZONE_DMA]	= min(max_low_pfn, 0x7fffffffUL >> PAGE_SHIFT);

	max_zone_pfns[ZONE_DMA]	= min(max_low_pfn,

			((1UL << ARCH_ZONE_DMA_BITS) - 1) >> PAGE_SHIFT);

#endif

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

#ifdef CONFIG_HIGHMEM

arch/powerpc/platforms/powermac/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config PPC_PMAC 
	select PPC_INDIRECT_PCI if PPC32

	select PPC_MPC106 if PPC32

	select PPC_NATIVE

	select ZONE_DMA if PPC32

	default y



config PPC_PMAC64