Re: [PATCH v5 3/5] remoteproc: qcom: Update PIL relocation info on load

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue 19 May 11:14 PDT 2020, rishabhb@xxxxxxxxxxxxxx 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@xxxxxxxxxx>
> > ---
> > 
> > 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



[Index of Archives]     [Linux Sound]     [ALSA Users]     [ALSA Devel]     [Linux Audio Users]     [Linux Media]     [Kernel]     [Photo Sharing]     [Gimp]     [Yosemite News]     [Linux Media]

  Powered by Linux