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

Commit 9261aacb authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mem-buf: Replace *_TRUSTED_UI with *_TRUSTED_VM"

parents c8879e20 5a2d1abc

drivers/soc/qcom/mem-buf.c

+17 −7
Original line number Diff line number Diff line
@@ -1101,8 +1101,8 @@ static int mem_buf_remove_mem(struct mem_buf_desc *membuf) 


static bool is_valid_mem_buf_vmid(u32 mem_buf_vmid)

{

	if ((mem_buf_vmid == MEM_BUF_VMID_HLOS) ||

	    (mem_buf_vmid == MEM_BUF_VMID_TRUSTED_UI))

	if ((mem_buf_vmid == MEM_BUF_VMID_PRIMARY_VM) ||

	    (mem_buf_vmid == MEM_BUF_VMID_TRUSTED_VM))

		return true;



	return false;
@@ -1115,11 +1115,21 @@ static bool is_valid_mem_buf_perms(u32 mem_buf_perms) 


static int mem_buf_vmid_to_vmid(u32 mem_buf_vmid)

{

	if (mem_buf_vmid == MEM_BUF_VMID_HLOS)

		return VMID_HLOS;

	else if (mem_buf_vmid == MEM_BUF_VMID_TRUSTED_UI)

		return VMID_TRUSTED_UI;

	int ret;

	hh_vmid_t vmid;

	enum hh_vm_names vm_name;



	if (mem_buf_vmid == MEM_BUF_VMID_PRIMARY_VM)

		vm_name = HH_PRIMARY_VM;

	else if (mem_buf_vmid == MEM_BUF_VMID_TRUSTED_VM)

		vm_name = HH_TRUSTED_VM;

	else

		return -EINVAL;



	ret = hh_rm_get_vmid(vm_name, &vmid);

	if (!ret)

		return vmid;

	return ret;

}



static int mem_buf_perms_to_perms(u32 mem_buf_perms)

drivers/soc/qcom/secure_buffer.c

+0 −2
Original line number Diff line number Diff line
@@ -280,8 +280,6 @@ const char *msm_secure_vmid_to_string(int secure_vmid) 
		return "VMID_CP_SPSS_SP_SHARED";

	case VMID_CP_SPSS_HLOS_SHARED:

		return "VMID_CP_SPSS_HLOS_SHARED";

	case VMID_TRUSTED_UI:

		return "VMID_TRUSTED_UI";

	case VMID_INVAL:

		return "VMID_INVAL";

	default:

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

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 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) {

	if (flags & ION_FLAG_CP_TRUSTED_VM) {

		ret = hh_rm_get_vmid(HH_TRUSTED_VM, &vmid);

		if (!ret)

			return vmid;
@@ -103,7 +103,7 @@ int get_ion_flags(u32 vmid) 


	ret = hh_rm_get_vmid(HH_TRUSTED_VM, &trusted_vm_vmid);

	if (!ret && vmid == trusted_vm_vmid)

		return ION_FLAG_CP_TRUSTED_UI;

		return ION_FLAG_CP_TRUSTED_VM;

	return -EINVAL;

}

EXPORT_SYMBOL(get_ion_flags);

include/soc/qcom/secure_buffer.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ enum vmid { 
	VMID_CP_SPSS_SP_SHARED = 0x22,

	VMID_CP_SPSS_HLOS_SHARED = 0x24,

	VMID_CP_CDSP = 0x2A,

	VMID_TRUSTED_UI = 0x31,

	VMID_LAST,

	VMID_INVAL = -1

};

include/uapi/linux/mem-buf.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ enum mem_buf_mem_type { 
};



/* The mem-buf values that represent VMIDs for an ACL. */

#define MEM_BUF_VMID_HLOS 0

#define	MEM_BUF_VMID_TRUSTED_UI 1

#define MEM_BUF_VMID_PRIMARY_VM 0

#define	MEM_BUF_VMID_TRUSTED_VM 1



#define MEM_BUF_PERM_FLAG_READ (1U << 0)

#define MEM_BUF_PERM_FLAG_WRITE (1U << 1)