From: Melody Olvera <quic_molvera@xxxxxxxxxxx> When attaching a running Q6, the remoteproc driver needs a way to communicate with the Q6 using rmb registers, so allow the rmb register to be gotten from the device tree if present. Signed-off-by: Melody Olvera <quic_molvera@xxxxxxxxxxx> Signed-off-by: Komal Bajaj <quic_kbajaj@xxxxxxxxxxx> --- drivers/remoteproc/qcom_q6v5.h | 8 ++++++++ drivers/remoteproc/qcom_q6v5_pas.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/drivers/remoteproc/qcom_q6v5.h b/drivers/remoteproc/qcom_q6v5.h index 5a859c41896e..95824d5b64ce 100644 --- a/drivers/remoteproc/qcom_q6v5.h +++ b/drivers/remoteproc/qcom_q6v5.h @@ -7,6 +7,12 @@ #include <linux/completion.h> #include <linux/soc/qcom/qcom_aoss.h> +#define RMB_BOOT_WAIT_REG 0x8 +#define RMB_BOOT_CONT_REG 0xC +#define RMB_Q6_BOOT_STATUS_REG 0x10 + +#define RMB_POLL_MAX_TIMES 250 + struct icc_path; struct rproc; struct qcom_smem_state; @@ -16,6 +22,8 @@ struct qcom_q6v5 { struct device *dev; struct rproc *rproc; + void __iomem *rmb_base; + struct qcom_smem_state *state; struct qmp *qmp; diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 8458bcfe9e19..b9759f6b2283 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -770,6 +770,10 @@ static int adsp_probe(struct platform_device *pdev) goto free_rproc; adsp->proxy_pd_count = ret; + adsp->q6v5.rmb_base = devm_platform_ioremap_resource_byname(pdev, "rmb"); + if (IS_ERR(adsp->q6v5.rmb_base)) + adsp->q6v5.rmb_base = NULL; + ret = qcom_q6v5_init(&adsp->q6v5, pdev, rproc, desc->crash_reason_smem, desc->load_state, qcom_pas_handover); if (ret) -- 2.42.0