From 9d21c78ebbcda7e005ddf3007b789c9ea7b1c636 Mon Sep 17 00:00:00 2001 From: Shikha Panwar Date: Tue, 20 Sep 2022 17:45:19 +0000 Subject: [PATCH] ANDROID: [GKI] Include ioremap_guard in cmdline arg The idea is to move the 'early boot' args to built-in kernel commandline to allow kernel to boot directly without bootloader. Note - This is an arm64 only option. AVF uses this to enable KVM MMIO guard functionality. It is also guarded by kvm_arm_hyp_service_available(xx). Bug: 247813394 Signed-off-by: Shikha Panwar Change-Id: I032b51b264614f5859869ee77bf34ec2b54baadc (cherry picked from commit 75a03dbfc836e86f6e56caf1b8e36a2735c5562f) --- arch/arm64/configs/gki_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index f1afb0774db9..c8d4dcee18f2 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -55,7 +55,7 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set -CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off kvm-arm.mode=protected bootconfig" +CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off kvm-arm.mode=protected bootconfig ioremap_guard" # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0