From b26e49222edb3c091a7dbb795f16e9abfa7e2320 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Tue, 30 Jul 2019 15:51:19 -0700 Subject: [PATCH 1/2] iommu: Align QCOM_IOMMU_IO_PGTABLE_QUIRKS with other configs The IOMMU configs should not be enabled unless we are sure that we need to use them, so align the description for QCOM_IOMMU_IO_PGTABLE_QUIRKS to reflect this. Change-Id: I62893ae6f263200417f69ffdd559f9601241f9f2 Signed-off-by: Isaac J. Manjarres --- drivers/iommu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 16a317eb40e3..8cd91f20490a 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -113,7 +113,7 @@ config QCOM_IOMMU_IO_PGTABLE_QUIRKS saved in the system cache, and disabling the write-allocate hint when saving page tables in the system cache. - If unsure, say Y here. + If unsure, say N here. endmenu From 27b873ce947fcbce2eeb7a000c62d1d10b7089a7 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Tue, 30 Jul 2019 16:34:37 -0700 Subject: [PATCH 2/2] defconfig: Disable ZONE_DMA32 on Lahaina Disable the DMA zone on for faster memory allocations, and better memory utilization by merging the memory consumed by the DMA zone with the normal memory zone. Change-Id: If3ecf649878ad70bc6045a2c619ef99054ed469d Signed-off-by: Isaac J. Manjarres --- arch/arm64/Kconfig | 5 ++++- arch/arm64/configs/vendor/lahaina_QGKI.config | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 21bf71870c84..6386b6b9ca51 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -260,7 +260,10 @@ config GENERIC_CALIBRATE_DELAY def_bool y config ZONE_DMA32 - def_bool y + bool "Enable or Disable Zone DMA" + default y + help + This option enables/disables the DMA zone. config HAVE_GENERIC_GUP def_bool y diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index 21d59b24df9f..9c6cceb40a6b 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -6,3 +6,4 @@ CONFIG_IOMMU_DEBUG=y CONFIG_IOMMU_DEBUG_TRACKING=y CONFIG_IOMMU_TESTS=y CONFIG_QCOM_SECURE_BUFFER=y +# CONFIG_ZONE_DMA32 is not set