diff options
| author | Halil Pasic <pasic@linux.ibm.com> | 2019-07-24 00:51:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-16 10:11:07 +0200 |
| commit | 8be0ce4f3678106e06a21687db3cda2449ddb4e7 (patch) | |
| tree | 7c4134d5347c82e2f2320dfd9621e959bf2d9a03 /arch/s390/include/asm | |
| parent | 5ca37bfa8c39d0d794661dc0cf234a7aa66074c6 (diff) | |
| download | linux-stable-8be0ce4f3678106e06a21687db3cda2449ddb4e7.tar.gz linux-stable-8be0ce4f3678106e06a21687db3cda2449ddb4e7.tar.bz2 linux-stable-8be0ce4f3678106e06a21687db3cda2449ddb4e7.zip | |
s390/dma: provide proper ARCH_ZONE_DMA_BITS value
[ Upstream commit 1a2dcff881059dedc14fafc8a442664c8dbd60f1 ]
On s390 ZONE_DMA is up to 2G, i.e. ARCH_ZONE_DMA_BITS should be 31 bits.
The current value is 24 and makes __dma_direct_alloc_pages() take a
wrong turn first (but __dma_direct_alloc_pages() recovers then).
Let's correct ARCH_ZONE_DMA_BITS value and avoid wrong turns.
Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
Reported-by: Petr Tesarik <ptesarik@suse.cz>
Fixes: c61e9637340e ("dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32")
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/s390/include/asm')
| -rw-r--r-- | arch/s390/include/asm/page.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h index a4d38092530a..823578c6b9e2 100644 --- a/arch/s390/include/asm/page.h +++ b/arch/s390/include/asm/page.h @@ -177,6 +177,8 @@ static inline int devmem_is_allowed(unsigned long pfn) #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define ARCH_ZONE_DMA_BITS 31 + #include <asm-generic/memory_model.h> #include <asm-generic/getorder.h> |