Most Qualcomm platforms feature Gunyah hypervisor, which typically handles Stage 2 IOMMU configuration. Additionally, SHM bridge setup is required to enable memory protection for both remoteproc metadata and its memory regions. When the aforementioned hypervisor is absent, the operating system must perform these configurations instead. We've been relying on the iommu property being present for this, but for remoteprocs that are already running like SoCCP the mappings are already in place, and any attempt to recreate them while active would lead to smmu faults and a non-functional remoteproc. Fix this by adding a needs_tzmem flag which ensures tzmem and SHM bridge setup is performed independent to the iommu property being present.
Signed-off-by: Ananthu C V <[email protected]> --- drivers/remoteproc/qcom_q6v5_pas.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 60a4337d9e51..cd7273fbcf98 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -61,6 +61,7 @@ struct qcom_pas_data { bool region_assign_shared; int region_assign_vmid; bool early_boot; + bool needs_tzmem; }; struct qcom_pas { @@ -914,8 +915,8 @@ static int qcom_pas_probe(struct platform_device *pdev) goto remove_ssr_sysmon; } - pas->pas_ctx->use_tzmem = rproc->has_iommu; - pas->dtb_pas_ctx->use_tzmem = rproc->has_iommu; + pas->pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu; + pas->dtb_pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu; if (desc->early_boot) pas->rproc->state = RPROC_DETACHED; @@ -1657,8 +1658,27 @@ static const struct qcom_pas_data kaanapali_soccp_resource = { .early_boot = true, }; +static const struct qcom_pas_data glymur_soccp_resource = { + .crash_reason_smem = 656, + .firmware_name = "soccp.mbn", + .dtb_firmware_name = "soccp_dtb.mbn", + .pas_id = 51, + .dtb_pas_id = 0x41, + .proxy_pd_names = (char*[]){ + "cx", + "mx", + NULL + }, + .ssr_name = "soccp", + .sysmon_name = "soccp", + .auto_boot = true, + .early_boot = true, + .needs_tzmem = true, +}; + static const struct of_device_id qcom_pas_of_match[] = { { .compatible = "qcom,eliza-adsp-pas", .data = &sm8550_adsp_resource }, + { .compatible = "qcom,glymur-soccp-pas", .data = &glymur_soccp_resource }, { .compatible = "qcom,kaanapali-soccp-pas", .data = &kaanapali_soccp_resource }, { .compatible = "qcom,milos-adsp-pas", .data = &sm8550_adsp_resource }, { .compatible = "qcom,milos-cdsp-pas", .data = &milos_cdsp_resource }, -- 2.43.0
