ion: Update the system heap type to MSM_SYSTEM and update sys heap ID

In preparation for restoring the GKI system heap, move the existing
system heap into the vendor heap space, leaving the GKI system heap
ID slot empty. For now, alias allocations targeted at ION_HEAP_SYSTEM to
ION_SYSTEM_HEAP_ID until all clients have migrated. Once that
happens, we can remove the aliasing.

Change-Id: Ib1bd74c2a54ebfdcb14da2b04f237ae1b88db189
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
This commit is contained in:
Isaac J. Manjarres 2020-06-25 22:55:52 -07:00
commit 149000cb21
5 changed files with 24 additions and 7 deletions

View file

@ -22,6 +22,7 @@ enum msm_ion_heap_types {
ION_HEAP_TYPE_HYP_CMA,
ION_HEAP_TYPE_MSM_CARVEOUT,
ION_HEAP_TYPE_SECURE_CARVEOUT,
ION_HEAP_TYPE_MSM_SYSTEM,
};
/**

View file

@ -16,7 +16,7 @@
* possible fallbacks)
*/
#define ION_SYSTEM_HEAP_ID ION_BIT(0)
/* ION_BIT(0) is reserved for the generic system heap. */
#define ION_QSECOM_TA_HEAP_ID ION_BIT(1)
#define ION_CAMERA_HEAP_ID ION_BIT(2)
#define ION_DISPLAY_HEAP_ID ION_BIT(3)
@ -31,6 +31,7 @@
#define ION_SPSS_HEAP_ID ION_BIT(14)
#define ION_SECURE_CARVEOUT_HEAP_ID ION_BIT(15)
#define ION_TUI_CARVEOUT_HEAP_ID ION_BIT(16)
#define ION_SYSTEM_HEAP_ID ION_BIT(25)
#define ION_HEAP_ID_RESERVED ION_BIT(31)
#endif /* _MSM_ION_IDS_H */