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.

Clement Leger committed 6 years ago

Commit 096ee781 parent 9ce3bf23 files · +12 −10Browse files

Unified · Split

3 files

drivers/remoteproc/remoteproc_core.c +8 −6
drivers/remoteproc/remoteproc_debugfs.c +1 −1
include/linux/remoteproc.h +3 −3

drivers/remoteproc/remoteproc_core.c+8−6

 	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));
 	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) {
  */
 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, ...)
  * 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;
 		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);
 		}

drivers/remoteproc/remoteproc_debugfs.c+1−1

@@ -293,7 +293,7 @@ static int rproc_carveouts_show(struct seq_file seq, void p) · 292 unmodified lines
293	seq_printf(seq, "\tVirtual address: %pK\n", carveout->va);	293	seq_printf(seq, "\tVirtual address: %pK\n", carveout->va);
294	seq_printf(seq, "\tDMA address: %pad\n", &carveout->dma);	294	seq_printf(seq, "\tDMA address: %pad\n", &carveout->dma);
295	seq_printf(seq, "\tDevice address: 0x%x\n", carveout->da);	295	seq_printf(seq, "\tDevice address: 0x%x\n", carveout->da);
296	seq_printf(seq, "\tLength: 0x%x Bytes\n\n", carveout->len);	296	seq_printf(seq, "\tLength: 0x%zx Bytes\n\n", carveout->len);
297	}	297	}
298		298
299	return 0;	299	return 0;

include/linux/remoteproc.h+3−3

@@ -329,7 +329,7 @@ struct rproc; · 328 unmodified lines
329	struct rproc_mem_entry {	329	struct rproc_mem_entry {
330	void *va;	330	void *va;
331	dma_addr_t dma;	331	dma_addr_t dma;
332	int len;	332	size_t len;
333	u32 da;	333	u32 da;
334	void *priv;	334	void *priv;
335	char name[32];	335	char name[32];
@@ -599,13 +599,13 @@ void rproc_add_carveout(struct rproc rproc, struct rproc_mem_entry mem); · 263 unmodified lines
599		599
600	struct rproc_mem_entry *	600	struct rproc_mem_entry *
601	rproc_mem_entry_init(struct device *dev,	601	rproc_mem_entry_init(struct device *dev,
602	void *va, dma_addr_t dma, int len, u32 da,	602	void *va, dma_addr_t dma, size_t len, u32 da,
603	int (alloc)(struct rproc , struct rproc_mem_entry *),	603	int (alloc)(struct rproc , struct rproc_mem_entry *),
604	int (release)(struct rproc , struct rproc_mem_entry *),	604	int (release)(struct rproc , struct rproc_mem_entry *),
605	const char *name, ...);	605	const char *name, ...);
606		606
607	struct rproc_mem_entry *	607	struct rproc_mem_entry *
608	rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, int len,	608	rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, size_t len,
609	u32 da, const char *name, ...);	609	u32 da, const char *name, ...);
610		610
611	int rproc_boot(struct rproc *rproc);	611	int rproc_boot(struct rproc *rproc);

remoteproc: Use size_t instead of int for rproc_mem_entry len

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code