remoteproc: imx_rproc: add i.MX specific parse fw hook
The hook is used to parse memory-regions and load resource table from the address the remote processor published. Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Peng Fan <peng.fan@nxp.com> Link: https://lore.kernel.org/r/1615029865-23312-8-git-send-email-peng.fan@oss.nxp.com Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
parent
ecadcc4749
commit
b29b4249f8
@ -10,6 +10,7 @@
|
|||||||
#include <linux/mfd/syscon.h>
|
#include <linux/mfd/syscon.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
|
#include <linux/of_reserved_mem.h>
|
||||||
#include <linux/of_device.h>
|
#include <linux/of_device.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/regmap.h>
|
#include <linux/regmap.h>
|
||||||
@ -241,10 +242,102 @@ static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *i
|
|||||||
return va;
|
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_parse_memory_regions(struct rproc *rproc)
|
||||||
|
{
|
||||||
|
struct imx_rproc *priv = rproc->priv;
|
||||||
|
struct device_node *np = priv->dev->of_node;
|
||||||
|
struct of_phandle_iterator it;
|
||||||
|
struct rproc_mem_entry *mem;
|
||||||
|
struct reserved_mem *rmem;
|
||||||
|
u32 da;
|
||||||
|
|
||||||
|
/* Register associated reserved memory regions */
|
||||||
|
of_phandle_iterator_init(&it, np, "memory-region", NULL, 0);
|
||||||
|
while (of_phandle_iterator_next(&it) == 0) {
|
||||||
|
/*
|
||||||
|
* Ignore the first memory region which will be used vdev buffer.
|
||||||
|
* No need to do extra handlings, rproc_add_virtio_dev will handle it.
|
||||||
|
*/
|
||||||
|
if (!strcmp(it.node->name, "vdev0buffer"))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
rmem = of_reserved_mem_lookup(it.node);
|
||||||
|
if (!rmem) {
|
||||||
|
dev_err(priv->dev, "unable to acquire memory-region\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* No need to translate pa to da, i.MX use same map */
|
||||||
|
da = rmem->base;
|
||||||
|
|
||||||
|
/* Register memory region */
|
||||||
|
mem = rproc_mem_entry_init(priv->dev, NULL, (dma_addr_t)rmem->base, rmem->size, da,
|
||||||
|
imx_rproc_mem_alloc, imx_rproc_mem_release,
|
||||||
|
it.node->name);
|
||||||
|
|
||||||
|
if (mem)
|
||||||
|
rproc_coredump_add_segment(rproc, da, rmem->size);
|
||||||
|
else
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
rproc_add_carveout(rproc, mem);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
|
||||||
|
{
|
||||||
|
int ret = imx_rproc_parse_memory_regions(rproc);
|
||||||
|
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
ret = rproc_elf_load_rsc_table(rproc, fw);
|
||||||
|
if (ret)
|
||||||
|
dev_info(&rproc->dev, "No resource table in elf\n");
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct rproc_ops imx_rproc_ops = {
|
static const struct rproc_ops imx_rproc_ops = {
|
||||||
.start = imx_rproc_start,
|
.start = imx_rproc_start,
|
||||||
.stop = imx_rproc_stop,
|
.stop = imx_rproc_stop,
|
||||||
.da_to_va = imx_rproc_da_to_va,
|
.da_to_va = imx_rproc_da_to_va,
|
||||||
|
.load = rproc_elf_load_segments,
|
||||||
|
.parse_fw = imx_rproc_parse_fw,
|
||||||
|
.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
|
||||||
|
.sanity_check = rproc_elf_sanity_check,
|
||||||
|
.get_boot_addr = rproc_elf_get_boot_addr,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int imx_rproc_addr_init(struct imx_rproc *priv,
|
static int imx_rproc_addr_init(struct imx_rproc *priv,
|
||||||
|
Loading…
Reference in New Issue
Block a user