From: Komal Bajaj <quic_kbajaj@quicinc.com>
To: Bjorn Andersson <andersson@kernel.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Rob Herring <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>
Cc: <linux-arm-msm@vger.kernel.org>,
<linux-remoteproc@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Melody Olvera <quic_molvera@quicinc.com>,
Komal Bajaj <quic_kbajaj@quicinc.com>
Subject: [PATCH v3 3/4] remoteproc: qcom_q6v5_pas: Add support to attach a DSP
Date: Thu, 20 Jun 2024 17:31:42 +0530 [thread overview]
Message-ID: <20240620120143.12375-4-quic_kbajaj@quicinc.com> (raw)
In-Reply-To: <20240620120143.12375-1-quic_kbajaj@quicinc.com>
From: Melody Olvera <quic_molvera@quicinc.com>
Some chipsets will have DSPs which will have begun running prior
to linux booting, so add support to late attach these DSPs by
adding support for:
- run-time checking of an offline or running DSP via rmb register
- a late attach framework to attach to the running DSP
- a handshake mechanism to ensure full and proper booting via rmb
Signed-off-by: Melody Olvera <quic_molvera@quicinc.com>
Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com>
---
drivers/remoteproc/qcom_q6v5_pas.c | 102 +++++++++++++++++++++++++++++
1 file changed, 102 insertions(+)
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index b9759f6b2283..32d45c18e15e 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -11,6 +11,7 @@
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/interrupt.h>
+#include <linux/iopoll.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -258,6 +259,94 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw)
return ret;
}
+static int adsp_signal_q6v5(struct qcom_adsp *adsp)
+{
+ unsigned int val;
+ int ret;
+
+ if (adsp->q6v5.rmb_base) {
+ ret = readl_poll_timeout(adsp->q6v5.rmb_base + RMB_BOOT_WAIT_REG,
+ val, val, 20000,
+ RMB_POLL_MAX_TIMES * 20000);
+ if (ret < 0)
+ return ret;
+
+ writel_relaxed(1, adsp->q6v5.rmb_base + RMB_BOOT_CONT_REG);
+ }
+
+ return 0;
+}
+
+static int adsp_attach(struct rproc *rproc)
+{
+ struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+ int ret;
+
+ ret = qcom_q6v5_prepare(&adsp->q6v5);
+ if (ret)
+ return ret;
+
+ ret = adsp_pds_enable(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
+ if (ret < 0)
+ goto disable_irqs;
+
+ ret = clk_prepare_enable(adsp->xo);
+ if (ret)
+ goto disable_proxy_pds;
+
+ ret = clk_prepare_enable(adsp->aggre2_clk);
+ if (ret)
+ goto disable_xo_clk;
+
+ if (adsp->cx_supply) {
+ ret = regulator_enable(adsp->cx_supply);
+ if (ret)
+ goto disable_aggre2_clk;
+ }
+
+ if (adsp->px_supply) {
+ ret = regulator_enable(adsp->px_supply);
+ if (ret)
+ goto disable_cx_supply;
+ }
+
+ /* if needed, signal Q6 to continute booting */
+ ret = adsp_signal_q6v5(adsp);
+ if (ret < 0) {
+ dev_err(adsp->dev, "Didn't get rmb signal from %s\n", rproc->name);
+ goto disable_px_supply;
+ };
+
+ ret = qcom_q6v5_wait_for_start(&adsp->q6v5, msecs_to_jiffies(5000));
+ if (ret == -ETIMEDOUT) {
+ dev_err(adsp->dev, "start timed out\n");
+ qcom_scm_pas_shutdown(adsp->pas_id);
+ goto disable_px_supply;
+ }
+
+ return 0;
+
+disable_px_supply:
+ if (adsp->px_supply)
+ regulator_disable(adsp->px_supply);
+disable_cx_supply:
+ if (adsp->cx_supply)
+ regulator_disable(adsp->cx_supply);
+disable_aggre2_clk:
+ clk_disable_unprepare(adsp->aggre2_clk);
+disable_xo_clk:
+ clk_disable_unprepare(adsp->xo);
+disable_proxy_pds:
+ adsp_pds_disable(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
+disable_irqs:
+ qcom_q6v5_unprepare(&adsp->q6v5);
+
+ /* Remove pointer to the loaded firmware, only valid in adsp_load() & adsp_start() */
+ adsp->firmware = NULL;
+
+ return ret;
+}
+
static int adsp_start(struct rproc *rproc)
{
struct qcom_adsp *adsp = rproc->priv;
@@ -320,6 +409,13 @@ static int adsp_start(struct rproc *rproc)
goto release_pas_metadata;
}
+ /* if needed, signal Q6 to continute booting */
+ ret = adsp_signal_q6v5(adsp);
+ if (ret < 0) {
+ dev_err(adsp->dev, "Didn't get rmb signal from %s\n", rproc->name);
+ goto release_pas_metadata;
+ }
+
ret = qcom_q6v5_wait_for_start(&adsp->q6v5, msecs_to_jiffies(5000));
if (ret == -ETIMEDOUT) {
dev_err(adsp->dev, "start timed out\n");
@@ -432,6 +528,7 @@ static unsigned long adsp_panic(struct rproc *rproc)
static const struct rproc_ops adsp_ops = {
.unprepare = adsp_unprepare,
.start = adsp_start,
+ .attach = adsp_attach,
.stop = adsp_stop,
.da_to_va = adsp_da_to_va,
.parse_fw = qcom_register_dump_segments,
@@ -442,6 +539,7 @@ static const struct rproc_ops adsp_ops = {
static const struct rproc_ops adsp_minidump_ops = {
.unprepare = adsp_unprepare,
.start = adsp_start,
+ .attach = adsp_attach,
.stop = adsp_stop,
.da_to_va = adsp_da_to_va,
.parse_fw = qcom_register_dump_segments,
@@ -779,6 +877,10 @@ static int adsp_probe(struct platform_device *pdev)
if (ret)
goto detach_proxy_pds;
+ if (adsp->q6v5.rmb_base &&
+ readl_relaxed(adsp->q6v5.rmb_base + RMB_Q6_BOOT_STATUS_REG))
+ rproc->state = RPROC_DETACHED;
+
qcom_add_glink_subdev(rproc, &adsp->glink_subdev, desc->ssr_name);
qcom_add_smd_subdev(rproc, &adsp->smd_subdev);
adsp->sysmon = qcom_add_sysmon_subdev(rproc,
--
2.42.0
next prev parent reply other threads:[~2024-06-20 12:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 12:01 [PATCH v3 0/4]remoteproc: qcom_q6v5_pas: Add support for QDU1000/QRU1000 mpss Komal Bajaj
2024-06-20 12:01 ` [PATCH v3 1/4] dt-bindings: remoteproc: mpss: Document QDU1000/QRU1000 mpss devices Komal Bajaj
2024-06-20 13:20 ` Krzysztof Kozlowski
2024-06-20 13:45 ` Rob Herring (Arm)
2024-06-20 12:01 ` [PATCH v3 2/4] remoteproc: qcom: q6v5: Add support for q6 rmb registers Komal Bajaj
2024-06-20 21:38 ` Dmitry Baryshkov
2024-06-20 12:01 ` Komal Bajaj [this message]
2024-06-20 21:58 ` [PATCH v3 3/4] remoteproc: qcom_q6v5_pas: Add support to attach a DSP Dmitry Baryshkov
2024-06-25 20:03 ` Bjorn Andersson
2024-06-20 12:01 ` [PATCH v3 4/4] remoteproc: qcom_q6v5_pas: Add QDU1000/QRU1000 mpss compatible Komal Bajaj
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=20240620120143.12375-4-quic_kbajaj@quicinc.com \
--to=quic_kbajaj@quicinc.com \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=quic_molvera@quicinc.com \
--cc=robh@kernel.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 read-only IMAP folder(s) and NNTP newsgroup(s).