From d20e296cfa9cc7bba1e9b34f3c1373513163e707 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 19 Jul 2019 18:56:13 +0100 Subject: Bug 1576593 - work around while vendor investigates arm builder LPAE HW issue --- arm-make-highpte-not-expert.patch | 31 +++++++++++++++++++++++++ configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel.spec | 6 +++++ 7 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 arm-make-highpte-not-expert.patch diff --git a/arm-make-highpte-not-expert.patch b/arm-make-highpte-not-expert.patch new file mode 100644 index 000000000..09630fda1 --- /dev/null +++ b/arm-make-highpte-not-expert.patch @@ -0,0 +1,31 @@ +From 19908e5fe3e63ed2d39f0a8a9135f35fd428d766 Mon Sep 17 00:00:00 2001 +From: Jon Masters +Date: Thu, 18 Jul 2019 15:47:26 -0400 +Subject: [PATCH] arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT + +We will use this to force CONFIG_HIGHPTE off on LPAE for now + +Signed-off-by: Jon Masters +--- + arch/arm/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 2bf1ce39a96d..e792b3e60095 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -1644,9 +1644,9 @@ config HIGHMEM + If unsure, say n. + + config HIGHPTE +- bool "Allocate 2nd-level pagetables from highmem" if EXPERT ++ bool "Allocate 2nd-level pagetables from highmem" + depends on HIGHMEM +- default y ++ default n + help + The VM uses one page of physical memory for each page table. + For systems with a lot of processes, this can use a lot of +-- +2.17.2 + diff --git a/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE b/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE index e11904f2f..cd440ed6d 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE +++ b/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE @@ -1 +1 @@ -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index d45a2492d..c0fa55c78 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2198,7 +2198,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set CONFIG_HISAX_16_3=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index fdb67ba11..4caa5fb40 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2121,7 +2121,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set CONFIG_HISAX_16_3=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index bf03cfbdd..cf2d371c2 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2106,7 +2106,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set CONFIG_HISAX_16_3=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index f62191583..bbf0311ec 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2183,7 +2183,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set CONFIG_HISAX_16_3=y diff --git a/kernel.spec b/kernel.spec index b3f07b294..76ffe03ed 100644 --- a/kernel.spec +++ b/kernel.spec @@ -554,6 +554,9 @@ Patch305: arm-sdhci-esdhc-imx-fixes.patch # Fix accepted for 5.3 https://patchwork.kernel.org/patch/10992783/ Patch306: arm64-dts-rockchip-Update-DWC3-modules-on-RK3399-SoCs.patch +# RHBZ Bug 1576593 - work around while vendor investigates +Patch307: arm-make-highpte-not-expert.patch + # Raspberry Pi bits Patch330: ARM-cpufreq-support-for-Raspberry-Pi.patch @@ -1830,6 +1833,9 @@ fi # # %changelog +* Fri Jul 19 2019 Peter Robinson +- RHBZ Bug 1576593 - work around while vendor investigates + * Tue Jul 09 2019 Justin M. Forbes - 5.2.0-200 - Linux v5.2.0 -- cgit