From 32b215daece3bd0dbc6eef9ea69074516d9ab425 Mon Sep 17 00:00:00 2001
From: Karthik Jayakumar <kjayakum@quicinc.com>
Date: Mon, 2 Mar 2020 10:37:49 -0800
Subject: [PATCH] ARM: dts: msm: Update context bank size for Kona and Lahaina

Updates SMMU context bank size for IFE, JPEG and FD in Kona to 4GB
minus a 1MB pad for start and another 1 MB pad for end.

Lahaina has the same change except for FD context bank which is
deprecated.

CRs-Fixed: 2584631
Change-Id: I8d1eba4465c75babdcfc95a6df75788cc058cd7d
---
 kona-camera.dtsi    | 40 ++++++++++++++++++++++++----------------
 lahaina-camera.dtsi | 30 ++++++++++++++++++------------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/kona-camera.dtsi b/kona-camera.dtsi
index df0534624822..20aba2306c76 100644
--- a/kona-camera.dtsi
+++ b/kona-camera.dtsi
@@ -376,15 +376,17 @@
 				<&apps_smmu 0x840 0x400>,
 				<&apps_smmu 0xC00 0x400>,
 				<&apps_smmu 0xC40 0x400>;
-			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
+			qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
 			label = "ife", "ife-cdm";
 			multiple-client-devices;
 			ife_iova_mem_map: iova-mem-map {
-				/* IO region is approximately 3.4 GB */
+				/* IO region is approximately 4.0 GB */
 				iova-mem-region-io {
 					iova-region-name = "io";
-					iova-region-start = <0x7400000>;
-					iova-region-len = <0xd8c00000>;
+					/* 1 MB pad for start */
+					iova-region-start = <0x100000>;
+					/* 1 MB pad for end */
+					iova-region-len = <0xffe00000>;
 					iova-region-id = <0x3>;
 					status = "ok";
 				};
@@ -396,13 +398,15 @@
 			iommus = <&apps_smmu 0x2040 0x400>,
 				<&apps_smmu 0x2440 0x400>;
 			label = "jpeg";
-			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
+			qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
 			jpeg_iova_mem_map: iova-mem-map {
-				/* IO region is approximately 3.4 GB */
+				/* IO region is approximately 4.0 GB */
 				iova-mem-region-io {
 					iova-region-name = "io";
-					iova-region-start = <0x7400000>;
-					iova-region-len = <0xd8c00000>;
+					/* 1 MB pad for start */
+					iova-region-start = <0x100000>;
+					/* 1 MB pad for end */
+					iova-region-len = <0xffe00000>;
 					iova-region-id = <0x3>;
 					status = "ok";
 				};
@@ -489,13 +493,15 @@
 			iommus = <&apps_smmu 0x20C0 0x400>,
 				<&apps_smmu 0x24C0 0x400>;
 			label = "cpas-cdm";
-			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
+			qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
 			cpas_cdm_iova_mem_map: iova-mem-map {
 				iova-mem-region-io {
-					/* IO region is approximately 3.4 GB */
+					/* IO region is approximately 4.0 GB */
 					iova-region-name = "io";
-					iova-region-start = <0x7400000>;
-					iova-region-len = <0xd8c00000>;
+					/* 1 MB pad for start */
+					iova-region-start = <0x100000>;
+					/* 1 MB pad for end */
+					iova-region-len = <0xffe00000>;
 					iova-region-id = <0x3>;
 					status = "ok";
 				};
@@ -512,14 +518,16 @@
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&apps_smmu 0x2080 0x400>,
 				<&apps_smmu 0x2480 0x400>;
-			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
+			qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
 			label = "fd";
 			fd_iova_mem_map: iova-mem-map {
 				iova-mem-region-io {
-					/* IO region is approximately 3.4 GB */
+					/* IO region is approximately 4.0 GB */
 					iova-region-name = "io";
-					iova-region-start = <0x7400000>;
-					iova-region-len = <0xd8c00000>;
+					/* 1 MB pad for start */
+					iova-region-start = <0x100000>;
+					/* 1 MB pad for end */
+					iova-region-len = <0xffe00000>;
 					iova-region-id = <0x3>;
 					status = "ok";
 				};
diff --git a/lahaina-camera.dtsi b/lahaina-camera.dtsi
index 78c5086ec9b2..b95da10d7bdd 100644
--- a/lahaina-camera.dtsi
+++ b/lahaina-camera.dtsi
@@ -376,15 +376,17 @@
 				<&apps_smmu 0x840 0x440>,
 				<&apps_smmu 0xC00 0x440>,
 				<&apps_smmu 0xC40 0x440>;
-			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
+			qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
 			label = "ife", "ife-cdm";
 			multiple-client-devices;
 			ife_iova_mem_map: iova-mem-map {
-				/* IO region is approximately 3.4 GB */
+				/* IO region is approximately 4.0 GB */
 				iova-mem-region-io {
 					iova-region-name = "io";
-					iova-region-start = <0x7400000>;
-					iova-region-len = <0xd8c00000>;
+					/* 1 MB pad for start */
+					iova-region-start = <0x100000>;
+					/* 1 MB pad for end */
+					iova-region-len = <0xffe00000>;
 					iova-region-id = <0x3>;
 					status = "ok";
 				};
@@ -396,13 +398,15 @@
 			iommus = <&apps_smmu 0x2040 0x400>,
 				<&apps_smmu 0x2440 0x400>;
 			label = "jpeg";
-			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
+			qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
 			jpeg_iova_mem_map: iova-mem-map {
-				/* IO region is approximately 3.4 GB */
+				/* IO region is approximately 4.0 GB */
 				iova-mem-region-io {
 					iova-region-name = "io";
-					iova-region-start = <0x7400000>;
-					iova-region-len = <0xd8c00000>;
+					/* 1 MB pad for start */
+					iova-region-start = <0x100000>;
+					/* 1 MB pad for end */
+					iova-region-len = <0xffe00000>;
 					iova-region-id = <0x3>;
 					status = "ok";
 				};
@@ -489,13 +493,15 @@
 			iommus = <&apps_smmu 0x20C0 0x400>,
 				<&apps_smmu 0x24C0 0x400>;
 			label = "cpas-cdm";
-			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
+			qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
 			cpas_cdm_iova_mem_map: iova-mem-map {
 				iova-mem-region-io {
-					/* IO region is approximately 3.4 GB */
+					/* IO region is approximately 4.0 GB */
 					iova-region-name = "io";
-					iova-region-start = <0x7400000>;
-					iova-region-len = <0xd8c00000>;
+					/* 1 MB pad for start */
+					iova-region-start = <0x100000>;
+					/* 1 MB pad for end */
+					iova-region-len = <0xffe00000>;
 					iova-region-id = <0x3>;
 					status = "ok";
 				};