Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-08-24 12:35:54 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2018-08-24 12:35:54 +0200
commite9cdc42ee3450f58c443c72ec5345ae6f370892e (patch)
tree2a1368e799dcf475ec33cb96e90ed0d1602cc601
parent651ab129cfd5b29c19e0bf07f8d852f0c00da03f (diff)
parent11c094d8a4a608b60d5a1f9880fe3ac87a66fc02 (diff)
Merge remote-tracking branch 'origin/users/mbrugger/SLE12-SP4/for-next' into SLE12-SP4
Pull arm64 fix from Matthias Brugger.
-rw-r--r--config/arm64/default2
-rw-r--r--patches.arch/arm64-thd-gicv3-its-increase-FOREC_MAX_ZONEORDER-for-Cav.patch31
-rw-r--r--series.conf5
3 files changed, 37 insertions, 1 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 8edcde4079..29ff94886d 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -623,7 +623,7 @@ CONFIG_SECCOMP=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
# CONFIG_XEN is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_ARM64_SSBD=y
diff --git a/patches.arch/arm64-thd-gicv3-its-increase-FOREC_MAX_ZONEORDER-for-Cav.patch b/patches.arch/arm64-thd-gicv3-its-increase-FOREC_MAX_ZONEORDER-for-Cav.patch
new file mode 100644
index 0000000000..93af0bde2a
--- /dev/null
+++ b/patches.arch/arm64-thd-gicv3-its-increase-FOREC_MAX_ZONEORDER-for-Cav.patch
@@ -0,0 +1,31 @@
+From 69e1ac499e7b36e4a48068c7ca5dcdd1ea7848c3 Mon Sep 17 00:00:00 2001
+From: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
+Date: Wed, 20 Aug 2014 15:10:58 -0700
+Subject: [PATCH 06/18] arm64: gicv3: its: Increase FORCE_MAX_ZONEORDER for
+ Cavium ThunderX
+
+Patch-mainline: Submitted, http://lists.infradead.org/pipermail/linux-arm-kernel/2015-May/340461.html
+References: bsc#1105816
+
+In case of ARCH_THUNDER, there is a need to allocate the GICv3 ITS table
+which is bigger than the allowed max order. So we are forcing it only in
+case of 4KB page size.
+
+Signed-off-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
+[rric: use ARM64_4K_PAGES since we have now ARM64_16K_PAGES, change order]
+Signed-off-by: Robert Richter <rrichter@cavium.com>
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ arch/arm64/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -591,6 +591,7 @@ config FORCE_MAX_ZONEORDER
+ int
+ default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE)
+ default "12" if (ARM64_16K_PAGES && TRANSPARENT_HUGEPAGE)
++ default "13" if (ARM64_4K_PAGES && ARCH_THUNDER)
+ default "11"
+ help
+ The kernel memory allocator divides physically contiguous memory
diff --git a/series.conf b/series.conf
index 14526fec83..3e6bf66215 100644
--- a/series.conf
+++ b/series.conf
@@ -16994,6 +16994,11 @@
patches.arch/s390-sles15-05-01-gmb.patch
########################################################
+ # aarch64
+ ########################################################
+ patches.arch/arm64-thd-gicv3-its-increase-FOREC_MAX_ZONEORDER-for-Cav.patch
+
+ ########################################################
# VM/FS patches
########################################################
patches.suse/vfs-add-super_operations-get_inode_dev