soc: qcom: mdt_loader: Remove pas id parameter

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Mukesh Ojha and committed by

Bjorn Andersson 8 months ago 0daf35da aaf5aae3

+15 -19

7 changed files

expand all

drivers

media

platform

qcom

venus

firmware.c

net

wireless

ath

ath12k

ahb.c

remoteproc

qcom_q6v5_adsp.c

qcom_q6v5_pas.c

qcom_q6v5_wcss.c

soc

qcom

mdt_loader.c

include

linux

soc

qcom

mdt_loader.h

+2 -2

drivers/media/platform/qcom/venus/firmware.c

··· 136 136 ret = qcom_mdt_load(dev, mdt, fwname, VENUS_PAS_ID, 137 137 mem_va, *mem_phys, *mem_size, NULL); 138 138 else 139 - ret = qcom_mdt_load_no_init(dev, mdt, fwname, VENUS_PAS_ID, 140 - mem_va, *mem_phys, *mem_size, NULL); 139 + ret = qcom_mdt_load_no_init(dev, mdt, fwname, mem_va, 140 + *mem_phys, *mem_size, NULL); 141 141 142 142 memunmap(mem_va); 143 143 err_release_fw:

+1 -1

drivers/net/wireless/ath/ath12k/ahb.c

··· 414 414 goto err_fw2; 415 415 } 416 416 417 - ret = qcom_mdt_load_no_init(dev, fw2, fw2_name, pasid, mem_region, mem_phys, 417 + ret = qcom_mdt_load_no_init(dev, fw2, fw2_name, mem_region, mem_phys, 418 418 mem_size, &mem_phys); 419 419 if (ret) { 420 420 ath12k_err(ab, "Failed to load MDT segments: %d\n", ret);

+1 -1

drivers/remoteproc/qcom_q6v5_adsp.c

··· 317 317 struct qcom_adsp *adsp = rproc->priv; 318 318 int ret; 319 319 320 - ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0, 320 + ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 321 321 adsp->mem_region, adsp->mem_phys, 322 322 adsp->mem_size, &adsp->mem_reloc); 323 323 if (ret)

+3 -4

drivers/remoteproc/qcom_q6v5_pas.c

··· 242 242 goto release_dtb_firmware; 243 243 244 244 ret = qcom_mdt_load_no_init(pas->dev, pas->dtb_firmware, pas->dtb_firmware_name, 245 - pas->dtb_pas_id, pas->dtb_mem_region, 246 - pas->dtb_mem_phys, pas->dtb_mem_size, 247 - &pas->dtb_mem_reloc); 245 + pas->dtb_mem_region, pas->dtb_mem_phys, 246 + pas->dtb_mem_size, &pas->dtb_mem_reloc); 248 247 if (ret) 249 248 goto release_dtb_metadata; 250 249 } ··· 306 307 if (ret) 307 308 goto disable_px_supply; 308 309 309 - ret = qcom_mdt_load_no_init(pas->dev, pas->firmware, rproc->firmware, pas->pas_id, 310 + ret = qcom_mdt_load_no_init(pas->dev, pas->firmware, rproc->firmware, 310 311 pas->mem_region, pas->mem_phys, pas->mem_size, 311 312 &pas->mem_reloc); 312 313 if (ret)

+1 -1

drivers/remoteproc/qcom_q6v5_wcss.c

··· 757 757 int ret; 758 758 759 759 ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware, 760 - 0, wcss->mem_region, wcss->mem_phys, 760 + wcss->mem_region, wcss->mem_phys, 761 761 wcss->mem_size, &wcss->mem_reloc); 762 762 if (ret) 763 763 return ret;

+4 -6

drivers/soc/qcom/mdt_loader.c

··· 331 331 } 332 332 333 333 static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, 334 - const char *fw_name, int pas_id, void *mem_region, 334 + const char *fw_name, void *mem_region, 335 335 phys_addr_t mem_phys, size_t mem_size, 336 336 phys_addr_t *reloc_base) 337 337 { ··· 458 458 if (ret) 459 459 return ret; 460 460 461 - return __qcom_mdt_load(dev, fw, firmware, pas_id, mem_region, mem_phys, 461 + return __qcom_mdt_load(dev, fw, firmware, mem_region, mem_phys, 462 462 mem_size, reloc_base); 463 463 } 464 464 EXPORT_SYMBOL_GPL(qcom_mdt_load); ··· 468 468 * @dev: device handle to associate resources with 469 469 * @fw: firmware object for the mdt file 470 470 * @firmware: name of the firmware, for construction of segment file names 471 - * @pas_id: PAS identifier 472 471 * @mem_region: allocated memory region to load firmware into 473 472 * @mem_phys: physical address of allocated memory region 474 473 * @mem_size: size of the allocated memory region ··· 476 477 * Returns 0 on success, negative errno otherwise. 477 478 */ 478 479 int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw, 479 - const char *firmware, int pas_id, 480 - void *mem_region, phys_addr_t mem_phys, 480 + const char *firmware, void *mem_region, phys_addr_t mem_phys, 481 481 size_t mem_size, phys_addr_t *reloc_base) 482 482 { 483 - return __qcom_mdt_load(dev, fw, firmware, pas_id, mem_region, mem_phys, 483 + return __qcom_mdt_load(dev, fw, firmware, mem_region, mem_phys, 484 484 mem_size, reloc_base); 485 485 } 486 486 EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init);

+3 -4

include/linux/soc/qcom/mdt_loader.h

··· 24 24 phys_addr_t *reloc_base); 25 25 26 26 int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw, 27 - const char *fw_name, int pas_id, void *mem_region, 27 + const char *fw_name, void *mem_region, 28 28 phys_addr_t mem_phys, size_t mem_size, 29 29 phys_addr_t *reloc_base); 30 30 void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len, ··· 54 54 55 55 static inline int qcom_mdt_load_no_init(struct device *dev, 56 56 const struct firmware *fw, 57 - const char *fw_name, int pas_id, 58 - void *mem_region, phys_addr_t mem_phys, 59 - size_t mem_size, 57 + const char *fw_name, void *mem_region, 58 + phys_addr_t mem_phys, size_t mem_size, 60 59 phys_addr_t *reloc_base) 61 60 { 62 61 return -ENODEV;