From 67018dd4e42f7ced0619e865c166c9f0ff9ffd61 Mon Sep 17 00:00:00 2001 From: Yi-De Wu Date: Thu, 18 May 2023 14:08:40 +0800 Subject: [PATCH] ANDROID: virt: geniezone: Enable as GKI module for arm64 Enables CONFIG_MTK_GZVM (gzvm.ko) as protected GKI module for arm64. Depends on ARM64 so no need to explicitly disable for other architecture's gki_defconfig files. Change-Id: I7bbef9192d92db295623f491e2a923147473a196 Signed-off-by: Yingshiuan Pan Signed-off-by: Yi-De Wu Bug: 280363874 --- android/gki_aarch64_protected_modules | 1 + arch/arm64/configs/gki_defconfig | 1 + modules.bzl | 1 + 3 files changed, 3 insertions(+) diff --git a/android/gki_aarch64_protected_modules b/android/gki_aarch64_protected_modules index d6b0777dd474..3f1af7946695 100644 --- a/android/gki_aarch64_protected_modules +++ b/android/gki_aarch64_protected_modules @@ -1,3 +1,4 @@ +arch/arm64/geniezone/gzvm.ko drivers/bluetooth/btbcm.ko drivers/bluetooth/btqca.ko drivers/bluetooth/btsdio.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index a354cff562ed..ceaf2f1fdeab 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -551,6 +551,7 @@ CONFIG_GUNYAH=y CONFIG_GUNYAH_VCPU=y CONFIG_GUNYAH_IRQFD=y CONFIG_GUNYAH_IOEVENTFD=y +CONFIG_MTK_GZVM=m CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y CONFIG_ASHMEM=y diff --git a/modules.bzl b/modules.bzl index 4254764296fc..dc86e7522fa4 100644 --- a/modules.bzl +++ b/modules.bzl @@ -74,6 +74,7 @@ COMMON_GKI_MODULES_LIST = _COMMON_GKI_MODULES_LIST _ARM64_GKI_MODULES_LIST = [ # keep sorted + "arch/arm64/geniezone/gzvm.ko", ] _RISCV64_GKI_MODULES_LIST = [