remoteproc: qcom_q6v5_mss: Re-order writes to the IMEM region

[ Upstream commit 7b22b7719fc17d5979a991c918c868ab041be5c8 ]

Any write access to the IMEM region when the Q6 is setting up XPU
protection on it will result in a XPU violation. Fix this by ensuring
IMEM writes related to the MBA post-mortem logs happen before the Q6
is brought out of reset.

Fixes: 318130cc9362 ("remoteproc: qcom_q6v5_mss: Add MBA log extraction support")
Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20240819073020.3291287-1-quic_sibis@quicinc.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index 2a42215ce8e07b25cb45e708aa62f9ebe83bb88c..32c3531b20c70af61eaa05128a38ed3ec6135cce 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -1162,6 +1162,9 @@ static int q6v5_mba_load(struct q6v5 *qproc)
                goto disable_active_clks;
        }
 
+       if (qproc->has_mba_logs)
+               qcom_pil_info_store("mba", qproc->mba_phys, MBA_LOG_SIZE);
+
        writel(qproc->mba_phys, qproc->rmb_base + RMB_MBA_IMAGE_REG);
        if (qproc->dp_size) {
                writel(qproc->mba_phys + SZ_1M, qproc->rmb_base + RMB_PMI_CODE_START_REG);
@@ -1172,9 +1175,6 @@ static int q6v5_mba_load(struct q6v5 *qproc)
        if (ret)
                goto reclaim_mba;
 
-       if (qproc->has_mba_logs)
-               qcom_pil_info_store("mba", qproc->mba_phys, MBA_LOG_SIZE);
-
        ret = q6v5_rmb_mba_wait(qproc, 0, 5000);
        if (ret == -ETIMEDOUT) {
                dev_err(qproc->dev, "MBA boot timed out\n");