diff options
| author | Thierry Reding <treding@nvidia.com> | 2019-05-06 14:55:31 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2019-05-08 14:42:52 +0200 |
| commit | f2a465e7185f685b8451c694226286ca058f1b7a (patch) | |
| tree | 2b5aec2613797f959448594a54d15e52047ca09c /arch | |
| parent | dfdbf16c50d89a8cb102a5f7a1f53686fff506ad (diff) | |
| download | linux-stable-f2a465e7185f685b8451c694226286ca058f1b7a.tar.gz linux-stable-f2a465e7185f685b8451c694226286ca058f1b7a.tar.bz2 linux-stable-f2a465e7185f685b8451c694226286ca058f1b7a.zip | |
arm64: tegra: Enable SMMU translation for PCI on Tegra186
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/nvidia/tegra186.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi index 3fb60f6f3a93..426ac0bdf6a6 100644 --- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi @@ -673,6 +673,10 @@ <&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 { |