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

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

ion: Add support for dynamically assigned VMIDs 



The ION trusted VM flag may map to a VMID that was dynamically
assigned, instead of statically allocated. Thus, use the RM driver
APIs to determine the VMID for the trusted VM.

Change-Id: Ide4dd77a4cedbdf7e32f3c834fef9a0dfc6ba9d5
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent 4b38a935

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

+24 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/haven/hh_rm_drv.h>

#include <linux/slab.h>

#include <soc/qcom/secure_buffer.h>

#include "ion_secure_util.h"
@@ -10,6 +11,11 @@ 


bool is_secure_vmid_valid(int vmid)

{

	int ret;

	hh_vmid_t trusted_vm_vmid;



	ret = hh_rm_get_vmid(HH_TRUSTED_VM, &trusted_vm_vmid);



	return (vmid == VMID_CP_TOUCH ||

		vmid == VMID_CP_BITSTREAM ||

		vmid == VMID_CP_PIXEL ||
@@ -22,11 +28,14 @@ bool is_secure_vmid_valid(int vmid) 
		vmid == VMID_CP_SPSS_SP_SHARED ||

		vmid == VMID_CP_SPSS_HLOS_SHARED ||

		vmid == VMID_CP_CDSP ||

		vmid == VMID_TRUSTED_UI);

		(!ret && vmid == trusted_vm_vmid));

}



int get_secure_vmid(unsigned long flags)

{

	int ret;

	hh_vmid_t vmid;



	if (flags & ION_FLAG_CP_TOUCH)

		return VMID_CP_TOUCH;

	if (flags & ION_FLAG_CP_BITSTREAM)
@@ -51,13 +60,20 @@ int get_secure_vmid(unsigned long flags) 
		return VMID_CP_SPSS_HLOS_SHARED;

	if (flags & ION_FLAG_CP_CDSP)

		return VMID_CP_CDSP;

	if (flags & ION_FLAG_CP_TRUSTED_UI)

		return VMID_TRUSTED_UI;

	if (flags & ION_FLAG_CP_TRUSTED_UI) {

		ret = hh_rm_get_vmid(HH_TRUSTED_VM, &vmid);

		if (!ret)

			return vmid;

		return ret;

	}

	return -EINVAL;

}



int get_ion_flags(u32 vmid)

{

	int ret;

	hh_vmid_t trusted_vm_vmid;



	if (vmid == VMID_CP_TOUCH)

		return ION_FLAG_CP_TOUCH;

	if (vmid == VMID_CP_BITSTREAM)
@@ -68,6 +84,8 @@ int get_ion_flags(u32 vmid) 
		return ION_FLAG_CP_NON_PIXEL;

	if (vmid == VMID_CP_CAMERA)

		return ION_FLAG_CP_CAMERA;

	if (vmid == VMID_HLOS)

		return ION_FLAG_CP_HLOS;

	if (vmid == VMID_CP_SEC_DISPLAY)

		return ION_FLAG_CP_SEC_DISPLAY;

	if (vmid == VMID_CP_APP)
@@ -82,7 +100,9 @@ int get_ion_flags(u32 vmid) 
		return ION_FLAG_CP_SPSS_HLOS_SHARED;

	if (vmid == VMID_CP_CDSP)

		return ION_FLAG_CP_CDSP;

	if (vmid == VMID_TRUSTED_UI)



	ret = hh_rm_get_vmid(HH_TRUSTED_VM, &trusted_vm_vmid);

	if (!ret && vmid == trusted_vm_vmid)

		return ION_FLAG_CP_TRUSTED_UI;

	return -EINVAL;

}