* [PATCH v2 0/2] Improve general readability of MSS on SC7180
@ 2020-01-23 13:12 Sibi Sankar
2020-01-23 13:12 ` [PATCH v2 1/2] remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout Sibi Sankar
2020-01-23 13:12 ` [PATCH v2 2/2] remoteproc: qcom: q6v5-mss: Improve readability of reset_assert Sibi Sankar
0 siblings, 2 replies; 5+ messages in thread
From: Sibi Sankar @ 2020-01-23 13:12 UTC (permalink / raw)
To: bjorn.andersson, evgreen, p.zabel
Cc: ohad, linux-arm-msm, linux-remoteproc, linux-kernel, agross, Sibi Sankar
This series aims to improve the general readability of the mss reset
sequence on SC7180 SoCs. No functional change intended.
v2:
* Use regmap_read_poll_timeout for halt_nav and halt_axi
* Redefine CONN_BOX_SPARE_0 to AXI_GATING_VALID_OVERRIDE
* Update more details about pipeline glitch issue
* Drop 2,3 patches from v1
Sibi Sankar (2):
remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout
remoteproc: qcom: q6v5-mss: Improve readability of reset_assert
drivers/remoteproc/qcom_q6v5_mss.c | 42 ++++++++++++++----------------
1 file changed, 19 insertions(+), 23 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout
2020-01-23 13:12 [PATCH v2 0/2] Improve general readability of MSS on SC7180 Sibi Sankar
@ 2020-01-23 13:12 ` Sibi Sankar
2020-01-23 22:53 ` Evan Green
2020-01-23 13:12 ` [PATCH v2 2/2] remoteproc: qcom: q6v5-mss: Improve readability of reset_assert Sibi Sankar
1 sibling, 1 reply; 5+ messages in thread
From: Sibi Sankar @ 2020-01-23 13:12 UTC (permalink / raw)
To: bjorn.andersson, evgreen, p.zabel
Cc: ohad, linux-arm-msm, linux-remoteproc, linux-kernel, agross, Sibi Sankar
Replace the loop for HALT_ACK detection with regmap_read_poll_timeout.
Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
---
drivers/remoteproc/qcom_q6v5_mss.c | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index 899ed769a343b..89ab96c21a44a 100644
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -72,7 +72,8 @@
#define NAV_AXI_HALTACK_BIT BIT(1)
#define NAV_AXI_IDLE_BIT BIT(2)
-#define HALT_ACK_TIMEOUT_MS 100
+#define HALT_ACK_TIMEOUT_US 100000
+#define NAV_HALT_ACK_TIMEOUT_US 200
/* QDSP6SS_RESET */
#define Q6SS_STOP_CORE BIT(0)
@@ -716,7 +717,6 @@ static void q6v5proc_halt_axi_port(struct q6v5 *qproc,
struct regmap *halt_map,
u32 offset)
{
- unsigned long timeout;
unsigned int val;
int ret;
@@ -729,14 +729,8 @@ static void q6v5proc_halt_axi_port(struct q6v5 *qproc,
regmap_write(halt_map, offset + AXI_HALTREQ_REG, 1);
/* Wait for halt */
- timeout = jiffies + msecs_to_jiffies(HALT_ACK_TIMEOUT_MS);
- for (;;) {
- ret = regmap_read(halt_map, offset + AXI_HALTACK_REG, &val);
- if (ret || val || time_after(jiffies, timeout))
- break;
-
- msleep(1);
- }
+ regmap_read_poll_timeout(halt_map, offset + AXI_HALTACK_REG, val,
+ val, 1000, HALT_ACK_TIMEOUT_US);
ret = regmap_read(halt_map, offset + AXI_IDLE_REG, &val);
if (ret || !val)
@@ -750,7 +744,6 @@ static void q6v5proc_halt_nav_axi_port(struct q6v5 *qproc,
struct regmap *halt_map,
u32 offset)
{
- unsigned long timeout;
unsigned int val;
int ret;
@@ -764,15 +757,9 @@ static void q6v5proc_halt_nav_axi_port(struct q6v5 *qproc,
NAV_AXI_HALTREQ_BIT);
/* Wait for halt ack*/
- timeout = jiffies + msecs_to_jiffies(HALT_ACK_TIMEOUT_MS);
- for (;;) {
- ret = regmap_read(halt_map, offset, &val);
- if (ret || (val & NAV_AXI_HALTACK_BIT) ||
- time_after(jiffies, timeout))
- break;
-
- udelay(5);
- }
+ regmap_read_poll_timeout(halt_map, offset, val,
+ (val & NAV_AXI_HALTACK_BIT),
+ 5, NAV_HALT_ACK_TIMEOUT_US);
ret = regmap_read(halt_map, offset, &val);
if (ret || !(val & NAV_AXI_IDLE_BIT))
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] remoteproc: qcom: q6v5-mss: Improve readability of reset_assert
2020-01-23 13:12 [PATCH v2 0/2] Improve general readability of MSS on SC7180 Sibi Sankar
2020-01-23 13:12 ` [PATCH v2 1/2] remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout Sibi Sankar
@ 2020-01-23 13:12 ` Sibi Sankar
2020-01-23 22:54 ` Evan Green
1 sibling, 1 reply; 5+ messages in thread
From: Sibi Sankar @ 2020-01-23 13:12 UTC (permalink / raw)
To: bjorn.andersson, evgreen, p.zabel
Cc: ohad, linux-arm-msm, linux-remoteproc, linux-kernel, agross, Sibi Sankar
Define AXI_GATING_VALID_OVERRIDE and fixup comments to improve readability
of Q6 modem reset sequence on SC7180 SoCs.
Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
---
drivers/remoteproc/qcom_q6v5_mss.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index 89ab96c21a44a..a1cc9cbe038f1 100644
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -71,6 +71,7 @@
#define NAV_AXI_HALTREQ_BIT BIT(0)
#define NAV_AXI_HALTACK_BIT BIT(1)
#define NAV_AXI_IDLE_BIT BIT(2)
+#define AXI_GATING_VALID_OVERRIDE BIT(0)
#define HALT_ACK_TIMEOUT_US 100000
#define NAV_HALT_ACK_TIMEOUT_US 200
@@ -415,16 +416,24 @@ static int q6v5_reset_assert(struct q6v5 *qproc)
ret = reset_control_reset(qproc->mss_restart);
reset_control_deassert(qproc->pdc_reset);
} else if (qproc->has_halt_nav) {
- /* SWAR using CONN_BOX_SPARE_0 for pipeline glitch issue */
+ /*
+ * When the AXI pipeline is being reset with the Q6 modem partly
+ * operational there is possibility of AXI valid signal to
+ * glitch, leading to spurious transactions and Q6 hangs. A work
+ * around is employed by asserting the AXI_GATING_VALID_OVERRIDE
+ * BIT before triggering Q6 MSS reset. Both the HALTREQ and
+ * AXI_GATING_VALID_OVERRIDE are withdrawn post MSS assert
+ * followed by a MSS deassert, while holding the PDC reset.
+ */
reset_control_assert(qproc->pdc_reset);
regmap_update_bits(qproc->conn_map, qproc->conn_box,
- BIT(0), BIT(0));
+ AXI_GATING_VALID_OVERRIDE, 1);
regmap_update_bits(qproc->halt_nav_map, qproc->halt_nav,
NAV_AXI_HALTREQ_BIT, 0);
reset_control_assert(qproc->mss_restart);
reset_control_deassert(qproc->pdc_reset);
regmap_update_bits(qproc->conn_map, qproc->conn_box,
- BIT(0), 0);
+ AXI_GATING_VALID_OVERRIDE, 0);
ret = reset_control_deassert(qproc->mss_restart);
} else {
ret = reset_control_assert(qproc->mss_restart);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout
2020-01-23 13:12 ` [PATCH v2 1/2] remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout Sibi Sankar
@ 2020-01-23 22:53 ` Evan Green
0 siblings, 0 replies; 5+ messages in thread
From: Evan Green @ 2020-01-23 22:53 UTC (permalink / raw)
To: Sibi Sankar
Cc: Bjorn Andersson, Philipp Zabel, Ohad Ben Cohen, linux-arm-msm,
linux-remoteproc, LKML, Andy Gross
On Thu, Jan 23, 2020 at 5:13 AM Sibi Sankar <sibis@codeaurora.org> wrote:
>
> Replace the loop for HALT_ACK detection with regmap_read_poll_timeout.
>
> Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
Reviewed-by: Evan Green <evgreen@chromium.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] remoteproc: qcom: q6v5-mss: Improve readability of reset_assert
2020-01-23 13:12 ` [PATCH v2 2/2] remoteproc: qcom: q6v5-mss: Improve readability of reset_assert Sibi Sankar
@ 2020-01-23 22:54 ` Evan Green
0 siblings, 0 replies; 5+ messages in thread
From: Evan Green @ 2020-01-23 22:54 UTC (permalink / raw)
To: Sibi Sankar
Cc: Bjorn Andersson, Philipp Zabel, Ohad Ben Cohen, linux-arm-msm,
linux-remoteproc, LKML, Andy Gross
On Thu, Jan 23, 2020 at 5:13 AM Sibi Sankar <sibis@codeaurora.org> wrote:
>
> Define AXI_GATING_VALID_OVERRIDE and fixup comments to improve readability
> of Q6 modem reset sequence on SC7180 SoCs.
>
> Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
Very nice, thank you!
Reviewed-by: Evan Green <evgreen@chromium.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-23 22:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-23 13:12 [PATCH v2 0/2] Improve general readability of MSS on SC7180 Sibi Sankar
2020-01-23 13:12 ` [PATCH v2 1/2] remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout Sibi Sankar
2020-01-23 22:53 ` Evan Green
2020-01-23 13:12 ` [PATCH v2 2/2] remoteproc: qcom: q6v5-mss: Improve readability of reset_assert Sibi Sankar
2020-01-23 22:54 ` Evan Green
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).