mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 12:44:03 +02:00
remoteproc: Switch exact-match drivers to wc-ioremap callbacks
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 <ben.levinsky@amd.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> # renesas Tested-by: Peng Fan <peng.fan@nxp.com> #i.MX8MP-EVK Link: https://lore.kernel.org/r/20260529021637.2077602-3-ben.levinsky@amd.com Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
This commit is contained in:
Ben Levinsky
Mathieu Poirier
parent
50227acbf4
commit
aef86ae680
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -451,45 +451,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
|
||||
|
|
@ -526,8 +487,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);
|
||||
|
|
@ -564,8 +525,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",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user