Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-07-19 15:45:27 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-07-19 15:45:27 +0200
commita378127c532678fcab8cfa74c3bb0d233e73e4a8 (patch)
treee9975c32df88afae083c0eaee9264331d5ce259c
parent7b4c9830d3dc1ff97f126718221a2b25ba9a3ca4 (diff)
- kABI: Fix lost iommu-helper symbols on arm64 (jsc#SLE-6197
FATE#327012 bsc#1140559 LTC#173150). - Update config files.
-rw-r--r--config/arm64/default1
-rw-r--r--patches.kabi/iommu-helper-mark-iommu_is_span_boundary-as-inline25
-rw-r--r--series.conf1
3 files changed, 27 insertions, 0 deletions
diff --git a/config/arm64/default b/config/arm64/default
index edcd488f1a..41af0f8f76 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -29,6 +29,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_SMP=y
CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
CONFIG_KERNEL_MODE_NEON=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_PGTABLE_LEVELS=4
diff --git a/patches.kabi/iommu-helper-mark-iommu_is_span_boundary-as-inline b/patches.kabi/iommu-helper-mark-iommu_is_span_boundary-as-inline
new file mode 100644
index 0000000000..af6b6b2f3a
--- /dev/null
+++ b/patches.kabi/iommu-helper-mark-iommu_is_span_boundary-as-inline
@@ -0,0 +1,25 @@
+From: Petr Tesarik <ptesarik@suse.com>
+Subject: kABI: Fix lost iommu-helper symbols on arm64
+Patch-mainline: never, kabi
+References: jsc#SLE-6197 FATE#327012 bsc#1140559 LTC#173150
+
+Since IOMMU_HELPER symbols are already part of kABI, they cannot be
+removed after release.
+
+Signed-off-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/arm64/Kconfig | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -230,6 +230,9 @@ config SMP
+ config SWIOTLB
+ def_bool y
+
++config IOMMU_HELPER
++ def_bool SWIOTLB
++
+ config KERNEL_MODE_NEON
+ def_bool y
+
diff --git a/series.conf b/series.conf
index 25c13aaf15..7b4f3317e2 100644
--- a/series.conf
+++ b/series.conf
@@ -48757,6 +48757,7 @@
patches.kabi/s390-mm-force-swiotlb-for-protected-virtualization
patches.kabi/s390-cio-add-basic-protected-virtualization-support
patches.kabi/s390-airq-use-dma-memory-for-adapter-interrupts
+ patches.kabi/iommu-helper-mark-iommu_is_span_boundary-as-inline
########################################################
# You'd better have a good reason for adding a patch