From ed40237f52a1bc6083d4e9ed994b6d455108f359 Mon Sep 17 00:00:00 2001
From: Venkata Rao Kakani <vkakani@qti.qualcomm.com>
Date: Wed, 31 Mar 2021 17:29:31 +0530
Subject: [PATCH] ARM: dts: msm: set dma mapping mode to atomic

set qcom,iommu-dma = "atomic" for all gvm targets to avoid
issues with fastmap mappings.

Change-Id: I17f71b3bdc2bb1c1d2aa13411999305fc4b5a5d4
---
 qcom/sa6155p-vm.dtsi | 2 ++
 qcom/sa8155-vm.dtsi  | 4 ++++
 qcom/sa8195-vm.dtsi  | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/qcom/sa6155p-vm.dtsi b/qcom/sa6155p-vm.dtsi
index 55ebcf73df15..e8eeb6962b76 100644
--- a/qcom/sa6155p-vm.dtsi
+++ b/qcom/sa6155p-vm.dtsi
@@ -436,10 +436,12 @@
 &qupv3_0 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
 &qupv3_1 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
diff --git a/qcom/sa8155-vm.dtsi b/qcom/sa8155-vm.dtsi
index 32bcde2c359c..17a44b250337 100644
--- a/qcom/sa8155-vm.dtsi
+++ b/qcom/sa8155-vm.dtsi
@@ -854,21 +854,25 @@
 &qupv3_0 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
 &qupv3_1 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
 &qupv3_2 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
 &qupv3_3 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
 &pcie_rc0 {
diff --git a/qcom/sa8195-vm.dtsi b/qcom/sa8195-vm.dtsi
index 334e1c14d6e9..3f1fbfac0bf5 100644
--- a/qcom/sa8195-vm.dtsi
+++ b/qcom/sa8195-vm.dtsi
@@ -881,19 +881,23 @@
 &qupv3_0 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
 &qupv3_1 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
 &qupv3_2 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };
 
 &qupv3_3 {
 	/delete-property/ qcom,msm-bus,num-paths;
 	/delete-property/ qcom,msm-bus,vectors-bus-ids;
+	qcom,iommu-dma = "atomic";
 };