remoteproc: qcom_q6v5_pas: Unload lite firmware on ADSP

The UEFI loads a lite variant of the ADSP firmware to support charging
use cases. The kernel needs to unload and reload it with the firmware
that has full feature support for audio. This patch arbitarily shutsdown
the lite firmware before loading the full firmware.

Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20240212-x1e80100-remoteproc-v2-3-604614367f38@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 3e2ced63a3e11f5629edd06b24058d6dd22fcb90..54d8005d40a3435cf1207780de7fe6d99c8e92f4 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -41,6 +41,7 @@ struct adsp_data {
        const char *dtb_firmware_name;
        int pas_id;
        int dtb_pas_id;
+       int lite_pas_id;
        unsigned int minidump_id;
        bool auto_boot;
        bool decrypt_shutdown;
@@ -77,6 +78,7 @@ struct qcom_adsp {
        const char *dtb_firmware_name;
        int pas_id;
        int dtb_pas_id;
+       int lite_pas_id;
        unsigned int minidump_id;
        int crash_reason_smem;
        bool decrypt_shutdown;
@@ -218,6 +220,9 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw)
        /* Store firmware handle to be used in adsp_start() */
        adsp->firmware = fw;
 
+       if (adsp->lite_pas_id)
+               ret = qcom_scm_pas_shutdown(adsp->lite_pas_id);
+
        if (adsp->dtb_pas_id) {
                ret = request_firmware(&adsp->dtb_firmware, adsp->dtb_firmware_name, adsp->dev);
                if (ret) {
@@ -720,6 +725,7 @@ static int adsp_probe(struct platform_device *pdev)
        adsp->rproc = rproc;
        adsp->minidump_id = desc->minidump_id;
        adsp->pas_id = desc->pas_id;
+       adsp->lite_pas_id = desc->lite_pas_id;
        adsp->info_name = desc->sysmon_name;
        adsp->decrypt_shutdown = desc->decrypt_shutdown;
        adsp->region_assign_idx = desc->region_assign_idx;
@@ -1018,6 +1024,7 @@ static const struct adsp_data x1e80100_adsp_resource = {
        .dtb_firmware_name = "adsp_dtb.mdt",
        .pas_id = 1,
        .dtb_pas_id = 0x24,
+       .lite_pas_id = 0x1f,
        .minidump_id = 5,
        .auto_boot = true,
        .proxy_pd_names = (char*[]){