ath12k_ahb_power_up() calls qcom_mdt_load(), which bundles metadata initialization, memory setup, and segment loading into a single API that does not expose a PAS context. Later it calls qcom_pas_auth_and_reset() for TrustZone authentication, which is the intended behaviour. However, a new qcom_mdt_pas_load() has recently been introduced that works with a PAS context and can handle everything qcom_mdt_load() provides, along with additional functionality such as shmbridge creation and retrieving memory from the shmbridge buffer when the same remote processor needs to run while Linux runs at EL2. Replace qcom_mdt_load() with qcom_pas_context_init() + qcom_mdt_pas_load() and replace qcom_pas_auth_and_reset() with qcom_pas_prepare_and_auth_reset(), using a stack-allocated struct qcom_pas_context in ath12k_ahb_power_up(). The non-scm_auth path retains qcom_mdt_load_no_init() with the caller-provided mem_region. Apply the same pattern to ath12k_ahb_load_auth_shared_fw() for consistency. Acked-by: Jeff Johnson Signed-off-by: Mukesh Ojha --- drivers/net/wireless/ath/ath12k/ahb.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c index 8a3919675134..75d3141f968f 100644 --- a/drivers/net/wireless/ath/ath12k/ahb.c +++ b/drivers/net/wireless/ath/ath12k/ahb.c @@ -418,6 +418,7 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab) struct ath12k_ahb_rproc_info *rproc_info = ab_ahb->rproc_info; char fw_name[ATH12K_USERPD_FW_NAME_LEN]; char fw2_name[ATH12K_USERPD_FW_NAME_LEN]; + struct qcom_pas_context ctx; struct device *dev = ab->dev; const struct firmware *fw, *fw2; unsigned long time_left; @@ -451,14 +452,15 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab) ATH12K_AHB_UPD_SWID; /* Load FW image to a reserved memory location */ - if (ab_ahb->scm_auth_enabled) - ret = qcom_mdt_load(dev, fw, fw_name, pasid, rproc_info->mem_region, - rproc_info->mem_phys, rproc_info->mem_size, - NULL); - else + if (ab_ahb->scm_auth_enabled) { + qcom_pas_context_init(&ctx, dev, pasid, + rproc_info->mem_phys, rproc_info->mem_size); + ret = qcom_mdt_pas_load(&ctx, fw, fw_name, NULL); + } else { ret = qcom_mdt_load_no_init(dev, fw, fw_name, rproc_info->mem_region, rproc_info->mem_phys, rproc_info->mem_size, NULL); + } if (ret) { ath12k_err(ab, "Failed to load MDT segments: %d\n", ret); goto err_fw; @@ -492,7 +494,7 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab) if (ab_ahb->scm_auth_enabled) { /* Authenticate FW image using peripheral ID */ - ret = qcom_pas_auth_and_reset(pasid); + ret = qcom_pas_prepare_and_auth_reset(&ctx); if (ret) { ath12k_err(ab, "failed to boot the remote processor %d\n", ret); goto err_fw2; @@ -1056,6 +1058,7 @@ static int ath12k_ahb_load_auth_shared_fw(struct ath12k_base *ab, struct ath12k_ahb_rproc_info *rproc_info, const char *fw_name, u32 pasid) { + struct qcom_pas_context ctx; int ret; const struct firmware *fw __free(firmware) = NULL; @@ -1074,14 +1077,16 @@ static int ath12k_ahb_load_auth_shared_fw(struct ath12k_base *ab, ath12k_dbg(ab, ATH12K_DBG_AHB, "loading firmware %s, size %zd\n", fw_name, fw->size); - ret = qcom_mdt_load(ab->dev, fw, fw_name, pasid, rproc_info->mem_region, - rproc_info->mem_phys, rproc_info->mem_size, NULL); + qcom_pas_context_init(&ctx, ab->dev, pasid, + rproc_info->mem_phys, rproc_info->mem_size); + + ret = qcom_mdt_pas_load(&ctx, fw, fw_name, NULL); if (ret) { ath12k_err(ab, "failed to load RO firmware %s: %d\n", fw_name, ret); return ret; } - ret = qcom_pas_auth_and_reset(pasid); + ret = qcom_pas_prepare_and_auth_reset(&ctx); if (ret) ath12k_err(ab, "failed to authenticate and boot shared firmware: %d\n", ret); -- 2.55.0