Improve general readability of MSS on SC7180
Subsystems (2)
v2 cover Improve general readability of MSS on SC7180
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(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v2 1/2 remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout
Replace the loop for HALT_ACK detection with regmap_read_poll_timeout.
--- drivers/remoteproc/qcom_q6v5_mss.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-)
drivers/remoteproc/qcom_q6v5_mss.c +7 -20
@@ -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 ))
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v2 1/2] remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout
Quoted 4 lines · Sibi Sankar
Replace the loop for
HALT_ACKdetection withregmap_read_poll_timeout.Signed-off-by Sibi Sankar <[email protected]>
PATCH v2 2/2 remoteproc: qcom: q6v5-mss: Improve readability of reset_assert
In reply to Sibi SankarDefine AXI_GATING_VALID_OVERRIDE and fixup comments to improve readability of Q6 modem reset sequence on SC7180 SoCs.
--- drivers/remoteproc/qcom_q6v5_mss.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/remoteproc/qcom_q6v5_mss.c +12 -3
@@ -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);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v2 2/2] remoteproc: qcom: q6v5-mss: Improve readability of reset_assert
Quoted 5 lines · Sibi Sankar
Define
AXI_GATING_VALID_OVERRIDEand fixup comments to improve readability of Q6 modem reset sequence on SC7180 SoCs.Signed-off-by Sibi Sankar <[email protected]>
Very nice, thank you!
This series was applied to andersson/remoteproc.git (refs/heads/for-next).
Hello:
This series was applied to andersson/remoteproc.git (refs/heads/for-next).
Quoted 10 lines · On Thu, 23 Jan 2020 18:42:34 +0530 you wrote:
This series aims to improve the general readability of the mss reset sequence on SC7180 SoCs. No functional change intended.
v2:
* Useregmap_read_poll_timeoutforhalt_navandhalt_axi
* RedefineCONN_BOX_SPARE_0toAXI_GATING_VALID_OVERRIDE
* Update more details about pipeline glitch issue
* Drop 2,3 patches from v1[...]
Here is a summary with links:
- [v2,1/2] remoteproc: qcom: q6v5-mss: Use regmap_read_poll_timeout
https://git.kernel.org/andersson/remoteproc/c/01bf3fec38e9188846f6755cd29da515f5852bc5 - [v2,2/2] remoteproc: qcom: q6v5-mss: Improve readability of reset_assert https://git.kernel.org/andersson/remoteproc/c/600c39b34369e2a1bf78eb67afb99ce550f271cc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot