firmware: qcom: scm: make qcom_scm_assign_mem() 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: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andrew 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: Elliot Berman <quic_eberman@quicinc.com>
Link: https://lore.kernel.org/r/20240527-shm-bridge-v10-5-ce7afaa58d3a@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 1e873e8016407a85a56f9fa93e760aa93da4f2b3..827985997a9c3ea18db07c3a8442c88db35ad88f 100644 (file)
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -6,6 +6,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/bitfield.h>
 #include <linux/bits.h>
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/completion.h>
 #include <linux/cpumask.h>
@@ -1018,14 +1019,13 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
        struct qcom_scm_mem_map_info *mem_to_map;
        phys_addr_t mem_to_map_phys;
        phys_addr_t dest_phys;
-       dma_addr_t ptr_phys;
+       phys_addr_t ptr_phys;
        size_t mem_to_map_sz;
        size_t dest_sz;
        size_t src_sz;
        size_t ptr_sz;
        int next_vm;
        __le32 *src;
-       void *ptr;
        int ret, i, b;
        u64 srcvm_bits = *srcvm;
 
@@ -1035,10 +1035,13 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
        ptr_sz = ALIGN(src_sz, SZ_64) + ALIGN(mem_to_map_sz, SZ_64) +
                        ALIGN(dest_sz, SZ_64);
 
-       ptr = dma_alloc_coherent(__scm->dev, ptr_sz, &ptr_phys, GFP_KERNEL);
+       void *ptr __free(qcom_tzmem) = qcom_tzmem_alloc(__scm->mempool,
+                                                       ptr_sz, GFP_KERNEL);
        if (!ptr)
                return -ENOMEM;
 
+       ptr_phys = qcom_tzmem_to_phys(ptr);
+
        /* Fill source vmid detail */
        src = ptr;
        i = 0;
@@ -1067,7 +1070,6 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
 
        ret = __qcom_scm_assign_mem(__scm->dev, mem_to_map_phys, mem_to_map_sz,
                                    ptr_phys, src_sz, dest_phys, dest_sz);
-       dma_free_coherent(__scm->dev, ptr_sz, ptr, ptr_phys);
        if (ret) {
                dev_err(__scm->dev,
                        "Assign memory protection call failed %d\n", ret);