evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: dts: msm: Don't set the iommus property on IOMMUs

Browse source 
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 <mitchelh@codeaurora.org>
This commit is contained in:
Mitchel Humpherys 2016-04-11 14:57:05 -07:00 • committed by Jeevan Shriram
parent bc509c6867
commit f4515051a9
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi
View file

@ -152,12 +152,6 @@
"mmss_bimc_smmu_axi_clk";
#clock-cells = <1>;
qcom,bus-master-id = <MSM_BUS_MNOC_BIMC_MAS>;
/*
* 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 {