On Thu, May 14, 2026 at 09:21:26AM -0700, Ben Levinsky wrote:
> Replace the exact-match carveout map and unmap callbacks in the
> existing remoteproc drivers with the common wc-ioremap helpers. This
> covers xlnx_r5_remoteproc, rcar_rproc, st_remoteproc, stm32_rproc,
> imx_rproc, and imx_dsp_rproc.
>
> Leave the zynqmp R5 TCM callbacks alone because they also clear the
> mapped memory and are therefore not exact matches for the shared
> helpers.
>
> Signed-off-by: Ben Levinsky <[email protected]>
> Reviewed-by: Geert Uytterhoeven <[email protected]> # renesas
> ---
> drivers/remoteproc/imx_dsp_rproc.c | 36 ++++---------------
> drivers/remoteproc/imx_rproc.c | 32 ++---------------
> drivers/remoteproc/rcar_rproc.c | 33 ++---------------
> drivers/remoteproc/st_remoteproc.c | 31 ++--------------
> drivers/remoteproc/stm32_rproc.c | 34 ++----------------
> drivers/remoteproc/xlnx_r5_remoteproc.c | 47 +++----------------------
> 6 files changed, 18 insertions(+), 195 deletions(-)
>
> diff --git a/drivers/remoteproc/imx_dsp_rproc.c
> b/drivers/remoteproc/imx_dsp_rproc.c
> index 008741af9f11..2d9f14fbef1d 100644
> --- a/drivers/remoteproc/imx_dsp_rproc.c
> +++ b/drivers/remoteproc/imx_dsp_rproc.c
> @@ -644,32 +644,6 @@ static void imx_dsp_rproc_free_mbox(struct imx_dsp_rproc
> *priv)
> mbox_free_channel(priv->rxdb_ch);
> }
>
> -static int imx_dsp_rproc_mem_alloc(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - struct device *dev = rproc->dev.parent;
> - void *va;
> -
> - va = ioremap_wc(mem->dma, mem->len);
> - if (!va) {
> - dev_err(dev, "Unable to map memory region: %pa+%zx\n",
> - &mem->dma, mem->len);
> - return -ENOMEM;
> - }
> -
> - mem->va = va;
> -
> - return 0;
> -}
> -
> -static int imx_dsp_rproc_mem_release(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - iounmap(mem->va);
> -
> - return 0;
> -}
> -
> /**
> * imx_dsp_rproc_add_carveout() - request mailbox channels
> * @priv: private data pointer
> @@ -700,8 +674,10 @@ static int imx_dsp_rproc_add_carveout(struct
> imx_dsp_rproc *priv)
>
> /* Register memory region */
> mem = rproc_mem_entry_init(dev, NULL, (dma_addr_t)att->sa,
> - att->size, da,
> imx_dsp_rproc_mem_alloc,
> - imx_dsp_rproc_mem_release,
> "dsp_mem");
> + att->size, da,
> + rproc_mem_entry_ioremap_wc,
> + rproc_mem_entry_iounmap,
> + "dsp_mem");
>
> if (mem)
> rproc_coredump_add_segment(rproc, da, att->size);
> @@ -732,8 +708,8 @@ static int imx_dsp_rproc_add_carveout(struct
> imx_dsp_rproc *priv)
> /* Register memory region */
> mem = rproc_mem_entry_init(dev, NULL, (dma_addr_t)res.start,
> resource_size(&res), da,
> - imx_dsp_rproc_mem_alloc,
> - imx_dsp_rproc_mem_release,
> + rproc_mem_entry_ioremap_wc,
> + rproc_mem_entry_iounmap,
> "%.*s", strchrnul(res.name, '@') -
> res.name, res.name);
> if (!mem)
> return -ENOMEM;
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index 7f54322244ac..6249815b54d8 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -600,35 +600,6 @@ static void *imx_rproc_da_to_va(struct rproc *rproc, u64
> da, size_t len, bool *i
> return va;
> }
>
> -static int imx_rproc_mem_alloc(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - struct device *dev = rproc->dev.parent;
> - void *va;
> -
> - dev_dbg(dev, "map memory: %p+%zx\n", &mem->dma, mem->len);
> - va = ioremap_wc(mem->dma, mem->len);
> - if (IS_ERR_OR_NULL(va)) {
> - dev_err(dev, "Unable to map memory region: %p+%zx\n",
> - &mem->dma, mem->len);
> - return -ENOMEM;
> - }
> -
> - /* Update memory entry va */
> - mem->va = va;
> -
> - return 0;
> -}
> -
> -static int imx_rproc_mem_release(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - dev_dbg(rproc->dev.parent, "unmap memory: %pa\n", &mem->dma);
> - iounmap(mem->va);
> -
> - return 0;
> -}
> -
> static int imx_rproc_sm_lmm_prepare(struct rproc *rproc)
> {
> struct imx_rproc *priv = rproc->priv;
> @@ -692,7 +663,8 @@ static int imx_rproc_prepare(struct rproc *rproc)
> /* Register memory region */
> mem = rproc_mem_entry_init(priv->dev, NULL,
> (dma_addr_t)res.start,
> resource_size(&res), da,
> - imx_rproc_mem_alloc,
> imx_rproc_mem_release,
> + rproc_mem_entry_ioremap_wc,
> + rproc_mem_entry_iounmap,
> "%.*s", strchrnul(res.name, '@') -
> res.name,
> res.name);
> if (!mem)
> diff --git a/drivers/remoteproc/rcar_rproc.c b/drivers/remoteproc/rcar_rproc.c
> index 3c25625f966d..e3121fadd292 100644
> --- a/drivers/remoteproc/rcar_rproc.c
> +++ b/drivers/remoteproc/rcar_rproc.c
> @@ -19,35 +19,6 @@ struct rcar_rproc {
> struct reset_control *rst;
> };
>
> -static int rcar_rproc_mem_alloc(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - struct device *dev = &rproc->dev;
> - void *va;
> -
> - dev_dbg(dev, "map memory: %pa+%zx\n", &mem->dma, mem->len);
> - va = ioremap_wc(mem->dma, mem->len);
> - if (!va) {
> - dev_err(dev, "Unable to map memory region: %pa+%zx\n",
> - &mem->dma, mem->len);
> - return -ENOMEM;
> - }
> -
> - /* Update memory entry va */
> - mem->va = va;
> -
> - return 0;
> -}
> -
> -static int rcar_rproc_mem_release(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - dev_dbg(&rproc->dev, "unmap memory: %pa\n", &mem->dma);
> - iounmap(mem->va);
> -
> - return 0;
> -}
> -
> static int rcar_rproc_prepare(struct rproc *rproc)
> {
> struct device *dev = rproc->dev.parent;
> @@ -73,8 +44,8 @@ static int rcar_rproc_prepare(struct rproc *rproc)
> mem = rproc_mem_entry_init(dev, NULL,
> res.start,
> resource_size(&res), da,
> - rcar_rproc_mem_alloc,
> - rcar_rproc_mem_release,
> + rproc_mem_entry_ioremap_wc,
> + rproc_mem_entry_iounmap,
> res.name);
>
> if (!mem)
> diff --git a/drivers/remoteproc/st_remoteproc.c
> b/drivers/remoteproc/st_remoteproc.c
> index a07edf7217d2..486180cdccb4 100644
> --- a/drivers/remoteproc/st_remoteproc.c
> +++ b/drivers/remoteproc/st_remoteproc.c
> @@ -88,33 +88,6 @@ static void st_rproc_kick(struct rproc *rproc, int vqid)
> dev_err(dev, "failed to send message via mbox: %d\n", ret);
> }
>
> -static int st_rproc_mem_alloc(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - struct device *dev = rproc->dev.parent;
> - void *va;
> -
> - va = ioremap_wc(mem->dma, mem->len);
> - if (!va) {
> - dev_err(dev, "Unable to map memory region: %pa+%zx\n",
> - &mem->dma, mem->len);
> - return -ENOMEM;
> - }
> -
> - /* Update memory entry va */
> - mem->va = va;
> -
> - return 0;
> -}
> -
> -static int st_rproc_mem_release(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - iounmap(mem->va);
> -
> - return 0;
> -}
> -
> static int st_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> {
> struct device *dev = rproc->dev.parent;
> @@ -138,8 +111,8 @@ static int st_rproc_parse_fw(struct rproc *rproc, const
> struct firmware *fw)
> mem = rproc_mem_entry_init(dev, NULL,
> (dma_addr_t)res.start,
> resource_size(&res),
> res.start,
> - st_rproc_mem_alloc,
> - st_rproc_mem_release,
> + rproc_mem_entry_ioremap_wc,
> + rproc_mem_entry_iounmap,
> "%.*s",
> strchrnul(res.name, '@') -
> res.name,
> res.name);
> diff --git a/drivers/remoteproc/stm32_rproc.c
> b/drivers/remoteproc/stm32_rproc.c
> index 632614013dc6..7ac8265b60ac 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -113,35 +113,6 @@ static int stm32_rproc_pa_to_da(struct rproc *rproc,
> phys_addr_t pa, u64 *da)
> return -EINVAL;
> }
>
> -static int stm32_rproc_mem_alloc(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - struct device *dev = rproc->dev.parent;
> - void *va;
> -
> - dev_dbg(dev, "map memory: %pad+%zx\n", &mem->dma, mem->len);
> - va = (__force void *)ioremap_wc(mem->dma, mem->len);
> - if (IS_ERR_OR_NULL(va)) {
> - dev_err(dev, "Unable to map memory region: %pad+0x%zx\n",
> - &mem->dma, mem->len);
> - return -ENOMEM;
> - }
> -
> - /* Update memory entry va */
> - mem->va = va;
> -
> - return 0;
> -}
> -
> -static int stm32_rproc_mem_release(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - dev_dbg(rproc->dev.parent, "unmap memory: %pa\n", &mem->dma);
> - iounmap((__force __iomem void *)mem->va);
> -
> - return 0;
> -}
> -
> static int stm32_rproc_of_memory_translations(struct platform_device *pdev,
> struct stm32_rproc *ddata)
> {
> @@ -237,8 +208,8 @@ static int stm32_rproc_prepare(struct rproc *rproc)
> mem = rproc_mem_entry_init(dev, NULL,
> (dma_addr_t)res.start,
> resource_size(&res), da,
> - stm32_rproc_mem_alloc,
> - stm32_rproc_mem_release,
> + rproc_mem_entry_ioremap_wc,
> + rproc_mem_entry_iounmap,
> "%.*s", strchrnul(res.name,
> '@') - res.name,
> res.name);
> if (mem)
> @@ -957,4 +928,3 @@ MODULE_DESCRIPTION("STM32 Remote Processor Control
> Driver");
> MODULE_AUTHOR("Ludovic Barre <[email protected]>");
> MODULE_AUTHOR("Fabien Dessenne <[email protected]>");
> MODULE_LICENSE("GPL v2");
> -
Spurious change.
> diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c
> b/drivers/remoteproc/xlnx_r5_remoteproc.c
> index 45a62cb98072..e5d1903c9636 100644
> --- a/drivers/remoteproc/xlnx_r5_remoteproc.c
> +++ b/drivers/remoteproc/xlnx_r5_remoteproc.c
> @@ -447,45 +447,6 @@ static int zynqmp_r5_rproc_stop(struct rproc *rproc)
> return ret;
> }
>
> -/*
> - * zynqmp_r5_mem_region_map()
> - * @rproc: single R5 core's corresponding rproc instance
> - * @mem: mem descriptor to map reserved memory-regions
> - *
> - * Callback to map va for memory-region's carveout.
> - *
> - * return 0 on success, otherwise non-zero value on failure
> - */
> -static int zynqmp_r5_mem_region_map(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - void __iomem *va;
> -
> - va = ioremap_wc(mem->dma, mem->len);
> - if (IS_ERR_OR_NULL(va))
> - return -ENOMEM;
> -
> - mem->va = (void *)va;
> -
> - return 0;
> -}
> -
> -/*
> - * zynqmp_r5_rproc_mem_unmap
> - * @rproc: single R5 core's corresponding rproc instance
> - * @mem: mem entry to unmap
> - *
> - * Unmap memory-region carveout
> - *
> - * return: always returns 0
> - */
> -static int zynqmp_r5_mem_region_unmap(struct rproc *rproc,
> - struct rproc_mem_entry *mem)
> -{
> - iounmap((void __iomem *)mem->va);
> - return 0;
> -}
> -
> /*
> * add_mem_regions_carveout()
> * @rproc: single R5 core's corresponding rproc instance
> @@ -522,8 +483,8 @@ static int add_mem_regions_carveout(struct rproc *rproc)
> rproc_mem = rproc_mem_entry_init(&rproc->dev, NULL,
> (dma_addr_t)res.start,
> resource_size(&res),
> res.start,
> -
> zynqmp_r5_mem_region_map,
> -
> zynqmp_r5_mem_region_unmap,
> +
> rproc_mem_entry_ioremap_wc,
> +
> rproc_mem_entry_iounmap,
> "%.*s",
> strchrnul(res.name,
> '@') - res.name,
> res.name);
> @@ -560,8 +521,8 @@ static int add_sram_carveouts(struct rproc *rproc)
> rproc_mem = rproc_mem_entry_init(&rproc->dev, NULL,
> dma_addr,
> len, da,
> - zynqmp_r5_mem_region_map,
> - zynqmp_r5_mem_region_unmap,
> + rproc_mem_entry_ioremap_wc,
> + rproc_mem_entry_iounmap,
> sram->sram_res.name);
> if (!rproc_mem) {
> dev_err(&rproc->dev, "failed to add sram %s da=0x%x,
> size=0x%lx",
> --
> 2.34.1
>
