Commit 10a3d407 authored by Peng Fan's avatar Peng Fan Committed by Bjorn Andersson

remoteproc: imx_rproc: move memory parsing to rproc_ops

Use the rproc_ops::prepare() hook for doing memory resources
reallocation when reattaching a remote procesor.
Suggested-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/1617846289-13496-4-git-send-email-peng.fan@oss.nxp.comSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent f638a197
...@@ -317,7 +317,7 @@ static int imx_rproc_mem_release(struct rproc *rproc, ...@@ -317,7 +317,7 @@ static int imx_rproc_mem_release(struct rproc *rproc,
return 0; return 0;
} }
static int imx_rproc_parse_memory_regions(struct rproc *rproc) static int imx_rproc_prepare(struct rproc *rproc)
{ {
struct imx_rproc *priv = rproc->priv; struct imx_rproc *priv = rproc->priv;
struct device_node *np = priv->dev->of_node; struct device_node *np = priv->dev->of_node;
...@@ -363,10 +363,7 @@ static int imx_rproc_parse_memory_regions(struct rproc *rproc) ...@@ -363,10 +363,7 @@ static int imx_rproc_parse_memory_regions(struct rproc *rproc)
static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw) static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
{ {
int ret = imx_rproc_parse_memory_regions(rproc); int ret;
if (ret)
return ret;
ret = rproc_elf_load_rsc_table(rproc, fw); ret = rproc_elf_load_rsc_table(rproc, fw);
if (ret) if (ret)
...@@ -399,6 +396,7 @@ static void imx_rproc_kick(struct rproc *rproc, int vqid) ...@@ -399,6 +396,7 @@ static void imx_rproc_kick(struct rproc *rproc, int vqid)
} }
static const struct rproc_ops imx_rproc_ops = { static const struct rproc_ops imx_rproc_ops = {
.prepare = imx_rproc_prepare,
.start = imx_rproc_start, .start = imx_rproc_start,
.stop = imx_rproc_stop, .stop = imx_rproc_stop,
.kick = imx_rproc_kick, .kick = imx_rproc_kick,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment