Commit 7b22b771 authored by Sibi Sankar's avatar Sibi Sankar Committed by Bjorn Andersson
Browse files

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: 318130cc ("remoteproc: qcom_q6v5_mss: Add MBA log extraction support")
Signed-off-by: default avatarSibi Sankar <quic_sibis@quicinc.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Tested-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20240819073020.3291287-1-quic_sibis@quicinc.com


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 70d35819

drivers/remoteproc/qcom_q6v5_mss.c

+3 −3
Original line number Diff line number Diff line
@@ -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");