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

Commit 3db0db56 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support for new Qseecom_ta ion heap for sdm845"

parents 90992d0b c5fff414

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

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ 
			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@19 { /* QSEECOM TA HEAP */

			reg = <19>;

			memory-region = <&qseecom_ta_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@13 { /* SECURE SPSS HEAP */

			reg = <13>;

			memory-region = <&secure_sp_mem>;

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

+8 −0
Original line number Diff line number Diff line
@@ -603,6 +603,14 @@ 
			size = <0 0x1400000>;

		};



		qseecom_ta_mem: qseecom_ta_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0 0x00000000 0 0xffffffff>;

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x1000000>;

		};



		secure_sp_mem: secure_sp_region { /* SPSS-HLOS ION shared mem */

			compatible = "shared-dma-pool";

			alloc-ranges = <0 0x00000000 0 0xffffffff>; /* 32-bit */

drivers/staging/android/ion/msm/msm_ion.c

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ static struct ion_heap_desc ion_heap_meta[] = { 
		.id	= ION_QSECOM_HEAP_ID,

		.name	= ION_QSECOM_HEAP_NAME,

	},

	{

		.id	= ION_QSECOM_TA_HEAP_ID,

		.name	= ION_QSECOM_TA_HEAP_NAME,

	},

	{

		.id	= ION_SPSS_HEAP_ID,

		.name	= ION_SPSS_HEAP_NAME,

drivers/staging/android/uapi/msm_ion.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ enum ion_heap_ids { 
	ION_CP_MFC_HEAP_ID = 12,

	ION_SPSS_HEAP_ID = 13, /* Secure Processor ION heap */

	ION_CP_WB_HEAP_ID = 16, /* 8660 only */

	ION_QSECOM_TA_HEAP_ID = 19,

	ION_CAMERA_HEAP_ID = 20, /* 8660 only */

	ION_SYSTEM_CONTIG_HEAP_ID = 21,

	ION_ADSP_HEAP_ID = 22,
@@ -130,6 +131,7 @@ enum cp_mem_usage { 
#define ION_PIL1_HEAP_NAME  "pil_1"

#define ION_PIL2_HEAP_NAME  "pil_2"

#define ION_QSECOM_HEAP_NAME	"qsecom"

#define ION_QSECOM_TA_HEAP_NAME	"qsecom_ta"

#define ION_SECURE_HEAP_NAME	"secure_heap"

#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"