From: Sibi Sankar <sibis@codeaurora.org>
To: bjorn.andersson@linaro.org, jhugo@codeaurora.org,
robh+dt@kernel.org, jonathan@marek.ca
Cc: ohad@wizery.com, mark.rutland@arm.com, p.zabel@pengutronix.de,
linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
agross@kernel.org, Sibi Sankar <sibis@codeaurora.org>
Subject: [PATCH 02/16] remoteproc: q6v5-mss: Streamline the MSS out of reset sequence
Date: Mon, 18 Nov 2019 21:43:15 +0000 [thread overview]
Message-ID: <0101016e80784451-873bf09d-3517-480d-80a2-c89750d0ae12-000000@us-west-2.amazonses.com> (raw)
In-Reply-To: <20191118214250.14002-1-sibis@codeaurora.org>
Streamline the MSS out of reset sequence to reuse common code across
MSM8998/MSM8996/MSM8974/MSM8916 SoCs.
Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
---
drivers/remoteproc/qcom_q6v5_mss.c | 94 ++++++++++++++++--------------
1 file changed, 51 insertions(+), 43 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index 2becf6dade936..06a57db3238db 100644
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -505,21 +505,21 @@ static int q6v5proc_reset(struct q6v5 *qproc)
}
goto pbl_wait;
- } else if (qproc->version == MSS_MSM8996 ||
- qproc->version == MSS_MSM8998) {
- int mem_pwr_ctl;
+ }
- /* Override the ACC value if required */
- if (qproc->version == MSS_MSM8996)
- writel(QDSP6SS_ACC_OVERRIDE_VAL,
- qproc->reg_base + QDSP6SS_STRAP_ACC);
+ /* Override the ACC value if required */
+ if (qproc->version == MSS_MSM8996)
+ writel(QDSP6SS_ACC_OVERRIDE_VAL,
+ qproc->reg_base + QDSP6SS_STRAP_ACC);
- /* Assert resets, stop core */
- val = readl(qproc->reg_base + QDSP6SS_RESET_REG);
- val |= Q6SS_CORE_ARES | Q6SS_BUS_ARES_ENABLE | Q6SS_STOP_CORE;
- writel(val, qproc->reg_base + QDSP6SS_RESET_REG);
+ /* Assert resets, stop core */
+ val = readl(qproc->reg_base + QDSP6SS_RESET_REG);
+ val |= Q6SS_CORE_ARES | Q6SS_BUS_ARES_ENABLE | Q6SS_STOP_CORE;
+ writel(val, qproc->reg_base + QDSP6SS_RESET_REG);
- /* BHS require xo cbcr to be enabled */
+ /* BHS require xo cbcr to be enabled */
+ if (qproc->version == MSS_MSM8996 ||
+ qproc->version == MSS_MSM8998) {
val = readl(qproc->reg_base + QDSP6SS_XO_CBCR);
val |= 0x1;
writel(val, qproc->reg_base + QDSP6SS_XO_CBCR);
@@ -533,26 +533,35 @@ static int q6v5proc_reset(struct q6v5 *qproc)
"xo cbcr enabling timed out (rc:%d)\n", ret);
return ret;
}
- /* Enable power block headswitch and wait for it to stabilize */
- val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+ }
+
+ /* Enable power block headswitch and wait for it to stabilize */
+ val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+ if (qproc->version == MSS_MSM8996 ||
+ qproc->version == MSS_MSM8998)
val |= QDSP6v56_BHS_ON;
- writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
- val |= readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
- udelay(1);
-
- /* wait for BHS_EN_REST_ACK to be set */
- if (qproc->version == MSS_MSM8998) {
- ret = readl_poll_timeout(qproc->reg_base + QDSP6SS_BHS_STATUS,
- val, (val & QDSP6SS_BHS_EN_REST_ACK),
- 1, BHS_CHECK_MAX_LOOPS);
- if (ret) {
- dev_err(qproc->dev,
- "QDSP6SS_BHS_EN_REST_ACK timedout\n");
- return -ETIMEDOUT;
- }
+ else
+ val |= QDSS_BHS_ON | QDSS_LDO_BYP;
+ writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+ val |= readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+ udelay(1);
+
+ /* wait for BHS_EN_REST_ACK to be set */
+ if (qproc->version == MSS_MSM8998) {
+ ret = readl_poll_timeout(qproc->reg_base + QDSP6SS_BHS_STATUS,
+ val, (val & QDSP6SS_BHS_EN_REST_ACK),
+ 1, BHS_CHECK_MAX_LOOPS);
+ if (ret) {
+ dev_err(qproc->dev,
+ "QDSP6SS_BHS_EN_REST_ACK timedout\n");
+ return -ETIMEDOUT;
}
+ }
+ if (qproc->version == MSS_MSM8996 ||
+ qproc->version == MSS_MSM8998) {
/* Put LDO in bypass mode */
+ val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
val |= QDSP6v56_LDO_BYP;
writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
@@ -564,7 +573,11 @@ static int q6v5proc_reset(struct q6v5 *qproc)
/* Deassert memory peripheral sleep and L2 memory standby */
val |= Q6SS_L2DATA_STBY_N | Q6SS_SLP_RET_N;
writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+ }
+ /* Turn on memories */
+ if (qproc->version == MSS_MSM8996 || qproc->version == MSS_MSM8998) {
+ int mem_pwr_ctl;
/* Turn on L1, L2, ETB and JU memories 1 at a time */
if (qproc->version == MSS_MSM8996) {
mem_pwr_ctl = QDSP6SS_MEM_PWR_CTL;
@@ -586,22 +599,7 @@ static int q6v5proc_reset(struct q6v5 *qproc)
val |= readl(qproc->reg_base + mem_pwr_ctl);
udelay(1);
}
- /* Remove word line clamp */
- val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
- val &= ~QDSP6v56_CLAMP_WL;
- writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
} else {
- /* Assert resets, stop core */
- val = readl(qproc->reg_base + QDSP6SS_RESET_REG);
- val |= Q6SS_CORE_ARES | Q6SS_BUS_ARES_ENABLE | Q6SS_STOP_CORE;
- writel(val, qproc->reg_base + QDSP6SS_RESET_REG);
-
- /* Enable power block headswitch and wait for it to stabilize */
- val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
- val |= QDSS_BHS_ON | QDSS_LDO_BYP;
- writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
- val |= readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
- udelay(1);
/*
* Turn on memories. L2 banks should be done individually
* to minimize inrush current.
@@ -617,7 +615,17 @@ static int q6v5proc_reset(struct q6v5 *qproc)
val |= Q6SS_L2DATA_SLP_NRET_N_0;
writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
}
+
+ /* Remove word line clamp */
+ if (qproc->version == MSS_MSM8996 ||
+ qproc->version == MSS_MSM8998) {
+ val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+ val &= ~QDSP6v56_CLAMP_WL;
+ writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+ }
+
/* Remove IO clamp */
+ val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
val &= ~Q6SS_CLAMP_IO;
writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2019-11-18 21:43 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20191118214250.14002-1-sibis@codeaurora.org>
2019-11-18 21:43 ` [PATCH 01/16] remoteproc: q6v5-mss: fixup MSM8998 MSS out of reset sequence Sibi Sankar
2019-11-18 21:54 ` Jeffrey Hugo
2019-11-19 15:25 ` Sibi Sankar
[not found] ` <0101016e844504f1-d8bd27a5-c0bf-4b0b-8301-7bd8a890be80-000000@us-west-2.amazonses.com>
2019-11-19 15:43 ` Jeffrey Hugo
2019-11-20 12:01 ` Sibi Sankar
2019-11-18 21:43 ` Sibi Sankar [this message]
2019-11-18 21:43 ` [PATCH 03/16] dt-bindings: remoteproc: qcom: Add Q6V5 Modem PIL binding for SC7180 Sibi Sankar
2019-11-22 23:12 ` Rob Herring
2019-11-18 21:43 ` [PATCH 04/16] remoteproc: mss: q6v5-mss: Add modem support on SC7180 Sibi Sankar
2019-11-18 21:43 ` [PATCH 05/16] remoteproc: qcom: pas: Disable interrupt on clock enable failure Sibi Sankar
2019-11-18 21:43 ` [PATCH 06/16] dt-bindings: remoteproc: qcom: Add power-domain bindings for Q6V5 PAS Sibi Sankar
2019-11-22 23:15 ` Rob Herring
2019-11-18 21:43 ` [PATCH 07/16] remoteproc: qcom: pas: Vote for active/proxy power domains Sibi Sankar
2019-11-18 21:43 ` [PATCH 08/16] dt-bindings: remoteproc: qcom: Add ADSP and SLPI support for MSM8998 SoC Sibi Sankar
2019-12-03 22:01 ` Rob Herring
2019-11-18 21:43 ` [PATCH 09/16] remoteproc: qcom: pas: Add MSM8998 ADSP and SLPI support Sibi Sankar
2019-11-18 21:43 ` [PATCH 10/16] dt-bindings: remoteproc: qcom: SM8150 Add ADSP, CDSP, MPSS " Sibi Sankar
2019-12-03 22:02 ` Rob Herring
2019-11-18 21:43 ` [PATCH 11/16] remoteproc: qcom: pas: Add SM8150 ADSP, CDSP, Modem " Sibi Sankar
2019-11-18 21:44 ` [PATCH 12/16] remoteproc: qcom: pas: Add auto_boot flag Sibi Sankar
2019-11-18 21:44 ` [PATCH 13/16] arm64: dts: qcom: msm8998: Update reserved memory map Sibi Sankar
2019-11-18 22:04 ` Jeffrey Hugo
2019-11-19 12:28 ` sibis
2019-11-18 21:44 ` [PATCH 14/16] arm64: dts: qcom: msm8998: Add ADSP, MPSS and SLPI nodes Sibi Sankar
2019-11-18 22:07 ` Jeffrey Hugo
2019-11-19 12:29 ` sibis
2019-11-18 21:44 ` [PATCH 15/16] arm64: dts: qcom: sm8150: Add ADSP, CDSP, MPSS and SLPI smp2p Sibi Sankar
2019-11-18 21:44 ` [PATCH 16/16] arm64: dts: qcom: sm8150: Add ADSP, CDSP, MPSS and SLPI remoteprocs Sibi Sankar
2019-12-17 0:19 ` 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=0101016e80784451-873bf09d-3517-480d-80a2-c89750d0ae12-000000@us-west-2.amazonses.com \
--to=sibis@codeaurora.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=jhugo@codeaurora.org \
--cc=jonathan@marek.ca \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=ohad@wizery.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@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 NNTP newsgroup(s).