From 5f12e809c9607c846527fb1be6cff64b1d7f88d4 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Mon, 29 Jul 2019 13:49:39 -0700 Subject: [PATCH 1/2] defconfig: Enable all IOMMU related configs on Lahaina Enable all of the IOMMU related features on the Lahaina target. Change-Id: I4a997394d5f936f4dadd8413d29b9c8c080929dc Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/vendor/lahaina_QGKI.config | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index ce07a84da00e..21d59b24df9f 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -1 +1,8 @@ CONFIG_QCOM_SECURE_CHAN_MANAGER=y +CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS=y +CONFIG_IOMMU_DEBUGFS=y +CONFIG_QCOM_LAZY_MAPPING=y +CONFIG_IOMMU_DEBUG=y +CONFIG_IOMMU_DEBUG_TRACKING=y +CONFIG_IOMMU_TESTS=y +CONFIG_QCOM_SECURE_BUFFER=y From 0149304dfcdc873874452305bfd34490055c8c03 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Mon, 29 Jul 2019 13:50:39 -0700 Subject: [PATCH 2/2] defconfig: Enable panics on TLB_SYNC timeouts on Lahaina Enable the panic on TLB_SYNC timeout configuration on Lahaina to collect the SMMU state on the first TLB_SYNC timeout. Change-Id: I7cb465d402cb5f39eb571666b661663e67a2c24e Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/vendor/lahaina_debug.config | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config index aa65d708c21b..4c89412f728a 100644 --- a/arch/arm64/configs/vendor/lahaina_debug.config +++ b/arch/arm64/configs/vendor/lahaina_debug.config @@ -1,2 +1,3 @@ CONFIG_HVC_DCC=y CONFIG_HVC_DCC_SERIALIZE_SMP=y +CONFIG_IOMMU_TLBSYNC_DEBUG=y