From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Ohad Ben-Cohen <ohad@wizery.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Andy Gross <agross@kernel.org>,
Sibi Sankar <sibis@codeaurora.org>,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-remoteproc@vger.kernel.org
Subject: [PATCH 4/9] remoteproc: qcom: wcnss: Update IMEM PIL info on load
Date: Tue, 6 Aug 2019 22:39:37 -0700 [thread overview]
Message-ID: <20190807053942.9836-5-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20190807053942.9836-1-bjorn.andersson@linaro.org>
Store the relocated base address and size in the PIL relocation info
structure in IMEM.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/remoteproc/Kconfig | 1 +
drivers/remoteproc/qcom_wcnss.c | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 2aa0743fc05b..3f976ce3df3c 100644
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -185,6 +185,7 @@ config QCOM_WCNSS_PIL
depends on QCOM_SMEM
depends on QCOM_SYSMON || QCOM_SYSMON=n
select QCOM_MDT_LOADER
+ select QCOM_PIL_INFO
select QCOM_RPROC_COMMON
select QCOM_SCM
help
diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c
index dc135754bb9c..9db9a3d25af4 100644
--- a/drivers/remoteproc/qcom_wcnss.c
+++ b/drivers/remoteproc/qcom_wcnss.c
@@ -27,6 +27,7 @@
#include "qcom_common.h"
#include "remoteproc_internal.h"
+#include "qcom_pil_info.h"
#include "qcom_wcnss.h"
#define WCNSS_CRASH_REASON_SMEM 422
@@ -145,10 +146,17 @@ void qcom_wcnss_assign_iris(struct qcom_wcnss *wcnss,
static int wcnss_load(struct rproc *rproc, const struct firmware *fw)
{
struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
+ int ret;
+
+ ret = qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID,
+ wcnss->mem_region, wcnss->mem_phys,
+ wcnss->mem_size, &wcnss->mem_reloc);
+ if (ret)
+ return ret;
+
+ qcom_pil_info_store("wcnss", wcnss->mem_reloc, wcnss->mem_size);
- return qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID,
- wcnss->mem_region, wcnss->mem_phys,
- wcnss->mem_size, &wcnss->mem_reloc);
+ return 0;
}
static void wcnss_indicate_nv_download(struct qcom_wcnss *wcnss)
--
2.18.0
next prev parent reply other threads:[~2019-08-07 5:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 5:39 [PATCH 0/9] remoteproc: qcom: post mortem debug support Bjorn Andersson
2019-08-07 5:39 ` [PATCH 1/9] remoteproc: qcom: Introduce driver to store pil info in IMEM Bjorn Andersson
2019-08-07 19:19 ` Suman Anna
2019-08-07 5:39 ` [PATCH 2/9] remoteproc: qcom: mss: Update IMEM PIL info on load Bjorn Andersson
2019-08-07 5:39 ` [PATCH 3/9] remoteproc: qcom: pas: " Bjorn Andersson
2019-08-07 5:39 ` Bjorn Andersson [this message]
2019-08-07 5:39 ` [PATCH 5/9] arm64: dts: qcom: qcs404: Add IMEM and PIL info region Bjorn Andersson
2019-08-07 5:39 ` [PATCH 6/9] arm64: dts: qcom: sdm845: " Bjorn Andersson
2019-08-07 5:39 ` [PATCH 7/9] remoteproc: Introduce "panic" callback in ops Bjorn Andersson
2019-08-07 19:30 ` Suman Anna
2019-08-07 5:39 ` [PATCH 8/9] remoteproc: qcom: q6v5: Add common panic handler Bjorn Andersson
2019-08-07 5:39 ` [PATCH 9/9] remoteproc: qcom: Introduce panic handler for PAS and ADSP Bjorn Andersson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190807053942.9836-5-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=agross@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=sibis@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).