[SRU][G/raspi][PATCH 2/2] UBUNTU: [Config] raspi: Disable LPAE and HIGHMEM and set VMSPLIT_2G=y

[Juerg Haefliger]

BugLink: https://bugs.launchpad.net/bugs/1896761

Disable LPAE and HIGHMEM for the new armhf raspi-nolpae flavor. In order
to recoup the high memory, VM splitting needs to be changed to 2G/2G.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 debian.raspi/config/arm64/config.common.arm64         | 2 +-
 debian.raspi/config/armhf/config.common.armhf         | 4 +---
 debian.raspi/config/armhf/config.flavour.raspi        | 7 +++++++
 debian.raspi/config/armhf/config.flavour.raspi-nolpae | 7 +++++++
 debian.raspi/config/config.common.ubuntu              | 9 ++++-----
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/debian.raspi/config/arm64/config.common.arm64 b/debian.raspi/config/arm64/config.common.arm64
index 5d425584285e..5e4f8d7e7175 100644
--- a/debian.raspi/config/arm64/config.common.arm64
+++ b/debian.raspi/config/arm64/config.common.arm64
@@ -5,7 +5,7 @@ CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_ARCH_MMAP_RND_BITS_MAX=33
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
 # CONFIG_BCM_VC_SM is not set
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 10.2.0-3ubuntu1) 10.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 10.2.0-8ubuntu1) 10.2.0"
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 # CONFIG_PAGE_EXTENSION is not set
diff --git a/debian.raspi/config/armhf/config.common.armhf b/debian.raspi/config/armhf/config.common.armhf
index 8e0b4792b2da..3df201ef8b51 100644
--- a/debian.raspi/config/armhf/config.common.armhf
+++ b/debian.raspi/config/armhf/config.common.armhf
@@ -2,13 +2,11 @@
 # Config options for config.common.armhf automatically generated by splitconfig.pl
 #
 CONFIG_ARCH_MMAP_RND_BITS=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 CONFIG_BCM_VC_SM=y
-CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 10.2.0-3ubuntu1) 10.2.0"
+CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 10.2.0-8ubuntu1) 10.2.0"
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_PAGE_EXTENSION=y
-CONFIG_PGTABLE_LEVELS=3
 # CONFIG_RSI_DEBUGFS is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
diff --git a/debian.raspi/config/armhf/config.flavour.raspi b/debian.raspi/config/armhf/config.flavour.raspi
index b5067dfa6252..512bbf3a1ac1 100644
--- a/debian.raspi/config/armhf/config.flavour.raspi
+++ b/debian.raspi/config/armhf/config.flavour.raspi
@@ -1,3 +1,10 @@
 #
 # Config options for config.flavour.raspi automatically generated by splitconfig.pl
 #
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARM_LPAE=y
+CONFIG_HIGHMEM=y
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PGTABLE_LEVELS=3
+# CONFIG_VMSPLIT_2G is not set
+CONFIG_VMSPLIT_3G=y
diff --git a/debian.raspi/config/armhf/config.flavour.raspi-nolpae b/debian.raspi/config/armhf/config.flavour.raspi-nolpae
index c1018162d0b9..90d69b8223e7 100644
--- a/debian.raspi/config/armhf/config.flavour.raspi-nolpae
+++ b/debian.raspi/config/armhf/config.flavour.raspi-nolpae
@@ -1,3 +1,10 @@
 #
 # Config options for config.flavour.raspi-nolpae automatically generated by splitconfig.pl
 #
+CONFIG_ARCH_MMAP_RND_BITS_MAX=15
+# CONFIG_ARM_LPAE is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_VMSPLIT_2G=y
+# CONFIG_VMSPLIT_3G is not set
diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
index 04f67c0f4460..8e86d22d0169 100644
--- a/debian.raspi/config/config.common.ubuntu
+++ b/debian.raspi/config/config.common.ubuntu
@@ -456,7 +456,6 @@ CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_KPROBES_TEST=m
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_LPAE=y
 CONFIG_ARM_MHU=m
 # CONFIG_ARM_MODULE_PLTS is not set
 CONFIG_ARM_PATCH_IDIV=y
@@ -1358,6 +1357,7 @@ CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
 CONFIG_CPU_SPECTRE=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V7=y
@@ -1464,6 +1464,7 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
 CONFIG_CRYPTO_DEV_CCREE=m
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
@@ -2902,7 +2903,6 @@ CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
-CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HINIC is not set
@@ -5208,7 +5208,6 @@ CONFIG_PACKET_DIAG=m
 CONFIG_PACKING=y
 CONFIG_PADATA=y
 CONFIG_PAGE_COUNTER=y
-CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PAGE_OWNER is not set
 CONFIG_PAGE_POISONING=y
 CONFIG_PAGE_POISONING_NO_SANITY=y
@@ -7595,6 +7594,7 @@ CONFIG_USB_FOTG210_HCD=m
 # CONFIG_USB_FOTG210_UDC is not set
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FUSB300 is not set
 CONFIG_USB_F_ACM=m
 CONFIG_USB_F_ECM=m
 CONFIG_USB_F_HID=m
@@ -8177,8 +8177,7 @@ CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
 # CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_VMXNET3 is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VOP_BUS is not set
-- 
2.25.1