Bug 1576593 - work around while vendor investigates arm builder LPAE HW issue

9 files changed, 54 insertions, 17 deletions

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 <jcm@redhat.com>
+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 <jcm@redhat.com>
+---
+ 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-aarch64-debug.config b/kernel-aarch64-debug.config
index 82c5926e6..a6e64598f 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -7077,7 +7077,7 @@ CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 CONFIG_VIDEO_HANTRO=m
-CONFIG_VIDEO_HANTRO_ROCKCHIP=m
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -7088,7 +7088,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MESON_G12A_AO_CEC=m
-# CONFIG_VIDEO_MESON_VDEC is not set
+CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 6fc3e73ad..920695d60 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -7055,7 +7055,7 @@ CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 CONFIG_VIDEO_HANTRO=m
-CONFIG_VIDEO_HANTRO_ROCKCHIP=m
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -7066,7 +7066,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MESON_G12A_AO_CEC=m
-# CONFIG_VIDEO_MESON_VDEC is not set
+CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 913a377e8..01128dde5 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2220,7 +2220,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
@@ -7380,7 +7380,7 @@ CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 CONFIG_VIDEO_HANTRO=m
-CONFIG_VIDEO_HANTRO_ROCKCHIP=m
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -7393,7 +7393,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MESON_G12A_AO_CEC=m
-# CONFIG_VIDEO_MESON_VDEC is not set
+CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_MMP_CAMERA is not set
 CONFIG_VIDEO_MUX=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 6f28ede0e..93aa69e20 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2143,7 +2143,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
@@ -7026,7 +7026,7 @@ CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 CONFIG_VIDEO_HANTRO=m
-CONFIG_VIDEO_HANTRO_ROCKCHIP=m
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -7038,7 +7038,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MESON_G12A_AO_CEC=m
-# CONFIG_VIDEO_MESON_VDEC is not set
+CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ce54eba61..fff1dadfd 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2128,7 +2128,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
@@ -7005,7 +7005,7 @@ CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 CONFIG_VIDEO_HANTRO=m
-CONFIG_VIDEO_HANTRO_ROCKCHIP=m
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -7017,7 +7017,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MESON_G12A_AO_CEC=m
-# CONFIG_VIDEO_MESON_VDEC is not set
+CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 35b59d6fc..e6545bd96 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2205,7 +2205,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
@@ -7359,7 +7359,7 @@ CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 CONFIG_VIDEO_HANTRO=m
-CONFIG_VIDEO_HANTRO_ROCKCHIP=m
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -7372,7 +7372,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MESON_G12A_AO_CEC=m
-# CONFIG_VIDEO_MESON_VDEC is not set
+CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_MMP_CAMERA is not set
 CONFIG_VIDEO_MUX=m
diff --git a/kernel.spec b/kernel.spec
index 5380efe86..d0bbe27f7 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
 
@@ -1819,6 +1822,9 @@ fi
 #
 #
 %changelog
+* Fri Jul 19 2019 Peter Robinson <pbrobinson@fedoraproject.org>
+- RHBZ Bug 1576593 - work around while vendor investigates
+
 * Thu Jul 18 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc0.git7.1
 - Linux v5.2-11564-g22051d9c4a57