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

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



Let's use the new TZ memory allocator to obtain a buffer for this call
instead of manually kmalloc()ing it and then mapping to physical space.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Tested-by: default avatarMaximilian Luz <luzmaximilian@gmail.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-8-ce7afaa58d3a@linaro.org


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

drivers/firmware/qcom/qcom_scm.c

+4 −14
Original line number Diff line number Diff line
@@ -1559,37 +1559,27 @@ int qcom_scm_qseecom_app_get_id(const char *app_name, u32 *app_id) 
	unsigned long app_name_len = strlen(app_name);

	struct qcom_scm_desc desc = {};

	struct qcom_scm_qseecom_resp res = {};

	dma_addr_t name_buf_phys;

	char *name_buf;

	int status;



	if (app_name_len >= name_buf_size)

		return -EINVAL;



	name_buf = kzalloc(name_buf_size, GFP_KERNEL);

	char *name_buf __free(qcom_tzmem) = qcom_tzmem_alloc(__scm->mempool,

							     name_buf_size,

							     GFP_KERNEL);

	if (!name_buf)

		return -ENOMEM;



	memcpy(name_buf, app_name, app_name_len);



	name_buf_phys = dma_map_single(__scm->dev, name_buf, name_buf_size, DMA_TO_DEVICE);

	status = dma_mapping_error(__scm->dev, name_buf_phys);

	if (status) {

		kfree(name_buf);

		dev_err(__scm->dev, "qseecom: failed to map dma address\n");

		return status;

	}



	desc.owner = QSEECOM_TZ_OWNER_QSEE_OS;

	desc.svc = QSEECOM_TZ_SVC_APP_MGR;

	desc.cmd = QSEECOM_TZ_CMD_APP_LOOKUP;

	desc.arginfo = QCOM_SCM_ARGS(2, QCOM_SCM_RW, QCOM_SCM_VAL);

	desc.args[0] = name_buf_phys;

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

	desc.args[1] = app_name_len;



	status = qcom_scm_qseecom_call(&desc, &res);

	dma_unmap_single(__scm->dev, name_buf_phys, name_buf_size, DMA_TO_DEVICE);

	kfree(name_buf);



	if (status)

		return status;