remoteproc: stm32: Parse memory regions when attaching to M4
Split function stm32_rproc_parse_fw() in two parts, the first one to parse the memory regions and the second one to load the resource table. That way parsing of the memory regions can be done without having do deal with the resource table when attaching to a remote processor. Mainly based on the work published by Arnaud Pouliquen [1]. [1]. https://patchwork.kernel.org/project/linux-remoteproc/list/?series=239877 Acked-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Link: https://lore.kernel.org/r/20200714200445.1427257-9-mathieu.poirier@linaro.org Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Родитель
d9473cbfb0
Коммит
dadbdb9c30
|
@ -213,7 +213,7 @@ static int stm32_rproc_elf_load_rsc_table(struct rproc *rproc,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
|
||||
static int stm32_rproc_parse_memory_regions(struct rproc *rproc)
|
||||
{
|
||||
struct device *dev = rproc->dev.parent;
|
||||
struct device_node *np = dev->of_node;
|
||||
|
@ -266,6 +266,16 @@ static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
|
|||
index++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
|
||||
{
|
||||
int ret = stm32_rproc_parse_memory_regions(rproc);
|
||||
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return stm32_rproc_elf_load_rsc_table(rproc, fw);
|
||||
}
|
||||
|
||||
|
@ -692,15 +702,20 @@ static int stm32_rproc_probe(struct platform_device *pdev)
|
|||
if (ret)
|
||||
goto free_rproc;
|
||||
|
||||
if (state == M4_STATE_CRUN)
|
||||
if (state == M4_STATE_CRUN) {
|
||||
rproc->state = RPROC_DETACHED;
|
||||
|
||||
ret = stm32_rproc_parse_memory_regions(rproc);
|
||||
if (ret)
|
||||
goto free_resources;
|
||||
}
|
||||
|
||||
rproc->has_iommu = false;
|
||||
ddata->workqueue = create_workqueue(dev_name(dev));
|
||||
if (!ddata->workqueue) {
|
||||
dev_err(dev, "cannot create workqueue\n");
|
||||
ret = -ENOMEM;
|
||||
goto free_rproc;
|
||||
goto free_resources;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, rproc);
|
||||
|
@ -719,6 +734,8 @@ free_mb:
|
|||
stm32_rproc_free_mbox(rproc);
|
||||
free_wkq:
|
||||
destroy_workqueue(ddata->workqueue);
|
||||
free_resources:
|
||||
rproc_resource_cleanup(rproc);
|
||||
free_rproc:
|
||||
if (device_may_wakeup(dev)) {
|
||||
dev_pm_clear_wake_irq(dev);
|
||||
|
|
Загрузка…
Ссылка в новой задаче