From b4e5039ede6e77a0d947c282bace4871cd0d339d Mon Sep 17 00:00:00 2001 From: Stanimir Varbanov Date: Fri, 21 Aug 2015 16:37:57 +0300 Subject: [PATCH] remoteproc: tz_pil: take relocation flag into account when setup memory by scm call Signed-off-by: Andy Gross Signed-off-by: Stanimir Varbanov --- drivers/remoteproc/qcom_tz_pil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/remoteproc/qcom_tz_pil.c b/drivers/remoteproc/qcom_tz_pil.c index 96395882969c..cdc2e1f233f2 100644 --- a/drivers/remoteproc/qcom_tz_pil.c +++ b/drivers/remoteproc/qcom_tz_pil.c @@ -280,7 +280,8 @@ static int qproc_load(struct rproc *rproc, const struct firmware *fw) diff_addr = max_addr - min_addr; dev_dbg(qproc->dev, "pas_mem_setup %pa, %pa\n", &min_addr, &diff_addr); - ret = qcom_scm_pas_mem_setup(qproc->pas_id, min_addr, max_addr - min_addr); + ret = qcom_scm_pas_mem_setup(qproc->pas_id, + relocatable ? qproc->reloc_phys : min_addr, max_addr - min_addr); if (ret) { dev_err(qproc->dev, "unable to setup memory for image\n"); return -EINVAL; -- 2.39.5