Merge "ARM: dts: msm: Add ion secure carveout for sm6150" (b0089e4c) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,15 @@
	qcom,ion-heap-type = "HYP_CMA";		qcom,ion-heap-type = "HYP_CMA";
	};		};

			qcom,ion-heap@14 { /* SECURE CARVEOUT HEAP */
			reg = <14>;
			qcom,ion-heap-type = "SECURE_CARVEOUT";
			cdsp {
			memory-region = <&cdsp_sec_mem>;
			token = <0x20000000>;
			};
			};

	qcom,ion-heap@9 {		qcom,ion-heap@9 {
	reg = <9>;		reg = <9>;
	qcom,ion-heap-type = "SYSTEM_SECURE";		qcom,ion-heap-type = "SYSTEM_SECURE";

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

+16 −10

Original line number	Original line	Diff line number	Diff line
	@@ -511,7 +511,7 @@
	xbl_aop_mem: xbl_aop_mem@85e00000 {		xbl_aop_mem: xbl_aop_mem@85e00000 {
	compatible = "removed-dma-pool";		compatible = "removed-dma-pool";
	no-map;		no-map;
	reg = <0x0 0x85e00000 0x0 0x1ff000>;		reg = <0x0 0x85e00000 0x0 0x140000>;
	};		};

	sec_apps_mem: sec_apps_region@85fff000 {		sec_apps_mem: sec_apps_region@85fff000 {
	@@ -559,31 +559,31 @@
	pil_cdsp_mem: cdsp_regions@93400000 {		pil_cdsp_mem: cdsp_regions@93400000 {
	compatible = "removed-dma-pool";		compatible = "removed-dma-pool";
	no-map;		no-map;
	reg = <0 0x93400000 0 0x800000>;		reg = <0 0x93400000 0 0x1e00000>;
	};		};

	pil_adsp_mem: pil_adsp_region@93c00000 {		pil_adsp_mem: pil_adsp_region@95200000 {
	compatible = "removed-dma-pool";		compatible = "removed-dma-pool";
	no-map;		no-map;
	reg = <0 0x93c00000 0 0x1e00000>;		reg = <0 0x95200000 0 0x1e00000>;
	};		};

	pil_ipa_fw_mem: ips_fw_region@0x95a00000 {		pil_ipa_fw_mem: ips_fw_region@0x97000000 {
	compatible = "removed-dma-pool";		compatible = "removed-dma-pool";
	no-map;		no-map;
	reg = <0 0x95a00000 0 0x10000>;		reg = <0 0x97000000 0 0x10000>;
	};		};

	pil_ipa_gsi_mem: ipa_gsi_region@0x95a10000 {		pil_ipa_gsi_mem: ipa_gsi_region@0x97010000 {
	compatible = "removed-dma-pool";		compatible = "removed-dma-pool";
	no-map;		no-map;
	reg = <0 0x95a10000 0 0x5000>;		reg = <0 0x97010000 0 0x5000>;
	};		};

	pil_gpu_mem: gpu_region@0x95a15000 {		pil_gpu_mem: gpu_region@0x97015000 {
	compatible = "removed-dma-pool";		compatible = "removed-dma-pool";
	no-map;		no-map;
	reg = <0 0x95a15000 0 0x2000>;		reg = <0 0x97015000 0 0x2000>;
	};		};

	qseecom_mem: qseecom_region@0x9e400000 {		qseecom_mem: qseecom_region@0x9e400000 {
	@@ -592,6 +592,12 @@
	reg = <0 0x9e400000 0 0x1400000>;		reg = <0 0x9e400000 0 0x1400000>;
	};		};

			cdsp_sec_mem: cdsp_sec_regions@0x9f800000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x9f800000 0x0 0xc00000>;
			};

	adsp_mem: adsp_region {		adsp_mem: adsp_region {
	compatible = "shared-dma-pool";		compatible = "shared-dma-pool";
	alloc-ranges = <0 0x00000000 0 0xffffffff>;		alloc-ranges = <0 0x00000000 0 0xffffffff>;