From dbc80cc7efa2d816f8c3257f41138663516d4407 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Fri, 4 Oct 2019 10:34:05 -0700 Subject: [PATCH] Update ion_4.19.h with heap IDs system/core/libion/original-kernel-headers/linux/ion_4.19.h was edited manually and the following command was run to generate system/core/libion/ion_4.19.h bionic/libc/kernel/tools/clean_header.py -ksystem/core/libion/original-kernel-headers/linux ion_4.19.h > system/core/libion/ion_4.19.h Bug: 140916230 Test: make, ion-unit-tests Change-Id: I6b66bed7e3b11c5b7e80bb0b937d620510f0e172 --- libion/ion_4.19.h | 16 ++++++++ .../original-kernel-headers/linux/ion_4.19.h | 38 +++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/libion/ion_4.19.h b/libion/ion_4.19.h index cc6ea9edc..f5b59f1d7 100644 --- a/libion/ion_4.19.h +++ b/libion/ion_4.19.h @@ -21,6 +21,22 @@ #include #include #define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8) +enum ion_heap_type_ext { + ION_HEAP_TYPE_CUSTOM_EXT = 16, + ION_HEAP_TYPE_MAX = 31, +}; +enum ion_heap_id { + ION_HEAP_SYSTEM = (1 << ION_HEAP_TYPE_SYSTEM), + ION_HEAP_SYSTEM_CONTIG = (ION_HEAP_SYSTEM << 1), + ION_HEAP_CARVEOUT_START = (ION_HEAP_SYSTEM_CONTIG << 1), + ION_HEAP_CARVEOUT_END = (ION_HEAP_CARVEOUT_START << 4), + ION_HEAP_CHUNK = (ION_HEAP_CARVEOUT_END << 1), + ION_HEAP_DMA_START = (ION_HEAP_CHUNK << 1), + ION_HEAP_DMA_END = (ION_HEAP_DMA_START << 7), + ION_HEAP_CUSTOM_START = (ION_HEAP_DMA_END << 1), + ION_HEAP_CUSTOM_END = (ION_HEAP_CUSTOM_START << 15), +}; +#define ION_NUM_MAX_HEAPS (32) struct ion_new_allocation_data { __u64 len; __u32 heap_id_mask; diff --git a/libion/original-kernel-headers/linux/ion_4.19.h b/libion/original-kernel-headers/linux/ion_4.19.h index 5fdac0d13..75fef39ba 100644 --- a/libion/original-kernel-headers/linux/ion_4.19.h +++ b/libion/original-kernel-headers/linux/ion_4.19.h @@ -22,6 +22,44 @@ #define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8) +enum ion_heap_type_ext { + ION_HEAP_TYPE_CUSTOM_EXT = 16, + ION_HEAP_TYPE_MAX = 31, +}; + +/** + * ion_heap_id - list of standard heap ids that Android can use + * + * @ION_HEAP_SYSTEM Id for the ION_HEAP_TYPE_SYSTEM + * @ION_HEAP_SYSTEM_CONTIG Id for the ION_HEAP_TYPE_SYSTEM_CONTIG + * @ION_HEAP_CHUNK Id for the ION_HEAP_TYPE_CHUNK + * @ION_HEAP_CARVEOUT_START Start of reserved id range for heaps of type + * ION_HEAP_TYPE_CARVEOUT + * @ION_HEAP_CARVEOUT_END End of reserved id range for heaps of type + * ION_HEAP_TYPE_CARVEOUT + * @ION_HEAP_DMA_START Start of reserved id range for heaps of type + * ION_HEAP_TYPE_DMA + * @ION_HEAP_DMA_END End of reserved id range for heaps of type + * ION_HEAP_TYPE_DMA + * @ION_HEAP_CUSTOM_START Start of reserved id range for heaps of custom + * type + * @ION_HEAP_CUSTOM_END End of reserved id range for heaps of custom + * type + */ +enum ion_heap_id { + ION_HEAP_SYSTEM = (1 << ION_HEAP_TYPE_SYSTEM), + ION_HEAP_SYSTEM_CONTIG = (ION_HEAP_SYSTEM << 1), + ION_HEAP_CARVEOUT_START = (ION_HEAP_SYSTEM_CONTIG << 1), + ION_HEAP_CARVEOUT_END = (ION_HEAP_CARVEOUT_START << 4), + ION_HEAP_CHUNK = (ION_HEAP_CARVEOUT_END << 1), + ION_HEAP_DMA_START = (ION_HEAP_CHUNK << 1), + ION_HEAP_DMA_END = (ION_HEAP_DMA_START << 7), + ION_HEAP_CUSTOM_START = (ION_HEAP_DMA_END << 1), + ION_HEAP_CUSTOM_END = (ION_HEAP_CUSTOM_START << 15), +}; + +#define ION_NUM_MAX_HEAPS (32) + /** * DOC: Ion Userspace API *