From e0d8f461df2a6e6ac0bbc3770c1cbc8824273c62 Mon Sep 17 00:00:00 2001
From: Chirag Rastogi <quic_crastogi@quicinc.com>
Date: Mon, 12 Feb 2024 14:09:13 -0800
Subject: [PATCH 1/3] ARM: dts: msm: iommu changes

Updated "iommu-addresses" in Sun to make it Upstream compatible

Change-Id: I1cccdd63b8e1bb70e69a74e7e2030795f6c8b561
Signed-off-by: Chirag Rastogi <quic_crastogi@quicinc.com>
---
 sun-ipa.dtsi | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/sun-ipa.dtsi b/sun-ipa.dtsi
index 2a25e744..a19e824f 100644
--- a/sun-ipa.dtsi
+++ b/sun-ipa.dtsi
@@ -46,8 +46,17 @@
         qcom,ipa-gen-rx-ll-pool-sz-factor = <1>;
 };
 
-&ipa_smmu_ap {
-        qcom,additional-mapping =
-                /* modem tables in IMEM */
-                <0x14683000 0x14683000 0x2000>;
+&soc {
+	ipa_smmu_ap_partition: ipa_smmu_ap_partition {
+		iommu-addresses = <&ipa_smmu_ap 0x0 0x20000000>,
+			<&ipa_smmu_ap 0x40000000 0xC0000000>;
+	};
+};
+
+&ipa_smmu_ap {
+	/delete-property/ qcom,iommu-dma-addr-pool;
+	memory-region = <&ipa_smmu_ap_partition>;
+	qcom,additional-mapping =
+		/* modem tables in IMEM */
+		<0x14683000 0x14683000 0x2000>;
 };

From d9446a3f6c6c9a6d6c7c92a705c83110adf16262 Mon Sep 17 00:00:00 2001
From: Chaitanya Pratapa <quic_cpratapa@quicinc.com>
Date: Mon, 26 Feb 2024 22:58:07 -0800
Subject: [PATCH 2/3] ARM: dts: msm: fix 64 bit addressing for ipa

Make changes to add 64 bit address support using
"iommu-addresses" attribute.

Change-Id: Ide79f48f2d06c7fdaf897a8b03a399167b41a5e2
Signed-off-by: Chaitanya Pratapa <quic_cpratapa@quicinc.com>
---
 sun-ipa.dtsi | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/sun-ipa.dtsi b/sun-ipa.dtsi
index a19e824f..bba7776c 100644
--- a/sun-ipa.dtsi
+++ b/sun-ipa.dtsi
@@ -44,12 +44,19 @@
 
         /* Low Latency pipe alloc factor */
         qcom,ipa-gen-rx-ll-pool-sz-factor = <1>;
+	#address-cells = <2>;
+	#size-cells = <2>;
 };
 
 &soc {
 	ipa_smmu_ap_partition: ipa_smmu_ap_partition {
-		iommu-addresses = <&ipa_smmu_ap 0x0 0x20000000>,
-			<&ipa_smmu_ap 0x40000000 0xC0000000>;
+		iommu-addresses = <&ipa_smmu_ap 0x0 0x0 0x0 0x20000000>,
+			<&ipa_smmu_ap 0x0 0x40000000 0xFFFFFFFF 0xC0000000>;
+	};
+
+	ipa_smmu_uc_partition: ipa_smmu_uc_partition {
+		iommu-addresses = <&ipa_smmu_uc 0x0 0x0 0x0 0x20000000>,
+			<&ipa_smmu_uc 0x0 0x40000000 0xFFFFFFFF 0xC0000000>;
 	};
 };
 
@@ -60,3 +67,8 @@
 		/* modem tables in IMEM */
 		<0x14683000 0x14683000 0x2000>;
 };
+
+&ipa_smmu_uc {
+	/delete-property/ qcom,iommu-dma-addr-pool;
+	memory-region = <&ipa_smmu_uc_partition>;
+};

From e5d06bd77936028305974fc50888eeb7a9950ecf Mon Sep 17 00:00:00 2001
From: Chaitanya Pratapa <quic_cpratapa@quicinc.com>
Date: Fri, 9 Feb 2024 17:02:41 -0800
Subject: [PATCH 3/3] ARM: dts: msm: increase ipa q6 smem size to 54k

Make changes to increase ipa q6 smem size to 54k to
support additional filter and routing rules.

Change-Id: Icb376ec15915ac6b59863f2840f770664e42f9c9
Signed-off-by: Chaitanya Pratapa <quic_cpratapa@quicinc.com>
---
 sun-ipa.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sun-ipa.dtsi b/sun-ipa.dtsi
index bba7776c..c27190e8 100644
--- a/sun-ipa.dtsi
+++ b/sun-ipa.dtsi
@@ -66,6 +66,7 @@
 	qcom,additional-mapping =
 		/* modem tables in IMEM */
 		<0x14683000 0x14683000 0x2000>;
+	qcom,ipa-q6-smem-size = <55296>;
 };
 
 &ipa_smmu_uc {