diff options
| author | Amir Samuelov <amirs@codeaurora.org> | 2016-05-29 08:59:42 +0300 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-05-31 15:23:16 -0700 |
| commit | eaee620aa28e718a9eabe642b2249764f2d86614 (patch) | |
| tree | f8756e91c90849d8c5a6331f4e2e749f1aacac71 | |
| parent | a45a1c4c7803b1046701f31a2d9592af9d8ad5d8 (diff) | |
ion: msm: add Secure Processor heap id
The Secure Processor Subsystem (SPSS) shall use its own ION heap
for allocation of memory shared between HLOS Applications
and SPSS Applications.
Change-Id: I4345d14dc22ddbdc34ff98b7b16719ba760951df
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
| -rw-r--r-- | drivers/staging/android/ion/msm/msm_ion.c | 4 | ||||
| -rw-r--r-- | drivers/staging/android/uapi/msm_ion.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/staging/android/ion/msm/msm_ion.c b/drivers/staging/android/ion/msm/msm_ion.c index 7967dc41309e..49b5270e5162 100644 --- a/drivers/staging/android/ion/msm/msm_ion.c +++ b/drivers/staging/android/ion/msm/msm_ion.c @@ -89,6 +89,10 @@ static struct ion_heap_desc ion_heap_meta[] = { .name = ION_QSECOM_HEAP_NAME, }, { + .id = ION_SPSS_HEAP_ID, + .name = ION_SPSS_HEAP_NAME, + }, + { .id = ION_AUDIO_HEAP_ID, .name = ION_AUDIO_HEAP_NAME, }, diff --git a/drivers/staging/android/uapi/msm_ion.h b/drivers/staging/android/uapi/msm_ion.h index 5baef3fae322..73b4d1edcaad 100644 --- a/drivers/staging/android/uapi/msm_ion.h +++ b/drivers/staging/android/uapi/msm_ion.h @@ -29,6 +29,7 @@ enum ion_heap_ids { ION_SECURE_HEAP_ID = 9, ION_SECURE_DISPLAY_HEAP_ID = 10, ION_CP_MFC_HEAP_ID = 12, + ION_SPSS_HEAP_ID = 13, /* Secure Processor ION heap */ ION_CP_WB_HEAP_ID = 16, /* 8660 only */ ION_CAMERA_HEAP_ID = 20, /* 8660 only */ ION_SYSTEM_CONTIG_HEAP_ID = 21, @@ -52,6 +53,8 @@ enum ion_heap_ids { #define ION_IOMMU_HEAP_ID ION_SYSTEM_HEAP_ID #define ION_HEAP_TYPE_IOMMU ION_HEAP_TYPE_SYSTEM +#define ION_SPSS_HEAP_ID ION_SPSS_HEAP_ID + enum ion_fixed_position { NOT_FIXED, FIXED_LOW, @@ -130,6 +133,7 @@ enum cp_mem_usage { #define ION_CAMERA_HEAP_NAME "camera_preview" #define ION_IOMMU_HEAP_NAME "iommu" #define ION_MFC_HEAP_NAME "mfc" +#define ION_SPSS_HEAP_NAME "spss" #define ION_WB_HEAP_NAME "wb" #define ION_MM_FIRMWARE_HEAP_NAME "mm_fw" #define ION_PIL1_HEAP_NAME "pil_1" |