On Mon, Oct 09, 2023 at 05:34:21PM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
>
> Let's use the new TZ memory allocator to obtain a buffer for this call
> instead of using dma_alloc_coherent().
>
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
Reviewed-by: Andrew Halaney <ahalaney@xxxxxxxxxx>
> ---
> drivers/firmware/qcom/qcom_scm.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
> index 31071a714cf1..11638daa2fe5 100644
> --- a/drivers/firmware/qcom/qcom_scm.c
> +++ b/drivers/firmware/qcom/qcom_scm.c
> @@ -1340,8 +1340,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 = {
> @@ -1356,7 +1354,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;
>
> @@ -1366,11 +1366,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);
> --
> 2.39.2
>
