diff options
| author | Sibi Sankar <quic_sibis@quicinc.com> | 2024-08-19 09:30:20 +0200 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2024-11-16 04:36:38 +0100 |
| commit | 7b22b7719fc17d5979a991c918c868ab041be5c8 (patch) | |
| tree | 51b5e94850240a0a8ab3bcab9bae7b0fba2e9f50 /drivers/remoteproc | |
| parent | remoteproc: qcom_wcnss_iris: Simplify with dev_err_probe() (diff) | |
| download | linux-7b22b7719fc17d5979a991c918c868ab041be5c8.tar.xz linux-7b22b7719fc17d5979a991c918c868ab041be5c8.zip | |
remoteproc: qcom_q6v5_mss: Re-order writes to the IMEM region
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>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/qcom_q6v5_mss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index aaddbaf1099e..e78bd986dc3f 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1158,6 +1158,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); @@ -1168,9 +1171,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"); |