arm64: tegra: Mark host1x as dma-coherent on Tegra194/234

Ensure appropriate configuration is done to make the host1x device
and context devices DMA coherent by adding the dma-coherent flag.

Fixes: b35f5b53a87b ("arm64: tegra: Add context isolation domains on Tegra234")
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
index 6365130a84cf5c5a7f5ee8d86df5bb564ba84f14..de98068e22b45bdd360fb4182071a06a9a96e393 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@ -1923,6 +1923,7 @@
                        interconnects = <&mc TEGRA194_MEMORY_CLIENT_HOST1XDMAR &emc>;
                        interconnect-names = "dma-mem";
                        iommus = <&smmu TEGRA194_SID_HOST1X>;
+                       dma-coherent;
 
                        /* Context isolation domains */
                        iommu-map = <0 &smmu TEGRA194_SID_HOST1X_CTX0 1>,

diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
index 62f7c59df8c624aba3efcd5416f3dd56c3e48188..8fb6dd8b166439d667a4a62ce695d571327dcf24 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
@@ -2151,6 +2151,7 @@
                        interconnects = <&mc TEGRA234_MEMORY_CLIENT_HOST1XDMAR &emc>;
                        interconnect-names = "dma-mem";
                        iommus = <&smmu_niso1 TEGRA234_SID_HOST1X>;
+                       dma-coherent;
 
                        /* Context isolation domains */
                        iommu-map = <0 &smmu_niso0 TEGRA234_SID_HOST1X_CTX0 1>,