From b731a04b788066594cb9877ffda036f980af1683 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Wed, 24 Feb 2021 12:26:40 +0000 Subject: [PATCH] ANDROID: gki_defconfig: Ensure KVM is configured in "protected" mode In order to support the Protected KVM (pKVM) development effort, ensure that the GKI kernel initialises KVM in "protected" mode when booted at EL2, even if the underlying CPU hardware supports VHE. This has no impact on platforms entering the kernel at EL1. Cc: David Brazdil Cc: Marc Zyngier Cc: Alistair Delva Signed-off-by: Will Deacon Bug: 17809838 Test: atest VirtualizationHostTestCases on an EL2-enabled device Change-Id: Id84d0b0d08706658d1fc080c09ad8ee5b51ed517 --- 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 648824aec11c..a4dcbdba7b0d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -56,7 +56,7 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set -CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off" +CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y