From 6fdb0bb346018e3a2e7267a2cd39464aff4ab001 Mon Sep 17 00:00:00 2001 From: Soumen Ghosh Date: Wed, 17 Jan 2024 12:52:23 -0800 Subject: [PATCH] ARM: dts: msm: replace existing use of iommu-dma-addr-pool with iommu-addresses 'qcom,iommu-dma-addr-pool' describe the addresses which a device CAN use 'iommu-addresses' describes the addresses it CANNOT use. CRs-Fixed: 3697699 Change-Id: Ia0253d015073423ac50d0b4ace91278c7120f91f Signed-off-by: Soumen Ghosh --- sun-camera.dtsi | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/sun-camera.dtsi b/sun-camera.dtsi index 69a79d94..bd0431a4 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -1342,14 +1342,18 @@ #address-cells = <2>; #size-cells = <2>; - msm_cam_smmu_ife { + msm_cam_smmu_ife: msm_cam_smmu_ife { compatible = "qcom,msm-cam-smmu-cb"; iommus = <&apps_smmu 0x1C00 0x00>; - qcom,iommu-dma-addr-pool = <0x0 0x100000 0xf 0xffe00000>; qcom,iommu-faults = "stall-disable", "non-fatal"; dma-coherent; cam-smmu-label = "ife"; multiple-client-devices; + memory-region = <&cam_smmu_ife_resv_region>; + cam_smmu_ife_resv_region: cam_smmu_ife_resv_region { + iommu-addresses = <&msm_cam_smmu_ife 0x0 0x0 0x0 0x100000>, + <&msm_cam_smmu_ife 0xf 0xfff00000 0x0 0x100000>; + }; ife_iova_mem_map: iova-mem-map { /* IO region is approximately 64 GB */ iova-mem-region-io { @@ -1366,13 +1370,17 @@ }; }; - msm_cam_smmu_jpeg { + msm_cam_smmu_jpeg: msm_cam_smmu_jpeg { compatible = "qcom,msm-cam-smmu-cb"; iommus = <&apps_smmu 0x18A0 0x00>; cam-smmu-label = "jpeg"; qcom,iommu-faults = "stall-disable", "non-fatal"; - qcom,iommu-dma-addr-pool = <0x0 0x100000 0x0 0xffe00000>; dma-coherent; + memory-region = <&cam_smmu_jpeg_resv_region>; + cam_smmu_jpeg_resv_region: cam_smmu_jpeg_resv_region { + iommu-addresses = <&msm_cam_smmu_jpeg 0x0 0x0 0x0 0x100000>, + <&msm_cam_smmu_jpeg 0x0 0xfff00000 0xf 0x00100000>; + }; jpeg_iova_mem_map: iova-mem-map { /* IO region is approximately 4.0 GB */ iova-mem-region-io { @@ -1389,7 +1397,7 @@ }; }; - msm_cam_smmu_icp { + msm_cam_smmu_icp: msm_cam_smmu_icp { compatible = "qcom,msm-cam-smmu-cb"; iommus = <&apps_smmu 0x1820 0x00>, <&apps_smmu 0x1800 0xC0>, @@ -1398,10 +1406,12 @@ multiple-client-devices; multiple-same-region-clients = "icp", "icp1"; qcom,iommu-faults = "stall-disable", "non-fatal"; - qcom,iommu-dma-addr-pool = <0x0 0xf1400000 0xf 0x0ec00000>; dma-coherent; + memory-region = <&cam_smmu_icp_resv_region>; + cam_smmu_icp_resv_region: cam_smmu_icp_resv_region { + iommu-addresses = <&msm_cam_smmu_icp 0x0 0x0 0x0 0xf1400000>; + }; icp_iova_mem_map: iova-mem-map { - iova-mem-region-shared1 { /* Shared region is ~900MB long */ iova-region-name = "shared"; @@ -1545,14 +1555,18 @@ }; }; - msm_cam_smmu_cdm { + msm_cam_smmu_cdm: msm_cam_smmu_cdm { compatible = "qcom,msm-cam-smmu-cb"; iommus = <&apps_smmu 0x1860 0x00>; cam-smmu-label = "rt-cdm"; qcom,iommu-faults = "stall-disable", "non-fatal"; - qcom,iommu-dma-addr-pool = <0x0 0x100000 0x0 0xffe00000>; dma-coherent; multiple-client-devices; + memory-region = <&cam_smmu_cdm_resv_region>; + cam_smmu_cdm_resv_region: cam_smmu_cdm_resv_region { + iommu-addresses = <&msm_cam_smmu_cdm 0x0 0x0 0x0 0x100000>, + <&msm_cam_smmu_cdm 0x0 0xfff00000 0xf 0x00100000>; + }; rt_cdm_iova_mem_map: iova-mem-map { iova-mem-region-io { iova-region-name = "io";