From 2b6b7a90c80eef27961cf9c9997ea59fa4fc8de8 Mon Sep 17 00:00:00 2001 From: Yingshiuan Pan Date: Wed, 12 Apr 2023 14:50:37 +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. Signed-off-by: Yingshiuan Pan Signed-off-by: Liju Chen Change-Id: I1c5a28fb05c64c7ab43f489fb4882fb8f6d152e0 Bug: 379230831 --- arch/arm64/configs/gki_defconfig | 1 + modules.bzl | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4b9a1ed56536..35e4e869814d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -563,6 +563,7 @@ CONFIG_DMABUF_SYSFS_STATS=y CONFIG_UIO=y CONFIG_VIRT_DRIVERS=y CONFIG_ARM_PKVM_GUEST=y +CONFIG_MTK_GZVM=m CONFIG_VIRTIO_PCI=m # CONFIG_VIRTIO_PCI_LEGACY is not set CONFIG_VIRTIO_BALLOON=m diff --git a/modules.bzl b/modules.bzl index dfd7c709e0dc..974c8f444450 100644 --- a/modules.bzl +++ b/modules.bzl @@ -94,6 +94,7 @@ _ARM_GKI_MODULES_LIST = [ _ARM64_GKI_MODULES_LIST = [ # keep sorted + "arch/arm64/geniezone/gzvm.ko", "drivers/char/hw_random/cctrng.ko", "drivers/misc/open-dice.ko", "drivers/ptp/ptp_kvm.ko",