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

Commit df4bf2cc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I268fb5fb,Ic0cef477 into msm-next 

* changes:
  soc: qcom: pil: Remove unused variable
  soc: qcom: pil: Use the correct DMA attribute flag
parents cc1832ab 9b4437ee

drivers/soc/qcom/subsys-pil-tz.c

+1 −17
Original line number Diff line number Diff line
@@ -590,10 +590,6 @@ static int pil_init_image_trusted(struct pil_desc *pil, 
		const u8 *metadata, size_t size)

{

	struct pil_tz_data *d = desc_to_data(pil);

	struct pas_init_image_req {

		u32	proc;

		u32	image_addr;

	} request;

	u32 scm_ret = 0;

	void *mdata_buf;

	dma_addr_t mdata_phys;
@@ -612,7 +608,7 @@ static int pil_init_image_trusted(struct pil_desc *pil, 


	dev.coherent_dma_mask =

		DMA_BIT_MASK(sizeof(dma_addr_t) * 8);

	attrs |= DMA_ATTR_PRIVILEGED;

	attrs |= DMA_ATTR_STRONGLY_ORDERED;

	mdata_buf = dma_alloc_attrs(&dev, size, &mdata_phys, GFP_KERNEL,

					attrs);

	if (!mdata_buf) {
@@ -623,9 +619,6 @@ static int pil_init_image_trusted(struct pil_desc *pil, 


	memcpy(mdata_buf, metadata, size);



	request.proc = d->pas_id;

	request.image_addr = mdata_phys;



	desc.args[0] = d->pas_id;

	desc.args[1] = mdata_phys;

	desc.arginfo = SCM_ARGS(2, SCM_VAL, SCM_RW);
@@ -644,11 +637,6 @@ static int pil_mem_setup_trusted(struct pil_desc *pil, phys_addr_t addr, 
			       size_t size)

{

	struct pil_tz_data *d = desc_to_data(pil);

	struct pas_init_image_req {

		u32	proc;

		u32	start_addr;

		u32	len;

	} request;

	u32 scm_ret = 0;

	int ret;

	struct scm_desc desc = {0};
@@ -656,10 +644,6 @@ static int pil_mem_setup_trusted(struct pil_desc *pil, phys_addr_t addr, 
	if (d->subsys_desc.no_auth)

		return 0;



	request.proc = d->pas_id;

	request.start_addr = addr;

	request.len = size;



	desc.args[0] = d->pas_id;

	desc.args[1] = addr;

	desc.args[2] = size;