diff options
| author | Christoph Hellwig | 2019-06-13 10:24:46 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2019-06-19 14:31:20 +0200 |
| commit | 9739ab7eda459f0669ec9807e0d9be5020bab88c (patch) | |
| tree | 8c47ef74097699cd4dd4d53bebf10a8ccbb7610d /arch/powerpc/mm | |
| parent | KVM: PPC: Book3S HV: Only write DAWR[X] when handling h_set_dawr in real mode (diff) | |
| download | kernel-qcow2-linux-9739ab7eda459f0669ec9807e0d9be5020bab88c.tar.gz kernel-qcow2-linux-9739ab7eda459f0669ec9807e0d9be5020bab88c.tar.xz kernel-qcow2-linux-9739ab7eda459f0669ec9807e0d9be5020bab88c.zip | |
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: 65a21b71f948 ("powerpc/dma: remove dma_nommu_dma_supported")
Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index e885fe2aafcc..40bd4153ab09 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -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 |