On Thu, Nov 28, 2024 at 09:42:11AM +0100, Arnaud Pouliquen wrote: > With the introduction of the load_fw() operation in the rproc_ops > structure, we need to clarify the difference in the use of the load() > and load_fw() ops. > > The legacy load() is dedicated to loading the ELF segments into memory. > Rename this to a more explicit name: load_segments(). This is introducing more code churn than is worth it. Please enhance the usage comment for ->load() as part of the previous patch and drop this one. I am done reviewing this set. Thanks, Mathieu > > Suggested-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx> > Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@xxxxxxxxxxx> > --- > Update vs version V14: > Fix: Rename missing load() to load_segments() in drivers/remoteproc/pru_rproc.c. > > Reported-by: kernel test robot <lkp@xxxxxxxxx> > Closes: https://lore.kernel.org/oe-kbuild-all/202411281332.Ra70nJAW-lkp@xxxxxxxxx/ > > --- > drivers/remoteproc/imx_dsp_rproc.c | 2 +- > drivers/remoteproc/imx_rproc.c | 2 +- > drivers/remoteproc/meson_mx_ao_arc.c | 2 +- > drivers/remoteproc/mtk_scp.c | 2 +- > drivers/remoteproc/pru_rproc.c | 2 +- > drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- > drivers/remoteproc/qcom_q6v5_mss.c | 2 +- > drivers/remoteproc/qcom_q6v5_pas.c | 4 ++-- > drivers/remoteproc/qcom_q6v5_wcss.c | 4 ++-- > drivers/remoteproc/qcom_wcnss.c | 2 +- > drivers/remoteproc/rcar_rproc.c | 2 +- > drivers/remoteproc/remoteproc_core.c | 4 ++-- > drivers/remoteproc/remoteproc_internal.h | 4 ++-- > drivers/remoteproc/st_remoteproc.c | 2 +- > drivers/remoteproc/st_slim_rproc.c | 2 +- > drivers/remoteproc/stm32_rproc.c | 2 +- > drivers/remoteproc/xlnx_r5_remoteproc.c | 2 +- > include/linux/remoteproc.h | 4 ++-- > 18 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c > index 376187ad5754..a4a85fbce907 100644 > --- a/drivers/remoteproc/imx_dsp_rproc.c > +++ b/drivers/remoteproc/imx_dsp_rproc.c > @@ -934,7 +934,7 @@ static const struct rproc_ops imx_dsp_rproc_ops = { > .start = imx_dsp_rproc_start, > .stop = imx_dsp_rproc_stop, > .kick = imx_dsp_rproc_kick, > - .load = imx_dsp_rproc_elf_load_segments, > + .load_segments = imx_dsp_rproc_elf_load_segments, > .parse_fw = imx_dsp_rproc_parse_fw, > .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, > .sanity_check = rproc_elf_sanity_check, > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 800015ff7ff9..f45b3207f7e9 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -681,7 +681,7 @@ static const struct rproc_ops imx_rproc_ops = { > .stop = imx_rproc_stop, > .kick = imx_rproc_kick, > .da_to_va = imx_rproc_da_to_va, > - .load = rproc_elf_load_segments, > + .load_segments = rproc_elf_load_segments, > .parse_fw = imx_rproc_parse_fw, > .find_loaded_rsc_table = imx_rproc_elf_find_loaded_rsc_table, > .get_loaded_rsc_table = imx_rproc_get_loaded_rsc_table, > diff --git a/drivers/remoteproc/meson_mx_ao_arc.c b/drivers/remoteproc/meson_mx_ao_arc.c > index f6744b538323..a1c8c0929ce3 100644 > --- a/drivers/remoteproc/meson_mx_ao_arc.c > +++ b/drivers/remoteproc/meson_mx_ao_arc.c > @@ -137,7 +137,7 @@ static struct rproc_ops meson_mx_ao_arc_rproc_ops = { > .stop = meson_mx_ao_arc_rproc_stop, > .da_to_va = meson_mx_ao_arc_rproc_da_to_va, > .get_boot_addr = rproc_elf_get_boot_addr, > - .load = rproc_elf_load_segments, > + .load_segments = rproc_elf_load_segments, > .sanity_check = rproc_elf_sanity_check, > }; > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index e744c07507ee..4e9a8bf3bc6e 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -924,7 +924,7 @@ static int scp_stop(struct rproc *rproc) > static const struct rproc_ops scp_ops = { > .start = scp_start, > .stop = scp_stop, > - .load = scp_load, > + .load_segments = scp_load, > .da_to_va = scp_da_to_va, > .parse_fw = scp_parse_fw, > .sanity_check = rproc_elf_sanity_check, > diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c > index 327f0c7ee3d6..0b2bf2574f74 100644 > --- a/drivers/remoteproc/pru_rproc.c > +++ b/drivers/remoteproc/pru_rproc.c > @@ -1015,7 +1015,7 @@ static int pru_rproc_probe(struct platform_device *pdev) > return -ENOMEM; > } > /* use a custom load function to deal with PRU-specific quirks */ > - rproc->ops->load = pru_rproc_load_elf_segments; > + rproc->ops->load_segments = pru_rproc_load_elf_segments; > > /* use a custom parse function to deal with PRU-specific resources */ > rproc->ops->parse_fw = pru_rproc_parse_fw; > diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c > index 572dcb0f055b..aa9896930bcf 100644 > --- a/drivers/remoteproc/qcom_q6v5_adsp.c > +++ b/drivers/remoteproc/qcom_q6v5_adsp.c > @@ -527,7 +527,7 @@ static const struct rproc_ops adsp_ops = { > .stop = adsp_stop, > .da_to_va = adsp_da_to_va, > .parse_fw = adsp_parse_firmware, > - .load = adsp_load, > + .load_segments = adsp_load, > .panic = adsp_panic, > }; > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index 2a42215ce8e0..a8beac1deabe 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -1687,7 +1687,7 @@ static const struct rproc_ops q6v5_ops = { > .start = q6v5_start, > .stop = q6v5_stop, > .parse_fw = qcom_q6v5_register_dump_segments, > - .load = q6v5_load, > + .load_segments = q6v5_load, > .panic = q6v5_panic, > }; > > diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c > index ef82835e98a4..9b269ce390c1 100644 > --- a/drivers/remoteproc/qcom_q6v5_pas.c > +++ b/drivers/remoteproc/qcom_q6v5_pas.c > @@ -436,7 +436,7 @@ static const struct rproc_ops adsp_ops = { > .stop = adsp_stop, > .da_to_va = adsp_da_to_va, > .parse_fw = qcom_register_dump_segments, > - .load = adsp_load, > + .load_segments = adsp_load, > .panic = adsp_panic, > }; > > @@ -446,7 +446,7 @@ static const struct rproc_ops adsp_minidump_ops = { > .stop = adsp_stop, > .da_to_va = adsp_da_to_va, > .parse_fw = qcom_register_dump_segments, > - .load = adsp_load, > + .load_segments = adsp_load, > .panic = adsp_panic, > .coredump = adsp_minidump, > }; > diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c > index e913dabae992..44b5736dc8b9 100644 > --- a/drivers/remoteproc/qcom_q6v5_wcss.c > +++ b/drivers/remoteproc/qcom_q6v5_wcss.c > @@ -771,7 +771,7 @@ static const struct rproc_ops q6v5_wcss_ipq8074_ops = { > .start = q6v5_wcss_start, > .stop = q6v5_wcss_stop, > .da_to_va = q6v5_wcss_da_to_va, > - .load = q6v5_wcss_load, > + .load_segments = q6v5_wcss_load, > .get_boot_addr = rproc_elf_get_boot_addr, > }; > > @@ -779,7 +779,7 @@ static const struct rproc_ops q6v5_wcss_qcs404_ops = { > .start = q6v5_qcs404_wcss_start, > .stop = q6v5_wcss_stop, > .da_to_va = q6v5_wcss_da_to_va, > - .load = q6v5_wcss_load, > + .load_segments = q6v5_wcss_load, > .get_boot_addr = rproc_elf_get_boot_addr, > .parse_fw = qcom_register_dump_segments, > }; > diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c > index a7bb9da27029..42102bc4c458 100644 > --- a/drivers/remoteproc/qcom_wcnss.c > +++ b/drivers/remoteproc/qcom_wcnss.c > @@ -335,7 +335,7 @@ static const struct rproc_ops wcnss_ops = { > .stop = wcnss_stop, > .da_to_va = wcnss_da_to_va, > .parse_fw = qcom_register_dump_segments, > - .load = wcnss_load, > + .load_segments = wcnss_load, > }; > > static irqreturn_t wcnss_wdog_interrupt(int irq, void *dev) > diff --git a/drivers/remoteproc/rcar_rproc.c b/drivers/remoteproc/rcar_rproc.c > index cc17e8421f65..e36778fec072 100644 > --- a/drivers/remoteproc/rcar_rproc.c > +++ b/drivers/remoteproc/rcar_rproc.c > @@ -142,7 +142,7 @@ static struct rproc_ops rcar_rproc_ops = { > .prepare = rcar_rproc_prepare, > .start = rcar_rproc_start, > .stop = rcar_rproc_stop, > - .load = rproc_elf_load_segments, > + .load_segments = rproc_elf_load_segments, > .parse_fw = rcar_rproc_parse_fw, > .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, > .sanity_check = rproc_elf_sanity_check, > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 8df4b2c59bb6..e4ad024efcda 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -2485,11 +2485,11 @@ static int rproc_alloc_ops(struct rproc *rproc, const struct rproc_ops *ops) > if (!rproc->ops->coredump) > rproc->ops->coredump = rproc_coredump; > > - if (rproc->ops->load || rproc->ops->load_fw) > + if (rproc->ops->load_segments || rproc->ops->load_fw) > return 0; > > /* Default to ELF loader if no load function is specified */ > - rproc->ops->load = rproc_elf_load_segments; > + rproc->ops->load_segments = rproc_elf_load_segments; > rproc->ops->parse_fw = rproc_elf_load_rsc_table; > rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table; > rproc->ops->sanity_check = rproc_elf_sanity_check; > diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h > index 2104ca449178..b898494600cf 100644 > --- a/drivers/remoteproc/remoteproc_internal.h > +++ b/drivers/remoteproc/remoteproc_internal.h > @@ -167,8 +167,8 @@ u64 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw) > static inline > int rproc_load_segments(struct rproc *rproc, const struct firmware *fw) > { > - if (rproc->ops->load) > - return rproc->ops->load(rproc, fw); > + if (rproc->ops->load_segments) > + return rproc->ops->load_segments(rproc, fw); > > return -EINVAL; > } > diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c > index 1340be9d0110..8d6b75e91531 100644 > --- a/drivers/remoteproc/st_remoteproc.c > +++ b/drivers/remoteproc/st_remoteproc.c > @@ -233,7 +233,7 @@ static const struct rproc_ops st_rproc_ops = { > .start = st_rproc_start, > .stop = st_rproc_stop, > .parse_fw = st_rproc_parse_fw, > - .load = rproc_elf_load_segments, > + .load_segments = rproc_elf_load_segments, > .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, > .sanity_check = rproc_elf_sanity_check, > .get_boot_addr = rproc_elf_get_boot_addr, > diff --git a/drivers/remoteproc/st_slim_rproc.c b/drivers/remoteproc/st_slim_rproc.c > index 5412beb0a692..0f91d8f1e7c7 100644 > --- a/drivers/remoteproc/st_slim_rproc.c > +++ b/drivers/remoteproc/st_slim_rproc.c > @@ -201,7 +201,7 @@ static const struct rproc_ops slim_rproc_ops = { > .stop = slim_rproc_stop, > .da_to_va = slim_rproc_da_to_va, > .get_boot_addr = rproc_elf_get_boot_addr, > - .load = rproc_elf_load_segments, > + .load_segments = rproc_elf_load_segments, > .sanity_check = rproc_elf_sanity_check, > }; > > diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c > index 8c7f7950b80e..7e8ffd9fcc57 100644 > --- a/drivers/remoteproc/stm32_rproc.c > +++ b/drivers/remoteproc/stm32_rproc.c > @@ -667,7 +667,7 @@ static const struct rproc_ops st_rproc_ops = { > .attach = stm32_rproc_attach, > .detach = stm32_rproc_detach, > .kick = stm32_rproc_kick, > - .load = rproc_elf_load_segments, > + .load_segments = rproc_elf_load_segments, > .parse_fw = stm32_rproc_parse_fw, > .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, > .get_loaded_rsc_table = stm32_rproc_get_loaded_rsc_table, > diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/xlnx_r5_remoteproc.c > index 5aeedeaf3c41..59cfba0a02e7 100644 > --- a/drivers/remoteproc/xlnx_r5_remoteproc.c > +++ b/drivers/remoteproc/xlnx_r5_remoteproc.c > @@ -864,7 +864,7 @@ static const struct rproc_ops zynqmp_r5_rproc_ops = { > .unprepare = zynqmp_r5_rproc_unprepare, > .start = zynqmp_r5_rproc_start, > .stop = zynqmp_r5_rproc_stop, > - .load = rproc_elf_load_segments, > + .load_segments = rproc_elf_load_segments, > .parse_fw = zynqmp_r5_parse_fw, > .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, > .sanity_check = rproc_elf_sanity_check, > diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h > index ba6fd560f7ba..55c20424a99f 100644 > --- a/include/linux/remoteproc.h > +++ b/include/linux/remoteproc.h > @@ -374,7 +374,7 @@ enum rsc_handling_status { > * @find_loaded_rsc_table: find the loaded resource table from firmware image > * @get_loaded_rsc_table: get resource table installed in memory > * by external entity > - * @load: load firmware to memory, where the remote processor > + * @load_segments: load firmware ELF segment to memory, where the remote processor > * expects to find it > * @sanity_check: sanity check the fw image > * @get_boot_addr: get boot address to entry point specified in firmware > @@ -402,7 +402,7 @@ struct rproc_ops { > struct rproc *rproc, const struct firmware *fw); > struct resource_table *(*get_loaded_rsc_table)( > struct rproc *rproc, size_t *size); > - int (*load)(struct rproc *rproc, const struct firmware *fw); > + int (*load_segments)(struct rproc *rproc, const struct firmware *fw); > int (*sanity_check)(struct rproc *rproc, const struct firmware *fw); > u64 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw); > unsigned long (*panic)(struct rproc *rproc); > -- > 2.25.1 >
