Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-07-19 16:55:41 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-07-19 16:55:41 +0200
commitd6e1afab2e634ebeaa8e990cd3e053e4749bb6a9 (patch)
treedbd49493e1d00fc3de646b7a2dca97195b13c021
parent1da6c6520d26ac382857c88983bcaefbb445f81b (diff)
s390/dma: provide proper ARCH_ZONE_DMA_BITS value (jsc#SLE-6197
FATE#327012 bsc#1140559 LTC#173150).
-rw-r--r--patches.arch/s390-dma-provide-proper-ARCH_ZONE_DMA_BITS30
-rw-r--r--series.conf2
2 files changed, 32 insertions, 0 deletions
diff --git a/patches.arch/s390-dma-provide-proper-ARCH_ZONE_DMA_BITS b/patches.arch/s390-dma-provide-proper-ARCH_ZONE_DMA_BITS
new file mode 100644
index 0000000000..d10b01b525
--- /dev/null
+++ b/patches.arch/s390-dma-provide-proper-ARCH_ZONE_DMA_BITS
@@ -0,0 +1,30 @@
+From: Halil Pasic <pasic@linux.ibm.com>
+Date: Thu, 18 Jul 2019 19:21:20 +0200
+Subject: s390/dma: provide proper ARCH_ZONE_DMA_BITS value
+Patch-mainline: not yet, sent 2019-07-18
+References: jsc#SLE-6197 FATE#327012 bsc#1140559 LTC#173150
+
+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")
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/s390/include/asm/dma.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/s390/include/asm/dma.h
++++ b/arch/s390/include/asm/dma.h
+@@ -9,6 +9,7 @@
+ * by the 31 bit heritage.
+ */
+ #define MAX_DMA_ADDRESS 0x80000000
++#define ARCH_ZONE_DMA_BITS 31
+
+ #ifdef CONFIG_PCI
+ extern int isa_dma_bridge_buggy;
diff --git a/series.conf b/series.conf
index 97fa8f8986..7864b2c0e4 100644
--- a/series.conf
+++ b/series.conf
@@ -48167,6 +48167,8 @@
patches.arch/s390-sles15sp1-kmsg-update-2019-01-10.patch
patches.arch/s390-sles15sp1-kmsg-update-2019-03-08.patch
+ patches.arch/s390-dma-provide-proper-ARCH_ZONE_DMA_BITS
+
########################################################
# VM/FS patches
########################################################