remoteproc: Use size_t instead of int for rproc_mem_entry len

Now that rproc_da_to_va uses a size_t for length, use a size_t for len
field of rproc_mem_entry. Function used to create such structures now
takes a size_t instead of int to allow full size range to be handled.

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Clement Leger <cleger@kalray.eu>
Link: https://lore.kernel.org/r/20200302093902.27849-3-cleger@kalray.eu
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 1f20db1..ebb7213 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -319,8 +319,9 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
        struct device *dev = &rproc->dev;
        struct rproc_vring *rvring = &rvdev->vring[i];
        struct fw_rsc_vdev *rsc;
-       int ret, size, notifyid;
+       int ret, notifyid;
        struct rproc_mem_entry *mem;
+       size_t size;
 
        /* actual size of vring (in bytes) */
        size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));
@@ -750,11 +751,12 @@ static int rproc_alloc_carveout(struct rproc *rproc,
        va = dma_alloc_coherent(dev->parent, mem->len, &dma, GFP_KERNEL);
        if (!va) {
                dev_err(dev->parent,
-                       "failed to allocate dma memory: len 0x%x\n", mem->len);
+                       "failed to allocate dma memory: len 0x%zx\n",
+                       mem->len);
                return -ENOMEM;
        }
 
-       dev_dbg(dev, "carveout va %pK, dma %pad, len 0x%x\n",
+       dev_dbg(dev, "carveout va %pK, dma %pad, len 0x%zx\n",
                va, &dma, mem->len);
 
        if (mem->da != FW_RSC_ADDR_ANY && !rproc->domain) {
@@ -962,7 +964,7 @@ EXPORT_SYMBOL(rproc_add_carveout);
  */
 struct rproc_mem_entry *
 rproc_mem_entry_init(struct device *dev,
-                    void *va, dma_addr_t dma, int len, u32 da,
+                    void *va, dma_addr_t dma, size_t len, u32 da,
                     int (*alloc)(struct rproc *, struct rproc_mem_entry *),
                     int (*release)(struct rproc *, struct rproc_mem_entry *),
                     const char *name, ...)
@@ -1004,7 +1006,7 @@ EXPORT_SYMBOL(rproc_mem_entry_init);
  * provided by client.
  */
 struct rproc_mem_entry *
-rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, int len,
+rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, size_t len,
                             u32 da, const char *name, ...)
 {
        struct rproc_mem_entry *mem;
@@ -1275,7 +1277,7 @@ static void rproc_resource_cleanup(struct rproc *rproc)
                unmapped = iommu_unmap(rproc->domain, entry->da, entry->len);
                if (unmapped != entry->len) {
                        /* nothing much to do besides complaining */
-                       dev_err(dev, "failed to unmap %u/%zu\n", entry->len,
+                       dev_err(dev, "failed to unmap %zx/%zu\n", entry->len,
                                unmapped);
                }
 

diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c
index dd93cf0..82dc34b 100644 (file)
--- a/drivers/remoteproc/remoteproc_debugfs.c
+++ b/drivers/remoteproc/remoteproc_debugfs.c
@@ -293,7 +293,7 @@ static int rproc_carveouts_show(struct seq_file *seq, void *p)
                seq_printf(seq, "\tVirtual address: %pK\n", carveout->va);
                seq_printf(seq, "\tDMA address: %pad\n", &carveout->dma);
                seq_printf(seq, "\tDevice address: 0x%x\n", carveout->da);
-               seq_printf(seq, "\tLength: 0x%x Bytes\n\n", carveout->len);
+               seq_printf(seq, "\tLength: 0x%zx Bytes\n\n", carveout->len);
        }
 
        return 0;

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 8921579..bee5593 100644 (file)
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -329,7 +329,7 @@ struct rproc;
 struct rproc_mem_entry {
        void *va;
        dma_addr_t dma;
-       int len;
+       size_t len;
        u32 da;
        void *priv;
        char name[32];
@@ -599,13 +599,13 @@ void rproc_add_carveout(struct rproc *rproc, struct rproc_mem_entry *mem);
 
 struct rproc_mem_entry *
 rproc_mem_entry_init(struct device *dev,
-                    void *va, dma_addr_t dma, int len, u32 da,
+                    void *va, dma_addr_t dma, size_t len, u32 da,
                     int (*alloc)(struct rproc *, struct rproc_mem_entry *),
                     int (*release)(struct rproc *, struct rproc_mem_entry *),
                     const char *name, ...);
 
 struct rproc_mem_entry *
-rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, int len,
+rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, size_t len,
                             u32 da, const char *name, ...);
 
 int rproc_boot(struct rproc *rproc);