soc: qcom: mdt_loader: Remove pas id parameter

pas id is not used in qcom_mdt_load_no_init() and it should not
be used as it is non-PAS specific function and has no relation
to PAS specific mechanism.

Reviewed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
Acked-by: Jeff Johnson <jjohnson@kernel.org> # drivers/net/wireless/ath/ath12k/ahb.c
Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250807074311.2381713-2-mukesh.ojha@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
index 66a18830e66dac2acbe11751a8c250876e20d795..862d0718f6947bff055c91adb9a2ce97c59a9c1b 100644 (file)
--- a/drivers/media/platform/qcom/venus/firmware.c
+++ b/drivers/media/platform/qcom/venus/firmware.c
@@ -136,8 +136,8 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
                ret = qcom_mdt_load(dev, mdt, fwname, VENUS_PAS_ID,
                                    mem_va, *mem_phys, *mem_size, NULL);
        else
-               ret = qcom_mdt_load_no_init(dev, mdt, fwname, VENUS_PAS_ID,
-                                           mem_va, *mem_phys, *mem_size, NULL);
+               ret = qcom_mdt_load_no_init(dev, mdt, fwname, mem_va,
+                                           *mem_phys, *mem_size, NULL);
 
        memunmap(mem_va);
 err_release_fw:

diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c
index 3b983f4e3268c6fbf1546bda6677d2bf2d985d86..b30527c402f6c024afd7d7417a456aa8dbfe70bf 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/ahb.c
+++ b/drivers/net/wireless/ath/ath12k/ahb.c
@@ -414,7 +414,7 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab)
                goto err_fw2;
        }
 
-       ret = qcom_mdt_load_no_init(dev, fw2, fw2_name, pasid, mem_region, mem_phys,
+       ret = qcom_mdt_load_no_init(dev, fw2, fw2_name, mem_region, mem_phys,
                                    mem_size, &mem_phys);
        if (ret) {
                ath12k_err(ab, "Failed to load MDT segments: %d\n", ret);

diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index 94af77baa7a1c5096f0663260c07a297c6bedd17..e98b7e03162c7acc1fec360e257cf0bd84328a62 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -317,7 +317,7 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw)
        struct qcom_adsp *adsp = rproc->priv;
        int ret;
 
-       ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0,
+       ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware,
                                    adsp->mem_region, adsp->mem_phys,
                                    adsp->mem_size, &adsp->mem_reloc);
        if (ret)

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 02e29171cbbee2d305827365ef7d2241b6eb786b..55a7da801183d54569452dbb48041fdc52bf9234 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -242,9 +242,8 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
                        goto release_dtb_firmware;
 
                ret = qcom_mdt_load_no_init(pas->dev, pas->dtb_firmware, pas->dtb_firmware_name,
-                                           pas->dtb_pas_id, pas->dtb_mem_region,
-                                           pas->dtb_mem_phys, pas->dtb_mem_size,
-                                           &pas->dtb_mem_reloc);
+                                           pas->dtb_mem_region, pas->dtb_mem_phys,
+                                           pas->dtb_mem_size, &pas->dtb_mem_reloc);
                if (ret)
                        goto release_dtb_metadata;
        }
@@ -307,7 +306,7 @@ static int qcom_pas_start(struct rproc *rproc)
        if (ret)
                goto disable_px_supply;
 
-       ret = qcom_mdt_load_no_init(pas->dev, pas->firmware, rproc->firmware, pas->pas_id,
+       ret = qcom_mdt_load_no_init(pas->dev, pas->firmware, rproc->firmware,
                                    pas->mem_region, pas->mem_phys, pas->mem_size,
                                    &pas->mem_reloc);
        if (ret)

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index 93648734a2f25427f71c6be42c011596572b3fb6..07c88623f597859302df5793f4614023663d1d98 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -757,7 +757,7 @@ static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
        int ret;
 
        ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware,
-                                   0, wcss->mem_region, wcss->mem_phys,
+                                   wcss->mem_region, wcss->mem_phys,
                                    wcss->mem_size, &wcss->mem_reloc);
        if (ret)
                return ret;

diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index dfd15d189087c427c9a158bf1e9f2b5a719cf1e4..74c415774657c86a97b461952e8010386e2618f5 100644 (file)
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -331,7 +331,7 @@ static bool qcom_mdt_bins_are_split(const struct firmware *fw, const char *fw_na
 }
 
 static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
-                          const char *fw_name, int pas_id, void *mem_region,
+                          const char *fw_name, void *mem_region,
                           phys_addr_t mem_phys, size_t mem_size,
                           phys_addr_t *reloc_base)
 {
@@ -458,7 +458,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,
        if (ret)
                return ret;
 
-       return __qcom_mdt_load(dev, fw, firmware, pas_id, mem_region, mem_phys,
+       return __qcom_mdt_load(dev, fw, firmware, mem_region, mem_phys,
                               mem_size, reloc_base);
 }
 EXPORT_SYMBOL_GPL(qcom_mdt_load);
@@ -468,7 +468,6 @@ EXPORT_SYMBOL_GPL(qcom_mdt_load);
  * @dev:       device handle to associate resources with
  * @fw:                firmware object for the mdt file
  * @firmware:  name of the firmware, for construction of segment file names
- * @pas_id:    PAS identifier
  * @mem_region:        allocated memory region to load firmware into
  * @mem_phys:  physical address of allocated memory region
  * @mem_size:  size of the allocated memory region
@@ -477,11 +476,10 @@ EXPORT_SYMBOL_GPL(qcom_mdt_load);
  * Returns 0 on success, negative errno otherwise.
  */
 int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw,
-                         const char *firmware, int pas_id,
-                         void *mem_region, phys_addr_t mem_phys,
+                         const char *firmware, void *mem_region, phys_addr_t mem_phys,
                          size_t mem_size, phys_addr_t *reloc_base)
 {
-       return __qcom_mdt_load(dev, fw, firmware, pas_id, mem_region, mem_phys,
+       return __qcom_mdt_load(dev, fw, firmware, mem_region, mem_phys,
                               mem_size, reloc_base);
 }
 EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init);

diff --git a/include/linux/soc/qcom/mdt_loader.h b/include/linux/soc/qcom/mdt_loader.h
index 9e8e6042119203989a0648db586665501a29e747..8ea8230579a20cdc1b4c06b4e5fb4a6ea955b6aa 100644 (file)
--- a/include/linux/soc/qcom/mdt_loader.h
+++ b/include/linux/soc/qcom/mdt_loader.h
@@ -24,7 +24,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,
                  phys_addr_t *reloc_base);
 
 int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw,
-                         const char *fw_name, int pas_id, void *mem_region,
+                         const char *fw_name, void *mem_region,
                          phys_addr_t mem_phys, size_t mem_size,
                          phys_addr_t *reloc_base);
 void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len,
@@ -54,9 +54,8 @@ static inline int qcom_mdt_load(struct device *dev, const struct firmware *fw,
 
 static inline int qcom_mdt_load_no_init(struct device *dev,
                                        const struct firmware *fw,
-                                       const char *fw_name, int pas_id,
-                                       void *mem_region, phys_addr_t mem_phys,
-                                       size_t mem_size,
+                                       const char *fw_name, void *mem_region,
+                                       phys_addr_t mem_phys, size_t mem_size,
                                        phys_addr_t *reloc_base)
 {
        return -ENODEV;