Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ce32021 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "vendor: defconfig: enable smmu debug option on trinket"

parents 01339048 66d36dad

arch/arm64/configs/vendor/trinket_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ CONFIG_QCOM_APCS_IPC=y 
CONFIG_MSM_QMP=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_IOMMU_TLBSYNC_DEBUG=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

drivers/iommu/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -371,6 +371,16 @@ config ARM_SMMU_SELFTEST 


	  If unsure, say N here.



config IOMMU_TLBSYNC_DEBUG

	bool "TLB sync timeout debug"

	depends on ARM_SMMU

	help

	  Enables to collect the SMMU system state information right

	  after the first TLB sync timeout failure by calling BUG().

	  Note to use this only on debug builds.



	  If unsure, say N here.



config QCOM_LAZY_MAPPING

	bool "Reference counted iommu-mapping support"

	depends on ION

drivers/iommu/arm-smmu.c

+2 −0
Original line number Diff line number Diff line
@@ -1120,6 +1120,8 @@ static int __arm_smmu_tlb_sync(struct arm_smmu_device *smmu, 
	dev_err_ratelimited(smmu->dev,

			    "TLB sync timed out -- SMMU may be deadlocked, ack 0x%x\n",

			    sync_inv_ack);

	BUG_ON(IS_ENABLED(CONFIG_IOMMU_TLBSYNC_DEBUG));



	return -EINVAL;

}