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

Commit a2b9b167 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

ion: msm: Add support for the Trusted UI(TUI) dynamic carveout heap 



Add support to allow usage of memory from the TUI dynamic carveout
heap.

Change-Id: I585b68215f2f5e8ab114f1c83c19b3bc77a65845
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent d8ff5977

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

+5 −1
Original line number Diff line number Diff line
@@ -78,7 +78,11 @@ static struct ion_heap_desc ion_heap_meta[] = { 
	{

		.id	= ION_SECURE_CARVEOUT_HEAP_ID,

		.name	= ION_SECURE_CARVEOUT_HEAP_NAME,

	}

	},

	{

		.id	= ION_TUI_CARVEOUT_HEAP_ID,

		.name	= ION_TUI_CARVEOUT_HEAP_NAME,

	},

};



#define MAKE_HEAP_TYPE_MAPPING(h) { .name = #h, \

drivers/staging/android/ion/heaps/msm_ion_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#define ION_SECURE_HEAP_NAME	"secure_heap"

#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"

#define ION_AUDIO_HEAP_NAME    "audio"

#define ION_TUI_CARVEOUT_HEAP_NAME "tui_carveout"



/**

 * Debug feature. Make ION allocations DMA

include/uapi/linux/msm_ion_ids.h

+2 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 */

#ifndef _MSM_ION_IDS_H

#define _MSM_ION_IDS_H
@@ -17,6 +17,7 @@ 
 */



#define ION_SYSTEM_HEAP_ID		ION_BIT(0)

#define ION_TUI_CARVEOUT_HEAP_ID	ION_BIT(2)

#define ION_QSECOM_TA_HEAP_ID		ION_BIT(8)

#define ION_CAMERA_HEAP_ID		ION_BIT(9)

#define ION_ADSP_HEAP_ID		ION_BIT(11)