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

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

Merge "qcom: subsys-pil-tz: Add device pointer to call for allocating DMA memory"

parents b507a4e6 fad8bdb6

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

+2 −2
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static int pil_init_image_trusted(struct pil_desc *pil, 
		return ret;



	dma_set_attr(DMA_ATTR_STRONGLY_ORDERED, &attrs);

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

	mdata_buf = dma_alloc_attrs(pil->dev, size, &mdata_phys, GFP_KERNEL,

					&attrs);

	if (!mdata_buf) {

		pr_err("scm-pas: Allocation for metadata failed.\n");
@@ -601,7 +601,7 @@ static int pil_init_image_trusted(struct pil_desc *pil, 
	ret = scm_call(SCM_SVC_PIL, PAS_INIT_IMAGE_CMD, &request,

			sizeof(request), &scm_ret, sizeof(scm_ret));



	dma_free_attrs(NULL, size, mdata_buf, mdata_phys, &attrs);

	dma_free_attrs(pil->dev, size, mdata_buf, mdata_phys, &attrs);

	scm_pas_disable_bw();

	if (ret)

		return ret;