firmware: qcom_scm: Use fixed width src vm bitmap

[ Upstream commit 968a26a07f75377afbd4f7bb18ef587a1443c244 ]

The maximum VMID for assign_mem is 63. Use a u64 to represent this
bitmap instead of architecture-dependent "unsigned int" which varies in
size on 32-bit and 64-bit platforms.

Acked-by: Kalle Valo <kvalo@kernel.org> (ath10k)
Tested-by: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230213181832.3489174-1-quic_eberman@quicinc.com
Stable-dep-of: a6e766dea0a2 ("misc: fastrpc: Pass proper scm arguments for secure map request")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index 5f281cb1ae6ba4dd4756bd760779e1ec28cbe06a..75cf3556b99a156e8d149c60f089fecd121fff6b 100644 (file)
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -905,7 +905,7 @@ static int __qcom_scm_assign_mem(struct device *dev, phys_addr_t mem_region,
  * Return negative errno on failure or 0 on success with @srcvm updated.
  */
 int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
-                       unsigned int *srcvm,
+                       u64 *srcvm,
                        const struct qcom_scm_vmperm *newvm,
                        unsigned int dest_cnt)
 {
@@ -922,9 +922,9 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
        __le32 *src;
        void *ptr;
        int ret, i, b;
-       unsigned long srcvm_bits = *srcvm;
+       u64 srcvm_bits = *srcvm;
 
-       src_sz = hweight_long(srcvm_bits) * sizeof(*src);
+       src_sz = hweight64(srcvm_bits) * sizeof(*src);
        mem_to_map_sz = sizeof(*mem_to_map);
        dest_sz = dest_cnt * sizeof(*destvm);
        ptr_sz = ALIGN(src_sz, SZ_64) + ALIGN(mem_to_map_sz, SZ_64) +
@@ -937,8 +937,10 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
        /* Fill source vmid detail */
        src = ptr;
        i = 0;
-       for_each_set_bit(b, &srcvm_bits, BITS_PER_LONG)
-               src[i++] = cpu_to_le32(b);
+       for (b = 0; b < BITS_PER_TYPE(u64); b++) {
+               if (srcvm_bits & BIT(b))
+                       src[i++] = cpu_to_le32(b);
+       }
 
        /* Fill details of mem buff to map */
        mem_to_map = ptr + ALIGN(src_sz, SZ_64);

diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 2be67022263bdab6caf1234d4b450259060c60fe..f3f2671d7ac7c4767e7e48f43eedd520166f7ae0 100644 (file)
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -262,7 +262,7 @@ struct fastrpc_channel_ctx {
        int domain_id;
        int sesscount;
        int vmcount;
-       u32 perms;
+       u64 perms;
        struct qcom_scm_vmperm vmperms[FASTRPC_MAX_VMIDS];
        struct rpmsg_device *rpdev;
        struct fastrpc_session_ctx session[FASTRPC_MAX_SESSIONS];

diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index 90f457b8e1feb8df6a9718fd411054bfc55f3e21..038c5903c0dc15789ae9d192ee308b74c5d796a5 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -33,7 +33,7 @@ static int ath10k_qmi_map_msa_permission(struct ath10k_qmi *qmi,
 {
        struct qcom_scm_vmperm dst_perms[3];
        struct ath10k *ar = qmi->ar;
-       unsigned int src_perms;
+       u64 src_perms;
        u32 perm_count;
        int ret;
 
@@ -65,7 +65,7 @@ static int ath10k_qmi_unmap_msa_permission(struct ath10k_qmi *qmi,
 {
        struct qcom_scm_vmperm dst_perms;
        struct ath10k *ar = qmi->ar;
-       unsigned int src_perms;
+       u64 src_perms;
        int ret;
 
        src_perms = BIT(QCOM_SCM_VMID_MSS_MSA) | BIT(QCOM_SCM_VMID_WLAN);

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index ab053084f7a22d3d6f21a11370f675e2b057b37c..1ba711bc01000beef454922fe35a58cc927c5445 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -235,8 +235,8 @@ struct q6v5 {
        bool has_qaccept_regs;
        bool has_ext_cntl_regs;
        bool has_vq6;
-       int mpss_perm;
-       int mba_perm;
+       u64 mpss_perm;
+       u64 mba_perm;
        const char *hexagon_mdt_image;
        int version;
 };
@@ -414,7 +414,7 @@ static void q6v5_pds_disable(struct q6v5 *qproc, struct device **pds,
        }
 }
 
-static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm,
+static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, u64 *current_perm,
                                   bool local, bool remote, phys_addr_t addr,
                                   size_t size)
 {
@@ -967,7 +967,7 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw,
        unsigned long dma_attrs = DMA_ATTR_FORCE_CONTIGUOUS;
        dma_addr_t phys;
        void *metadata;
-       int mdata_perm;
+       u64 mdata_perm;
        int xferop_ret;
        size_t size;
        void *ptr;

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 0871108fb4dc5e4b9a07086437dd48ddbcd13f97..c99a20542685141c892f4f3813c36fca420d34e9 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -94,7 +94,7 @@ struct qcom_adsp {
        size_t region_assign_size;
 
        int region_assign_idx;
-       int region_assign_perms;
+       u64 region_assign_perms;
 
        struct qcom_rproc_glink glink_subdev;
        struct qcom_rproc_subdev smd_subdev;

diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c
index 538fa182169a4171752df2f3c41b0b4cf30b1c1d..0d31377f178d5c69cd886554b999c010ca71830d 100644 (file)
--- a/drivers/soc/qcom/rmtfs_mem.c
+++ b/drivers/soc/qcom/rmtfs_mem.c
@@ -31,7 +31,7 @@ struct qcom_rmtfs_mem {
 
        unsigned int client_id;
 
-       unsigned int perms;
+       u64 perms;
 };
 
 static ssize_t qcom_rmtfs_mem_show(struct device *dev,

diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h
index 1e449a5d7f5c19d27e4f111b54e2db0fa885dc46..250ea4efb7cb6ab257b03d3df704a598a9e9ff3a 100644 (file)
--- a/include/linux/firmware/qcom/qcom_scm.h
+++ b/include/linux/firmware/qcom/qcom_scm.h
@@ -94,7 +94,7 @@ extern int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size,
                                          u32 cp_nonpixel_start,
                                          u32 cp_nonpixel_size);
 extern int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
-                              unsigned int *src,
+                              u64 *src,
                               const struct qcom_scm_vmperm *newvm,
                               unsigned int dest_cnt);