]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
arm64: tegra: Enable SMMU translation for PCI on Tegra186
authorThierry Reding <treding@nvidia.com>
Mon, 6 May 2019 12:55:31 +0000 (14:55 +0200)
committerThierry Reding <treding@nvidia.com>
Wed, 8 May 2019 12:42:52 +0000 (14:42 +0200)
Commit 954a03be033c ("iommu/arm-smmu: Break insecure users by disabling
bypass by default") intentionally breaks all devices using the SMMU in
bypass mode. This breaks, among other things, PCI support on Tegra186.
Fix this by populating the iommus property and friends for the PCIe
controller.

Fixes: 954a03be033c ("iommu/arm-smmu: Break insecure users by disabling bypass by default")
Signed-off-by: Thierry Reding <treding@nvidia.com>
arch/arm64/boot/dts/nvidia/tegra186.dtsi

index 3fb60f6f3a93b31685abc17d2799c6427e07e3e9..426ac0bdf6a6f7789f9a3b8874d0c00089b159e1 100644 (file)
@@ -673,6 +673,10 @@ pcie@10003000 {
                         <&bpmp TEGRA186_RESET_PCIEXCLK>;
                reset-names = "afi", "pex", "pcie_x";
 
+               iommus = <&smmu TEGRA186_SID_AFI>;
+               iommu-map = <0x0 &smmu TEGRA186_SID_AFI 0x1000>;
+               iommu-map-mask = <0x0>;
+
                status = "disabled";
 
                pci@1,0 {