Commit d7e23490 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Bjorn Andersson
Browse files

firmware: qcom: scm: make qcom_scm_lmh_dcvsh() use the TZ allocator 



Let's use the new TZ memory allocator to obtain a buffer for this call
instead of using dma_alloc_coherent().

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Tested-by: Andrew Halaney <ahalaney@redhat.com> # sc8280xp-lenovo-thinkpad-x13s
Tested-by: Deepti Jaggi <quic_djaggi@quicinc.com> #sa8775p-ride
Reviewed-by: default avatarElliot Berman <quic_eberman@quicinc.com>
Link: https://lore.kernel.org/r/20240527-shm-bridge-v10-7-ce7afaa58d3a@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent ab690269

drivers/firmware/qcom/qcom_scm.c

+4 −5
Original line number Diff line number Diff line
@@ -1360,8 +1360,6 @@ EXPORT_SYMBOL_GPL(qcom_scm_lmh_profile_change); 
int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val,

		       u64 limit_node, u32 node_id, u64 version)

{

	dma_addr_t payload_phys;

	u32 *payload_buf;

	int ret, payload_size = 5 * sizeof(u32);



	struct qcom_scm_desc desc = {
@@ -1376,7 +1374,9 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val, 
		.owner = ARM_SMCCC_OWNER_SIP,

	};



	payload_buf = dma_alloc_coherent(__scm->dev, payload_size, &payload_phys, GFP_KERNEL);

	u32 *payload_buf __free(qcom_tzmem) = qcom_tzmem_alloc(__scm->mempool,

							       payload_size,

							       GFP_KERNEL);

	if (!payload_buf)

		return -ENOMEM;
@@ -1386,11 +1386,10 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val, 
	payload_buf[3] = 1;

	payload_buf[4] = payload_val;



	desc.args[0] = payload_phys;

	desc.args[0] = qcom_tzmem_to_phys(payload_buf);



	ret = qcom_scm_call(__scm->dev, &desc, NULL);



	dma_free_coherent(__scm->dev, payload_size, payload_buf, payload_phys);

	return ret;

}

EXPORT_SYMBOL_GPL(qcom_scm_lmh_dcvsh);