| Message ID | 20200513055641.1413100-4-bjorn.andersson@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | remoteproc: qcom: PIL info support | expand |
Hi Bjorn,
I love your patch! Yet something to improve:
[auto build test ERROR on robh/for-next]
[also build test ERROR on linus/master v5.7-rc5 next-20200514]
[cannot apply to agross-msm/qcom/for-next remoteproc/for-next rpmsg/for-next hwspinlock/for-next]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Bjorn-Andersson/remoteproc-qcom-PIL-info-support/20200514-161851
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: arm64-allyesconfig (attached as .config)
compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day GCC_VERSION=9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/remoteproc/qcom_q6v5_wcss.c: In function 'q6v5_wcss_load':
>> drivers/remoteproc/qcom_q6v5_wcss.c:433:2: error: implicit declaration of function 'qcom_pil_info_store' [-Werror=implicit-function-declaration]
433 | qcom_pil_info_store("wcnss", wcss->mem_reloc, wcss->mem_size);
| ^~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/qcom_pil_info_store +433 drivers/remoteproc/qcom_q6v5_wcss.c
420
421 static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
422 {
423 struct q6v5_wcss *wcss = rproc->priv;
424 int ret;
425
426 ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware,
427 0, wcss->mem_region, wcss->mem_phys,
428 wcss->mem_size, &wcss->mem_reloc);
429 if (ret)
430 return ret;
431
432 /* Failures only affect post mortem debugging, so ignore return value */
> 433 qcom_pil_info_store("wcnss", wcss->mem_reloc, wcss->mem_size);
434
435 return ret;
436 }
437
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
On 2020-05-12 22:56, Bjorn Andersson wrote: > Update the PIL relocation information in IMEM with information about > where the firmware for various remoteprocs are loaded. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > > Changes since v4: > - Dropped unnecessary comment about ignoring return value. > > drivers/remoteproc/Kconfig | 3 +++ > drivers/remoteproc/qcom_q6v5_adsp.c | 16 +++++++++++++--- > drivers/remoteproc/qcom_q6v5_mss.c | 3 +++ > drivers/remoteproc/qcom_q6v5_pas.c | 15 ++++++++++++--- > drivers/remoteproc/qcom_q6v5_wcss.c | 14 +++++++++++--- > drivers/remoteproc/qcom_wcnss.c | 14 +++++++++++--- > 6 files changed, 53 insertions(+), 12 deletions(-) > > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > index 8088ca4dd6dc..6bd42a411ca8 100644 > --- a/drivers/remoteproc/Kconfig > +++ b/drivers/remoteproc/Kconfig > @@ -126,6 +126,7 @@ config QCOM_Q6V5_ADSP > depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n > depends on QCOM_SYSMON || QCOM_SYSMON=n > select MFD_SYSCON > + select QCOM_PIL_INFO > select QCOM_MDT_LOADER > select QCOM_Q6V5_COMMON > select QCOM_RPROC_COMMON > @@ -158,6 +159,7 @@ config QCOM_Q6V5_PAS > depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n > depends on QCOM_SYSMON || QCOM_SYSMON=n > select MFD_SYSCON > + select QCOM_PIL_INFO > select QCOM_MDT_LOADER > select QCOM_Q6V5_COMMON > select QCOM_RPROC_COMMON > @@ -209,6 +211,7 @@ config QCOM_WCNSS_PIL > depends on QCOM_SMEM > depends on QCOM_SYSMON || QCOM_SYSMON=n > select QCOM_MDT_LOADER > + select QCOM_PIL_INFO > select QCOM_RPROC_COMMON > select QCOM_SCM > help > diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c > b/drivers/remoteproc/qcom_q6v5_adsp.c > index d2a2574dcf35..c539e89664cb 100644 > --- a/drivers/remoteproc/qcom_q6v5_adsp.c > +++ b/drivers/remoteproc/qcom_q6v5_adsp.c > @@ -26,6 +26,7 @@ > #include <linux/soc/qcom/smem_state.h> > > #include "qcom_common.h" > +#include "qcom_pil_info.h" > #include "qcom_q6v5.h" > #include "remoteproc_internal.h" > > @@ -82,6 +83,7 @@ struct qcom_adsp { > unsigned int halt_lpass; > > int crash_reason_smem; > + const char *info_name; > > struct completion start_done; > struct completion stop_done; > @@ -164,10 +166,17 @@ static int qcom_adsp_shutdown(struct qcom_adsp > *adsp) > static int adsp_load(struct rproc *rproc, const struct firmware *fw) > { > struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; > + int ret; > + > + ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0, > + adsp->mem_region, adsp->mem_phys, > + adsp->mem_size, &adsp->mem_reloc); > + if (ret) > + return ret; > + > + qcom_pil_info_store(adsp->info_name, adsp->mem_reloc, > adsp->mem_size); > > - return qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0, > - adsp->mem_region, adsp->mem_phys, adsp->mem_size, > - &adsp->mem_reloc); > + return 0; > } > > static int adsp_start(struct rproc *rproc) > @@ -436,6 +445,7 @@ static int adsp_probe(struct platform_device *pdev) > adsp = (struct qcom_adsp *)rproc->priv; > adsp->dev = &pdev->dev; > adsp->rproc = rproc; > + adsp->info_name = desc->sysmon_name; > platform_set_drvdata(pdev, adsp); > > ret = adsp_alloc_memory_region(adsp); > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c > b/drivers/remoteproc/qcom_q6v5_mss.c > index c4936f4d1e80..fdbcae11ae64 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -29,6 +29,7 @@ > > #include "remoteproc_internal.h" > #include "qcom_common.h" > +#include "qcom_pil_info.h" > #include "qcom_q6v5.h" > > #include <linux/qcom_scm.h> > @@ -1221,6 +1222,8 @@ static int q6v5_mpss_load(struct q6v5 *qproc) > else if (ret < 0) > dev_err(qproc->dev, "MPSS authentication failed: %d\n", ret); > > + qcom_pil_info_store("modem", mpss_reloc, qproc->mpss_size); > + > release_firmware: > release_firmware(fw); > out: > diff --git a/drivers/remoteproc/qcom_q6v5_pas.c > b/drivers/remoteproc/qcom_q6v5_pas.c > index 3bb69f58e086..84cb19231c35 100644 > --- a/drivers/remoteproc/qcom_q6v5_pas.c > +++ b/drivers/remoteproc/qcom_q6v5_pas.c > @@ -25,6 +25,7 @@ > #include <linux/soc/qcom/smem_state.h> > > #include "qcom_common.h" > +#include "qcom_pil_info.h" > #include "qcom_q6v5.h" > #include "remoteproc_internal.h" > > @@ -64,6 +65,7 @@ struct qcom_adsp { > int pas_id; > int crash_reason_smem; > bool has_aggre2_clk; > + const char *info_name; > > struct completion start_done; > struct completion stop_done; > @@ -117,11 +119,17 @@ static void adsp_pds_disable(struct qcom_adsp > *adsp, struct device **pds, > static int adsp_load(struct rproc *rproc, const struct firmware *fw) > { > struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; > + int ret; > > - return qcom_mdt_load(adsp->dev, fw, rproc->firmware, adsp->pas_id, > - adsp->mem_region, adsp->mem_phys, adsp->mem_size, > - &adsp->mem_reloc); > + ret = qcom_mdt_load(adsp->dev, fw, rproc->firmware, adsp->pas_id, > + adsp->mem_region, adsp->mem_phys, adsp->mem_size, > + &adsp->mem_reloc); > + if (ret) > + return ret; > > + qcom_pil_info_store(adsp->info_name, adsp->mem_reloc, > adsp->mem_size); mem_reloc is used to calculate offset and then we again add that offset to the ioremapped region base. So we should pass adsp->mem_phys as start here? > + > + return 0; > } > > static int adsp_start(struct rproc *rproc) > @@ -405,6 +413,7 @@ static int adsp_probe(struct platform_device *pdev) > adsp->rproc = rproc; > adsp->pas_id = desc->pas_id; > adsp->has_aggre2_clk = desc->has_aggre2_clk; > + adsp->info_name = desc->sysmon_name; > platform_set_drvdata(pdev, adsp); > > ret = adsp_alloc_memory_region(adsp); > diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c > b/drivers/remoteproc/qcom_q6v5_wcss.c > index f1924b740a10..962e37a86b8b 100644 > --- a/drivers/remoteproc/qcom_q6v5_wcss.c > +++ b/drivers/remoteproc/qcom_q6v5_wcss.c > @@ -421,10 +421,18 @@ static void *q6v5_wcss_da_to_va(struct rproc > *rproc, u64 da, size_t len) > static int q6v5_wcss_load(struct rproc *rproc, const struct firmware > *fw) > { > struct q6v5_wcss *wcss = rproc->priv; > + int ret; > + > + ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware, > + 0, wcss->mem_region, wcss->mem_phys, > + wcss->mem_size, &wcss->mem_reloc); > + if (ret) > + return ret; > + > + /* Failures only affect post mortem debugging, so ignore return value > */ > + qcom_pil_info_store("wcnss", wcss->mem_reloc, wcss->mem_size); > > - return qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware, > - 0, wcss->mem_region, wcss->mem_phys, > - wcss->mem_size, &wcss->mem_reloc); > + return ret; > } > > static const struct rproc_ops q6v5_wcss_ops = { > diff --git a/drivers/remoteproc/qcom_wcnss.c > b/drivers/remoteproc/qcom_wcnss.c > index 5d65e1a9329a..229482b3231f 100644 > --- a/drivers/remoteproc/qcom_wcnss.c > +++ b/drivers/remoteproc/qcom_wcnss.c > @@ -27,6 +27,7 @@ > > #include "qcom_common.h" > #include "remoteproc_internal.h" > +#include "qcom_pil_info.h" > #include "qcom_wcnss.h" > > #define WCNSS_CRASH_REASON_SMEM 422 > @@ -145,10 +146,17 @@ void qcom_wcnss_assign_iris(struct qcom_wcnss > *wcnss, > static int wcnss_load(struct rproc *rproc, const struct firmware *fw) > { > struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv; > + int ret; > + > + ret = qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID, > + wcnss->mem_region, wcnss->mem_phys, > + wcnss->mem_size, &wcnss->mem_reloc); > + if (ret) > + return ret; > + > + qcom_pil_info_store("wcnss", wcnss->mem_reloc, wcnss->mem_size); > > - return qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID, > - wcnss->mem_region, wcnss->mem_phys, > - wcnss->mem_size, &wcnss->mem_reloc); > + return 0; > } > > static void wcnss_indicate_nv_download(struct qcom_wcnss *wcnss)
On Tue 19 May 11:14 PDT 2020, rishabhb@codeaurora.org wrote: > On 2020-05-12 22:56, Bjorn Andersson wrote: > > Update the PIL relocation information in IMEM with information about > > where the firmware for various remoteprocs are loaded. > > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > --- > > > > Changes since v4: > > - Dropped unnecessary comment about ignoring return value. > > > > drivers/remoteproc/Kconfig | 3 +++ > > drivers/remoteproc/qcom_q6v5_adsp.c | 16 +++++++++++++--- > > drivers/remoteproc/qcom_q6v5_mss.c | 3 +++ > > drivers/remoteproc/qcom_q6v5_pas.c | 15 ++++++++++++--- > > drivers/remoteproc/qcom_q6v5_wcss.c | 14 +++++++++++--- > > drivers/remoteproc/qcom_wcnss.c | 14 +++++++++++--- > > 6 files changed, 53 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > > index 8088ca4dd6dc..6bd42a411ca8 100644 > > --- a/drivers/remoteproc/Kconfig > > +++ b/drivers/remoteproc/Kconfig > > @@ -126,6 +126,7 @@ config QCOM_Q6V5_ADSP > > depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n > > depends on QCOM_SYSMON || QCOM_SYSMON=n > > select MFD_SYSCON > > + select QCOM_PIL_INFO > > select QCOM_MDT_LOADER > > select QCOM_Q6V5_COMMON > > select QCOM_RPROC_COMMON > > @@ -158,6 +159,7 @@ config QCOM_Q6V5_PAS > > depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n > > depends on QCOM_SYSMON || QCOM_SYSMON=n > > select MFD_SYSCON > > + select QCOM_PIL_INFO > > select QCOM_MDT_LOADER > > select QCOM_Q6V5_COMMON > > select QCOM_RPROC_COMMON > > @@ -209,6 +211,7 @@ config QCOM_WCNSS_PIL > > depends on QCOM_SMEM > > depends on QCOM_SYSMON || QCOM_SYSMON=n > > select QCOM_MDT_LOADER > > + select QCOM_PIL_INFO > > select QCOM_RPROC_COMMON > > select QCOM_SCM > > help > > diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c > > b/drivers/remoteproc/qcom_q6v5_adsp.c > > index d2a2574dcf35..c539e89664cb 100644 > > --- a/drivers/remoteproc/qcom_q6v5_adsp.c > > +++ b/drivers/remoteproc/qcom_q6v5_adsp.c > > @@ -26,6 +26,7 @@ > > #include <linux/soc/qcom/smem_state.h> > > > > #include "qcom_common.h" > > +#include "qcom_pil_info.h" > > #include "qcom_q6v5.h" > > #include "remoteproc_internal.h" > > > > @@ -82,6 +83,7 @@ struct qcom_adsp { > > unsigned int halt_lpass; > > > > int crash_reason_smem; > > + const char *info_name; > > > > struct completion start_done; > > struct completion stop_done; > > @@ -164,10 +166,17 @@ static int qcom_adsp_shutdown(struct qcom_adsp > > *adsp) > > static int adsp_load(struct rproc *rproc, const struct firmware *fw) > > { > > struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; > > + int ret; > > + > > + ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0, > > + adsp->mem_region, adsp->mem_phys, > > + adsp->mem_size, &adsp->mem_reloc); > > + if (ret) > > + return ret; > > + > > + qcom_pil_info_store(adsp->info_name, adsp->mem_reloc, adsp->mem_size); > > > > - return qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0, > > - adsp->mem_region, adsp->mem_phys, adsp->mem_size, > > - &adsp->mem_reloc); > > + return 0; > > } > > > > static int adsp_start(struct rproc *rproc) > > @@ -436,6 +445,7 @@ static int adsp_probe(struct platform_device *pdev) > > adsp = (struct qcom_adsp *)rproc->priv; > > adsp->dev = &pdev->dev; > > adsp->rproc = rproc; > > + adsp->info_name = desc->sysmon_name; > > platform_set_drvdata(pdev, adsp); > > > > ret = adsp_alloc_memory_region(adsp); > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c > > b/drivers/remoteproc/qcom_q6v5_mss.c > > index c4936f4d1e80..fdbcae11ae64 100644 > > --- a/drivers/remoteproc/qcom_q6v5_mss.c > > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > > @@ -29,6 +29,7 @@ > > > > #include "remoteproc_internal.h" > > #include "qcom_common.h" > > +#include "qcom_pil_info.h" > > #include "qcom_q6v5.h" > > > > #include <linux/qcom_scm.h> > > @@ -1221,6 +1222,8 @@ static int q6v5_mpss_load(struct q6v5 *qproc) > > else if (ret < 0) > > dev_err(qproc->dev, "MPSS authentication failed: %d\n", ret); > > > > + qcom_pil_info_store("modem", mpss_reloc, qproc->mpss_size); > > + > > release_firmware: > > release_firmware(fw); > > out: > > diff --git a/drivers/remoteproc/qcom_q6v5_pas.c > > b/drivers/remoteproc/qcom_q6v5_pas.c > > index 3bb69f58e086..84cb19231c35 100644 > > --- a/drivers/remoteproc/qcom_q6v5_pas.c > > +++ b/drivers/remoteproc/qcom_q6v5_pas.c > > @@ -25,6 +25,7 @@ > > #include <linux/soc/qcom/smem_state.h> > > > > #include "qcom_common.h" > > +#include "qcom_pil_info.h" > > #include "qcom_q6v5.h" > > #include "remoteproc_internal.h" > > > > @@ -64,6 +65,7 @@ struct qcom_adsp { > > int pas_id; > > int crash_reason_smem; > > bool has_aggre2_clk; > > + const char *info_name; > > > > struct completion start_done; > > struct completion stop_done; > > @@ -117,11 +119,17 @@ static void adsp_pds_disable(struct qcom_adsp > > *adsp, struct device **pds, > > static int adsp_load(struct rproc *rproc, const struct firmware *fw) > > { > > struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; > > + int ret; > > > > - return qcom_mdt_load(adsp->dev, fw, rproc->firmware, adsp->pas_id, > > - adsp->mem_region, adsp->mem_phys, adsp->mem_size, > > - &adsp->mem_reloc); > > + ret = qcom_mdt_load(adsp->dev, fw, rproc->firmware, adsp->pas_id, > > + adsp->mem_region, adsp->mem_phys, adsp->mem_size, > > + &adsp->mem_reloc); > > + if (ret) > > + return ret; > > > > + qcom_pil_info_store(adsp->info_name, adsp->mem_reloc, adsp->mem_size); > mem_reloc is used to calculate offset and then we again add that offset to > the > ioremapped region base. So we should pass adsp->mem_phys as start here? You're correct, I will respin this. Thanks, Bjorn
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index 8088ca4dd6dc..6bd42a411ca8 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -126,6 +126,7 @@ config QCOM_Q6V5_ADSP depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n depends on QCOM_SYSMON || QCOM_SYSMON=n select MFD_SYSCON + select QCOM_PIL_INFO select QCOM_MDT_LOADER select QCOM_Q6V5_COMMON select QCOM_RPROC_COMMON @@ -158,6 +159,7 @@ config QCOM_Q6V5_PAS depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n depends on QCOM_SYSMON || QCOM_SYSMON=n select MFD_SYSCON + select QCOM_PIL_INFO select QCOM_MDT_LOADER select QCOM_Q6V5_COMMON select QCOM_RPROC_COMMON @@ -209,6 +211,7 @@ config QCOM_WCNSS_PIL depends on QCOM_SMEM depends on QCOM_SYSMON || QCOM_SYSMON=n select QCOM_MDT_LOADER + select QCOM_PIL_INFO select QCOM_RPROC_COMMON select QCOM_SCM help diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c index d2a2574dcf35..c539e89664cb 100644 --- a/drivers/remoteproc/qcom_q6v5_adsp.c +++ b/drivers/remoteproc/qcom_q6v5_adsp.c @@ -26,6 +26,7 @@ #include <linux/soc/qcom/smem_state.h> #include "qcom_common.h" +#include "qcom_pil_info.h" #include "qcom_q6v5.h" #include "remoteproc_internal.h" @@ -82,6 +83,7 @@ struct qcom_adsp { unsigned int halt_lpass; int crash_reason_smem; + const char *info_name; struct completion start_done; struct completion stop_done; @@ -164,10 +166,17 @@ static int qcom_adsp_shutdown(struct qcom_adsp *adsp) static int adsp_load(struct rproc *rproc, const struct firmware *fw) { struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; + int ret; + + ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0, + adsp->mem_region, adsp->mem_phys, + adsp->mem_size, &adsp->mem_reloc); + if (ret) + return ret; + + qcom_pil_info_store(adsp->info_name, adsp->mem_reloc, adsp->mem_size); - return qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0, - adsp->mem_region, adsp->mem_phys, adsp->mem_size, - &adsp->mem_reloc); + return 0; } static int adsp_start(struct rproc *rproc) @@ -436,6 +445,7 @@ static int adsp_probe(struct platform_device *pdev) adsp = (struct qcom_adsp *)rproc->priv; adsp->dev = &pdev->dev; adsp->rproc = rproc; + adsp->info_name = desc->sysmon_name; platform_set_drvdata(pdev, adsp); ret = adsp_alloc_memory_region(adsp); diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index c4936f4d1e80..fdbcae11ae64 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -29,6 +29,7 @@ #include "remoteproc_internal.h" #include "qcom_common.h" +#include "qcom_pil_info.h" #include "qcom_q6v5.h" #include <linux/qcom_scm.h> @@ -1221,6 +1222,8 @@ static int q6v5_mpss_load(struct q6v5 *qproc) else if (ret < 0) dev_err(qproc->dev, "MPSS authentication failed: %d\n", ret); + qcom_pil_info_store("modem", mpss_reloc, qproc->mpss_size); + release_firmware: release_firmware(fw); out: diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 3bb69f58e086..84cb19231c35 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -25,6 +25,7 @@ #include <linux/soc/qcom/smem_state.h> #include "qcom_common.h" +#include "qcom_pil_info.h" #include "qcom_q6v5.h" #include "remoteproc_internal.h" @@ -64,6 +65,7 @@ struct qcom_adsp { int pas_id; int crash_reason_smem; bool has_aggre2_clk; + const char *info_name; struct completion start_done; struct completion stop_done; @@ -117,11 +119,17 @@ static void adsp_pds_disable(struct qcom_adsp *adsp, struct device **pds, static int adsp_load(struct rproc *rproc, const struct firmware *fw) { struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; + int ret; - return qcom_mdt_load(adsp->dev, fw, rproc->firmware, adsp->pas_id, - adsp->mem_region, adsp->mem_phys, adsp->mem_size, - &adsp->mem_reloc); + ret = qcom_mdt_load(adsp->dev, fw, rproc->firmware, adsp->pas_id, + adsp->mem_region, adsp->mem_phys, adsp->mem_size, + &adsp->mem_reloc); + if (ret) + return ret; + qcom_pil_info_store(adsp->info_name, adsp->mem_reloc, adsp->mem_size); + + return 0; } static int adsp_start(struct rproc *rproc) @@ -405,6 +413,7 @@ static int adsp_probe(struct platform_device *pdev) adsp->rproc = rproc; adsp->pas_id = desc->pas_id; adsp->has_aggre2_clk = desc->has_aggre2_clk; + adsp->info_name = desc->sysmon_name; platform_set_drvdata(pdev, adsp); ret = adsp_alloc_memory_region(adsp); diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c index f1924b740a10..962e37a86b8b 100644 --- a/drivers/remoteproc/qcom_q6v5_wcss.c +++ b/drivers/remoteproc/qcom_q6v5_wcss.c @@ -421,10 +421,18 @@ static void *q6v5_wcss_da_to_va(struct rproc *rproc, u64 da, size_t len) static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw) { struct q6v5_wcss *wcss = rproc->priv; + int ret; + + ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware, + 0, wcss->mem_region, wcss->mem_phys, + wcss->mem_size, &wcss->mem_reloc); + if (ret) + return ret; + + /* Failures only affect post mortem debugging, so ignore return value */ + qcom_pil_info_store("wcnss", wcss->mem_reloc, wcss->mem_size); - return qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware, - 0, wcss->mem_region, wcss->mem_phys, - wcss->mem_size, &wcss->mem_reloc); + return ret; } static const struct rproc_ops q6v5_wcss_ops = { diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index 5d65e1a9329a..229482b3231f 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c @@ -27,6 +27,7 @@ #include "qcom_common.h" #include "remoteproc_internal.h" +#include "qcom_pil_info.h" #include "qcom_wcnss.h" #define WCNSS_CRASH_REASON_SMEM 422 @@ -145,10 +146,17 @@ void qcom_wcnss_assign_iris(struct qcom_wcnss *wcnss, static int wcnss_load(struct rproc *rproc, const struct firmware *fw) { struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv; + int ret; + + ret = qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID, + wcnss->mem_region, wcnss->mem_phys, + wcnss->mem_size, &wcnss->mem_reloc); + if (ret) + return ret; + + qcom_pil_info_store("wcnss", wcnss->mem_reloc, wcnss->mem_size); - return qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID, - wcnss->mem_region, wcnss->mem_phys, - wcnss->mem_size, &wcnss->mem_reloc); + return 0; } static void wcnss_indicate_nv_download(struct qcom_wcnss *wcnss)
Update the PIL relocation information in IMEM with information about where the firmware for various remoteprocs are loaded. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- Changes since v4: - Dropped unnecessary comment about ignoring return value. drivers/remoteproc/Kconfig | 3 +++ drivers/remoteproc/qcom_q6v5_adsp.c | 16 +++++++++++++--- drivers/remoteproc/qcom_q6v5_mss.c | 3 +++ drivers/remoteproc/qcom_q6v5_pas.c | 15 ++++++++++++--- drivers/remoteproc/qcom_q6v5_wcss.c | 14 +++++++++++--- drivers/remoteproc/qcom_wcnss.c | 14 +++++++++++--- 6 files changed, 53 insertions(+), 12 deletions(-)