From 1916de1d2afaa097ee18e560442975ed63fdd36c Mon Sep 17 00:00:00 2001 From: Chris Goldsworthy Date: Fri, 1 Apr 2022 16:21:46 -0700 Subject: [PATCH 1/2] modules.list.msm.pineapple: Load the SMMU module in the first stage Load the SMMU module during the first stage init period. Change-Id: Ic45ff739ca4c781434db3607d4d2d60bf37bd2d5 Signed-off-by: Chris Goldsworthy --- modules.list.msm.pineapple | 1 + 1 file changed, 1 insertion(+) diff --git a/modules.list.msm.pineapple b/modules.list.msm.pineapple index 549dea25c0c0..ef14ffbbaa05 100644 --- a/modules.list.msm.pineapple +++ b/modules.list.msm.pineapple @@ -1,3 +1,4 @@ +arm_smmu.ko qcom-scm.ko pinctrl-msm.ko pinctrl-pineapple.ko From cdced925d0e49382e9c276906bad7e2e1b703b5d Mon Sep 17 00:00:00 2001 From: Chris Goldsworthy Date: Fri, 1 Apr 2022 16:20:33 -0700 Subject: [PATCH 2/2] defconfig: arm64: Enable the SMMU V2 driver Enable the SMMU V2 driver. Change-Id: I4f8ca33bf1cea6eedfa79d4da005a36f8697cf70 Signed-off-by: Chris Goldsworthy --- arch/arm64/configs/vendor/pineapple_GKI.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config index a3ce005a16fb..e70d7764b748 100644 --- a/arch/arm64/configs/vendor/pineapple_GKI.config +++ b/arch/arm64/configs/vendor/pineapple_GKI.config @@ -1,4 +1,7 @@ CONFIG_ARCH_PINEAPPLE=y +CONFIG_ARM_SMMU=m +CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y +CONFIG_ARM_SMMU_QCOM=m CONFIG_COMMON_CLK_QCOM=m CONFIG_LOCALVERSION="-gki" # CONFIG_MODULE_SIG_ALL is not set