From f4515051a95ddec856a299dd4b1e56a118309b27 Mon Sep 17 00:00:00 2001 From: Mitchel Humpherys Date: Mon, 11 Apr 2016 14:57:05 -0700 Subject: [PATCH] ARM: dts: msm: Don't set the iommus property on IOMMUs Since the IOMMU debug and test framework relies on parsing `iommus' properties from the device tree, we've relied on setting an `iommus' property directly on a few of our IOMMUs, just to ensure that the debugfs directory gets populated even when client drivers haven't been enabled. However, in newer kernels, any device node with an `iommus' property gets auto-attached to the given IOMMU, which isn't actually what we want to have happen. The end result is that we try to map our own page table memory into an IOMMU, resulting in a recursive mapping loop, which is unequivocally bad. Fix this by removing the recursive `iommus' property. The method for testing these things in isolation from clients will need to be re-worked. CRs-Fixed: 1000848 Change-Id: I394bfc1c72492415d6f7fbb0b10df309b86d6faa Signed-off-by: Mitchel Humpherys --- arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi b/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi index 9679b2f2ef6f..f00395b081b8 100644 --- a/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi @@ -152,12 +152,6 @@ "mmss_bimc_smmu_axi_clk"; #clock-cells = <1>; qcom,bus-master-id = ; - /* - * The iommu test framework requires at least one iommu - * client to populate debugfs. The presence of a device - * "qcom,smmu-v2" alone is not sufficient. - */ - iommus = <&mmss_smmu 1>; }; kgsl_smmu: arm,smmu-kgsl@5040000 {