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

Commit 92c993fd authored by Vidyakumar Athota's avatar Vidyakumar Athota
Browse files

soc: qcom: qdsp6v2: use hyp_assign() API for secure memory 



Add a new API to call hyp_assign_phys() function to assign the
memory permissions to different subsystem like ADSP for secure
playback applications.

Change-Id: I1d13bd0cd3b5cdcbe37488800c7dad44a20f4996
Signed-off-by: default avatarVidyakumar Athota <vathota@codeaurora.org>
parent d843c02a

drivers/soc/qcom/qdsp6v2/msm_audio_ion.c

+83 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -29,6 +29,7 @@ 
#include <linux/export.h>

#include <linux/qcom_iommu.h>

#include <asm/dma-iommu.h>

#include <soc/qcom/secure_buffer.h>



#define MSM_AUDIO_ION_PROBED (1 << 0)
@@ -178,6 +179,87 @@ err: 
}

EXPORT_SYMBOL(msm_audio_ion_alloc);



static int msm_audio_hyp_assign(ion_phys_addr_t *paddr, size_t *pa_len,

				u8 assign_type)

{

	int srcVM[1] = {VMID_HLOS};

	int destVM[1] = {VMID_CP_ADSP_SHARED};

	int destVMperm[1] = {PERM_READ | PERM_WRITE | PERM_EXEC};

	int ret = 0;



	switch (assign_type) {

	case HLOS_TO_ADSP:

		srcVM[0] = VMID_HLOS;

		destVM[0] = VMID_CP_ADSP_SHARED;

		break;

	case ADSP_TO_HLOS:

		srcVM[0] = VMID_CP_ADSP_SHARED;

		destVM[0] = VMID_HLOS;

		break;

	default:

		pr_err("%s: Invalid assign type = %d\n", __func__, assign_type);

		ret = -EINVAL;

		goto done;

	}



	ret = hyp_assign_phys(*paddr, *pa_len, srcVM, 1, destVM, destVMperm, 1);

	if (ret)

		pr_err("%s: hyp_assign_phys failed for type %d, rc = %d\n",

			 __func__, assign_type, ret);

done:

	return ret;

}



int msm_audio_ion_phys_assign(const char *name, int fd, ion_phys_addr_t *paddr,

			      size_t *pa_len, u8 assign_type)

{

	struct ion_client *client;

	struct ion_handle *handle;

	int ret;



	if (!(msm_audio_ion_data.device_status & MSM_AUDIO_ION_PROBED)) {

		pr_debug("%s:probe is not done, deferred\n", __func__);

		return -EPROBE_DEFER;

	}



	if (!name || !paddr || !pa_len) {

		pr_err("%s: Invalid params\n", __func__);

		return -EINVAL;

	}



	client = msm_audio_ion_client_create(name);

	if (IS_ERR_OR_NULL((void *)(client))) {

		pr_err("%s: ION create client failed\n", __func__);

		return -EINVAL;

	}



	handle = ion_import_dma_buf(client, fd);

	if (IS_ERR_OR_NULL((void *) (handle))) {

		pr_err("%s: ion import dma buffer failed\n",

			__func__);

		ret = -EINVAL;

		goto err_destroy_client;

	}



	ret = ion_phys(client, handle, paddr, pa_len);

	if (ret) {

		pr_err("%s: could not get physical address for handle, ret = %d\n",

			__func__, ret);

		goto err_ion_handle;

	}

	pr_debug("%s: ION Physical address is %x\n", __func__, (u32)*paddr);



	ret = msm_audio_hyp_assign(paddr, pa_len, assign_type);



err_ion_handle:

	ion_free(client, handle);



err_destroy_client:

	ion_client_destroy(client);



	return ret;

}



int msm_audio_ion_import(const char *name, struct ion_client **client,

			struct ion_handle **handle, int fd,

			unsigned long *ionflag, size_t bufsz,

include/linux/msm_audio_ion.h

+11 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2015, 2017 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,6 +17,12 @@ 
#include <sound/pcm.h>

#include <linux/msm_ion.h>



enum {

	HLOS_TO_ADSP = 1,

	ADSP_TO_HLOS,

};



#define VMID_CP_ADSP_SHARED 33



int msm_audio_ion_alloc(const char *name, struct ion_client **client,

			struct ion_handle **handle, size_t bufsz,
@@ -26,6 +32,7 @@ int msm_audio_ion_import(const char *name, struct ion_client **client, 
			struct ion_handle **handle, int fd,

			unsigned long *ionflag, size_t bufsz,

			ion_phys_addr_t *paddr, size_t *pa_len, void **vaddr);



int msm_audio_ion_free(struct ion_client *client, struct ion_handle *handle);

int msm_audio_ion_mmap(struct audio_buffer *substream,

		       struct vm_area_struct *vma);
@@ -42,4 +49,7 @@ int msm_audio_ion_import_legacy(const char *name, struct ion_client *client, 
int msm_audio_ion_free_legacy(struct ion_client *client,

			struct ion_handle *handle);

u32 msm_audio_populate_upper_32_bits(ion_phys_addr_t pa);



int msm_audio_ion_phys_assign(const char *name, int fd, ion_phys_addr_t *paddr,

				size_t *pa_len, u8 assign_type);

#endif /* _LINUX_MSM_AUDIO_ION_H */