From 285f7f6b94bf8c299aa4d3b0ee60c2ab7bb5233c Mon Sep 17 00:00:00 2001 From: Prakash Gupta Date: Thu, 17 Dec 2020 14:41:16 +0530 Subject: [PATCH] arm64: defconfig: enable cma debugfs Enable CONFIG_CMA_DEBUGFS for QGKI. This enables read only nodes on QGKI build. Enable CONFIG_CMA_ALLOW_WRITE_DEBUGFS for debug config. This enables writeable cma debugfs node for debug build. Change-Id: Ia40eea08c42b5c4d29691ea354411216c03e60a7 Signed-off-by: Prakash Gupta --- arch/arm64/configs/vendor/holi_QGKI.config | 1 + arch/arm64/configs/vendor/holi_debug.config | 2 +- arch/arm64/configs/vendor/lahaina_QGKI.config | 1 + arch/arm64/configs/vendor/lahaina_consolidate.config | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/vendor/holi_QGKI.config b/arch/arm64/configs/vendor/holi_QGKI.config index d273e2cf696c..1e2a71c04482 100644 --- a/arch/arm64/configs/vendor/holi_QGKI.config +++ b/arch/arm64/configs/vendor/holi_QGKI.config @@ -1,5 +1,6 @@ CONFIG_LOCALVERSION="-qgki" # CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_CMA_DEBUGFS=y CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS=y CONFIG_QCOM_IOMMU_TLBI_QUIRKS=y CONFIG_QCOM_LAZY_MAPPING=y diff --git a/arch/arm64/configs/vendor/holi_debug.config b/arch/arm64/configs/vendor/holi_debug.config index 8ead4eefb3c2..20aaba5b7897 100644 --- a/arch/arm64/configs/vendor/holi_debug.config +++ b/arch/arm64/configs/vendor/holi_debug.config @@ -3,7 +3,7 @@ CONFIG_IOMMU_TLBSYNC_DEBUG=y CONFIG_ARM_SMMU_TESTBUS_DUMP=y CONFIG_ARM_SMMU_TESTBUS_DEBUGFS=y CONFIG_IO_PGTABLE_PAGE_ACCOUNTING=y -CONFIG_CMA_DEBUGFS=y +CONFIG_CMA_ALLOW_WRITE_DEBUGFS=y CONFIG_CMA_DEBUG=y CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y CONFIG_QMP_DEBUGFS_CLIENT=y diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index 8509cf56b00e..50c2b03251cc 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -1,5 +1,6 @@ CONFIG_LOCALVERSION="-qgki" # CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_CMA_DEBUGFS=y CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS=y CONFIG_QCOM_IOMMU_TLBI_QUIRKS=y CONFIG_QCOM_LAZY_MAPPING=y diff --git a/arch/arm64/configs/vendor/lahaina_consolidate.config b/arch/arm64/configs/vendor/lahaina_consolidate.config index 0a227034bc4d..3c948eb65ad7 100644 --- a/arch/arm64/configs/vendor/lahaina_consolidate.config +++ b/arch/arm64/configs/vendor/lahaina_consolidate.config @@ -5,7 +5,7 @@ CONFIG_IOMMU_TESTS=y CONFIG_ARM_SMMU_TESTBUS_DEBUGFS=y CONFIG_ARM_SMMU_TESTBUS_DUMP=y CONFIG_IO_PGTABLE_PAGE_ACCOUNTING=y -CONFIG_CMA_DEBUGFS=y +CONFIG_CMA_ALLOW_WRITE_DEBUGFS=y CONFIG_CMA_DEBUG=y CONFIG_DEBUG_PAGEALLOC=y CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y