remoteproc: qcom_q6v5_mss: Monitor MSS_STATUS for boot completion
Subsystems (2)
PATCH 1/1 remoteproc: qcom_q6v5_mss: Monitor MSS_STATUS for boot completion
On secure devices there exists a race condition which could lock the MSS CONFIG AHB bus thus preventing access to BOOT_STATUS register during SSR. Switch to polling the MSS_STATUS register with an additional 10 us delay to reliably track boot completion.
--- drivers/remoteproc/qcom_q6v5_mss.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/remoteproc/qcom_q6v5_mss.c +6 -6
@@ -113,8 +113,6 @@#define QDSP6SS_SLEEP 0x3C#define QDSP6SS_BOOT_CORE_START 0x400#define QDSP6SS_BOOT_CMD 0x404 -#define QDSP6SS_BOOT_STATUS 0x408 -#define BOOT_STATUS_TIMEOUT_US 200#define BOOT_FSM_TIMEOUT 10000struct reg_info {
@@ -580,13 +578,15 @@ static int q6v5proc_reset(struct q6v5 *qproc)/* De-assert the Q6 stop core signal */ writel (1 , qproc->reg_base +QDSP6SS_BOOT_CORE_START ); +/* Wait for 10 us for any staggering logic to settle */ +usleep_range (10 ,20 ); +/* Trigger the boot FSM to start the Q6 out-of-reset sequence */ writel (1 , qproc->reg_base +QDSP6SS_BOOT_CMD ); -/* Poll the QDSP6SS_BOOT_STATUS for FSM completion */ - ret =readl_poll_timeout (qproc->reg_base +QDSP6SS_BOOT_STATUS , - val, (val &BIT (0 )) !=0 ,1 , -BOOT_STATUS_TIMEOUT_US ); +/* Poll the MSS_STATUS for FSM completion */ + ret =readl_poll_timeout (qproc->rmb_base +RMB_MBA_MSS_STATUS , + val, (val &BIT (0 )) !=0 ,10 ,BOOT_FSM_TIMEOUT );if (ret) {dev_err (qproc->dev,"Boot FSM failed to complete.\n" );/* Reset the modem so that boot FSM is in reset state */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
This patch was applied to andersson/remoteproc.git (refs/heads/for-next).
Hello:
This patch was applied to andersson/remoteproc.git (refs/heads/for-next).
Quoted 8 lines · On Thu, 16 Jul 2020 17:35:14 +0530 you wrote:
On secure devices there exists a race condition which could lock the MSS CONFIG AHB bus thus preventing access to
BOOT_STATUSregister during SSR. Switch to polling theMSS_STATUSregister with an additional 10 us delay to reliably track boot completion.Signed-off-by Sibi Sankar <[email protected]>[...]
Here is a summary with links:
- remoteproc: qcom_q6v5_mss: Monitor MSS_STATUS for boot completion
https://git.kernel.org/andersson/remoteproc/c/4e6751a1cfab85b7a1c054cf3d55f12322e1ee3b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot