sugar/linux
1
0
Fork 0
Code Activity

soc: qcom: mdt_loader: Remove pas id parameter

Browse Source 
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>
This commit is contained in:
Mukesh Ojha
2025-08-07 13:13:10 +05:30
committed by Bjorn Andersson
parent aaf5aae37a
commit 0daf35da39
7 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/qcom/venus/firmware.c
View File

@@ -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, ret = qcom_mdt_load(dev, mdt, fwname, VENUS_PAS_ID,
mem_va, *mem_phys, *mem_size, NULL); mem_va, *mem_phys, *mem_size, NULL);
else else
ret = qcom_mdt_load_no_init(dev, mdt, fwname, VENUS_PAS_ID, ret = qcom_mdt_load_no_init(dev, mdt, fwname, mem_va,
mem_va, *mem_phys, *mem_size, NULL); *mem_phys, *mem_size, NULL);
memunmap(mem_va); memunmap(mem_va);
err_release_fw: err_release_fw:

2
drivers/net/wireless/ath/ath12k/ahb.c
View File

@@ -414,7 +414,7 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab)
goto err_fw2; 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); mem_size, &mem_phys);
if (ret) { if (ret) {
ath12k_err(ab, "Failed to load MDT segments: %d\n", ret); ath12k_err(ab, "Failed to load MDT segments: %d\n", ret);

2
drivers/remoteproc/qcom_q6v5_adsp.c
View File

@@ -317,7 +317,7 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw)
struct qcom_adsp *adsp = rproc->priv; struct qcom_adsp *adsp = rproc->priv;
int ret; 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_region, adsp->mem_phys,
adsp->mem_size, &adsp->mem_reloc); adsp->mem_size, &adsp->mem_reloc);
if (ret) if (ret)

7
drivers/remoteproc/qcom_q6v5_pas.c
View File

@@ -242,9 +242,8 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
goto release_dtb_firmware; goto release_dtb_firmware;
ret = qcom_mdt_load_no_init(pas->dev, pas->dtb_firmware, pas->dtb_firmware_name, 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_region, pas->dtb_mem_phys,
pas->dtb_mem_phys, pas->dtb_mem_size, pas->dtb_mem_size, &pas->dtb_mem_reloc);
&pas->dtb_mem_reloc);
if (ret) if (ret)
goto release_dtb_metadata; goto release_dtb_metadata;
} }
@@ -307,7 +306,7 @@ static int qcom_pas_start(struct rproc *rproc)
if (ret) if (ret)
goto disable_px_supply; 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_region, pas->mem_phys, pas->mem_size,
&pas->mem_reloc); &pas->mem_reloc);
if (ret) if (ret)

2
drivers/remoteproc/qcom_q6v5_wcss.c
View File

@@ -757,7 +757,7 @@ static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
int ret; int ret;
ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware, 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); wcss->mem_size, &wcss->mem_reloc);
if (ret) if (ret)
return ret; return ret;

10
drivers/soc/qcom/mdt_loader.c
View File

@@ -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, 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 mem_phys, size_t mem_size,
phys_addr_t *reloc_base) phys_addr_t *reloc_base)
{ {
@@ -458,7 +458,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,
if (ret) if (ret)
return 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); mem_size, reloc_base);
} }
EXPORT_SYMBOL_GPL(qcom_mdt_load); EXPORT_SYMBOL_GPL(qcom_mdt_load);
@@ -468,7 +468,6 @@ EXPORT_SYMBOL_GPL(qcom_mdt_load);
* @dev: device handle to associate resources with * @dev: device handle to associate resources with
* @fw: firmware object for the mdt file * @fw: firmware object for the mdt file
* @firmware: name of the firmware, for construction of segment file names * @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_region: allocated memory region to load firmware into
* @mem_phys: physical address of allocated memory region * @mem_phys: physical address of allocated memory region
* @mem_size: size of the 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. * Returns 0 on success, negative errno otherwise.
*/ */
int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw, int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw,
const char *firmware, int pas_id, const char *firmware, void *mem_region, phys_addr_t mem_phys,
void *mem_region, phys_addr_t mem_phys,
size_t mem_size, phys_addr_t *reloc_base) 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); mem_size, reloc_base);
} }
EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init); EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init);

7
include/linux/soc/qcom/mdt_loader.h
View File

@@ -24,7 +24,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,
phys_addr_t *reloc_base); phys_addr_t *reloc_base);
int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw, 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 mem_phys, size_t mem_size,
phys_addr_t *reloc_base); phys_addr_t *reloc_base);
void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len, 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, static inline int qcom_mdt_load_no_init(struct device *dev,
const struct firmware *fw, const struct firmware *fw,
const char *fw_name, int pas_id, const char *fw_name, void *mem_region,
void *mem_region, phys_addr_t mem_phys, phys_addr_t mem_phys, size_t mem_size,
size_t mem_size,
phys_addr_t *reloc_base) phys_addr_t *reloc_base)
{ {
return -ENODEV; return -ENODEV;