Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce6ad38b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: dts: add secure nested cb for ife"

parents deb3497d c142784a

Documentation/devicetree/bindings/media/video/msm-cam-smmu.txt

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ Second Level Node - CAM SMMU context bank device or firmware device 
  Value type: boolean

  Definition: Specifies if the context bank is a secure context bank.



- qcom,secure-pixel-cb

  Usage: optional

  Value type: boolean

  Definition: Specifies if the context bank is a secure pixel context bank.



=============================================

Third Level Node - CAM SMMU memory map device

=============================================

arch/arm64/boot/dts/qcom/sa6155p-camera.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -46,6 +46,26 @@ 
	status = "disabled";

};



&cam_smmu {

	msm_cam_smmu_ife_cp {

		compatible = "qcom,msm-cam-smmu-cb";

		iommus = <&apps_smmu 0x821 0x1C0>,

			<&apps_smmu 0x841 0x0>,

			<&apps_smmu 0x861 0x1C0>;

		label = "ife-cp";

		qcom,secure-pixel-cb;

		ife_cp_iova_mem_map: iova-mem-map {

			/* IO region is approximately 2.5 GB */

			iova-mem-region-io {

				iova-region-name = "io";

				iova-region-start = <0x7400000>;

				iova-region-len = <0x98C00000>;

				iova-region-id = <0x3>;

				status = "ok";

			};

		};

	};

};



&soc {

	/delete-node/ cam_isp_mgr;

arch/arm64/boot/dts/qcom/sa8155-camera.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -62,6 +62,31 @@ 
	status = "disabled";

};



&cam_smmu {

	msm_cam_smmu_ife_cp {

		compatible = "qcom,msm-cam-smmu-cb";

		iommus = <&apps_smmu 0x841 0x620>,

			<&apps_smmu 0x861 0x620>,

			<&apps_smmu 0xA41 0x620>,

			<&apps_smmu 0xA61 0x620>,

			<&apps_smmu 0xC41 0x620>,

			<&apps_smmu 0xC61 0x620>,

			<&apps_smmu 0xE41 0x620>,

			<&apps_smmu 0xE61 0x620>;

		label = "ife-cp";

		qcom,secure-pixel-cb;

		ife_cp_iova_mem_map: iova-mem-map {

			/* IO region is approximately 2.5 GB */

			iova-mem-region-io {

				iova-region-name = "io";

				iova-region-start = <0x7400000>;

				iova-region-len = <0x98C00000>;

				iova-region-id = <0x3>;

				status = "ok";

			};

		};

	};

};



&soc {

	/delete-node/ cam_isp_mgr;

arch/arm64/boot/dts/qcom/sa8195p-camera.dtsi

+45 −5
Original line number Diff line number Diff line
@@ -532,14 +532,22 @@ 


		msm_cam_smmu_ife {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_smmu 0xAA0 0x4E0>,

				<&apps_smmu 0xA20 0x4E0>,

				<&apps_smmu 0xA00 0x4E0>,

			iommus = <&apps_smmu 0xA00 0x4E0>,

				<&apps_smmu 0xAA0 0x4E0>,

				<&apps_smmu 0xA40 0x4E0>,

				<&apps_smmu 0xA60 0x4E0>,

				<&apps_smmu 0xA80 0x4E0>,

				<&apps_smmu 0xA20 0x4E0>,

				<&apps_smmu 0xAC0 0x4E0>,

				<&apps_smmu 0xAE0 0x4E0>,

				<&apps_smmu 0xE00 0x4E0>,

				<&apps_smmu 0xEA0 0x4E0>,

				<&apps_smmu 0xE40 0x4E0>,

				<&apps_smmu 0xE60 0x4E0>,

				<&apps_smmu 0xE80 0x4E0>,

				<&apps_smmu 0xE20 0x4E0>,

				<&apps_smmu 0xE00 0x4E0>,

				<&apps_smmu 0xE80 0x4E0>;

				<&apps_smmu 0xEC0 0x4E0>,

				<&apps_smmu 0xEE0 0x4E0>;

			label = "ife";

			ife_iova_mem_map: iova-mem-map {

				/* IO region is approximately 3.4 GB */
@@ -553,6 +561,38 @@ 
			};

		};



		msm_cam_smmu_ife_cp {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_smmu 0xA01 0x5E0>,

				<&apps_smmu 0xAA1 0x5E0>,

				<&apps_smmu 0xA41 0x5E0>,

				<&apps_smmu 0xA61 0x5E0>,

				<&apps_smmu 0xA81 0x5E0>,

				<&apps_smmu 0xA21 0x5E0>,

				<&apps_smmu 0xAC1 0x5E0>,

				<&apps_smmu 0xAE1 0x5E0>,

				<&apps_smmu 0xE01 0x5E0>,

				<&apps_smmu 0xEA1 0x5E0>,

				<&apps_smmu 0xE41 0x5E0>,

				<&apps_smmu 0xE61 0x5E0>,

				<&apps_smmu 0xE81 0x5E0>,

				<&apps_smmu 0xE21 0x5E0>,

				<&apps_smmu 0xEC1 0x5E0>,

				<&apps_smmu 0xEE1 0x5E0>;

			label = "ife-cp";

			qcom,secure-pixel-cb;

			ife_cp_iova_mem_map: iova-mem-map {

				/* IO region is approximately 2.5 GB */

				iova-mem-region-io {

					iova-region-name = "io";

					iova-region-start = <0x7400000>;

					iova-region-len = <0x98C00000>;

					iova-region-id = <0x3>;

					status = "ok";

				};

			};

		};



		msm_cam_smmu_jpeg {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_smmu 0x2100 0x20>,

arch/arm64/boot/dts/qcom/sm6150-camera.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ 
		};

	};



	qcom,cam_smmu {

	cam_smmu: qcom,cam_smmu {

		compatible = "qcom,msm-cam-smmu";

		status = "ok";