On Wed 29 Aug 02:25 PDT 2018, Niklas Cassel wrote:
> On Mon, Aug 27, 2018 at 10:12:03PM -0700, Bjorn Andersson wrote:
> > The Hexagon v5 ADSP driver is used for more than only the ADSP and
> > there's an upcoming non-PAS ADSP PIL for SDM845, so rename the driver to
> > qcom_q6v5_pas in order to better suite this.
>
> Hello Bjorn,
>
> so I'm a bit new to this, but after your rename we will have:
>
> QCOM_Q6V5_PIL
> and
> QCOM_Q6V5_PAS
>
> that both are PILs.
> I guess that the difference is that the latter uses TrustZone?
>
> The ADSP for some QCOM SoCs is a Hexagon v5, therefore the
> QCOM_Q6V5_PAS can also boot certain ADSPs?
>
> But we also have QCOM_Q6V5_WCSS
> "Qualcomm Hexagon based WCSS Peripheral Image Loader",
> which also appears to be Hexagon v5 based, but I assume that
> neither QCOM_Q6V5_PIL nor QCOM_Q6V5_PAS can boot the WCSS?
>
> There is also an upcoming non-PAS ADSP PIL loader for SDM845,
> but I guess that the ADSP there is not based on Hexagon v5,
> so the QCOM_Q6V5_PIL will not be able to boot it?
>
> This all seems to be quite confusing, perhaps the help texts
> could be improved to mitigate this confusion?
>
You're right, as proposed this is confusing.
The plan is to have QCOM_Q6V5_PAS, which deals with standard Hexagon
peripherals that relies on the PAS service in TrustZone and then rename
QCOM_Q6V5_PIL to QCOM_Q6V5_MSA to denote that this is the remoteproc
driver for the self-authenticating modem.
The QCOM_Q6V5_WCSS then fits into this pattern, of being the non-TZ
based WCSS remoteproc driver.
> >
> > Cc: Rohit kumar <rohitkr@xxxxxxxxxxxxxx>
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> > ---
> > drivers/remoteproc/Kconfig | 22 +++++++++----------
> > drivers/remoteproc/Makefile | 2 +-
> > .../{qcom_adsp_pil.c => qcom_q6v5_pas.c} | 4 ++--
>
> You should probably also edit the qcom_defconfig:
> arch/arm/configs/qcom_defconfig:CONFIG_QCOM_ADSP_PIL=y
>
Yes, this needs to be done as well. But needs to be done in a separate
patch.
> > 3 files changed, 14 insertions(+), 14 deletions(-)
> > rename drivers/remoteproc/{qcom_adsp_pil.c => qcom_q6v5_pas.c} (98%)
> >
> > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
> > index 052d4dd347f9..c98c0b2a2237 100644
> > --- a/drivers/remoteproc/Kconfig
> > +++ b/drivers/remoteproc/Kconfig
> > @@ -84,8 +84,16 @@ config KEYSTONE_REMOTEPROC
> > It's safe to say N here if you're not interested in the Keystone
> > DSPs or just want to use a bare minimum kernel.
> >
> > -config QCOM_ADSP_PIL
> > - tristate "Qualcomm ADSP Peripheral Image Loader"
> > +config QCOM_RPROC_COMMON
> > + tristate
> > +
> > +config QCOM_Q6V5_COMMON
> > + tristate
> > + depends on ARCH_QCOM
> > + depends on QCOM_SMEM
> > +
> > +config QCOM_Q6V5_PAS
> > + tristate "Qualcomm Hexagon v5 Peripheral Authentication Service support"
> > depends on OF && ARCH_QCOM
> > depends on QCOM_SMEM
> > depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
> > @@ -98,15 +106,7 @@ config QCOM_ADSP_PIL
> > select QCOM_SCM
> > help
> > Say y here to support the TrustZone based Peripherial Image Loader
>
> Since you are editing this help text, yoy may just as well s/Peripherial/Peripheral.
>
Thanks, will do.
Regards,
Bjorn
> Kind regards,
> Niklas
>
> > - for the Qualcomm ADSP remote processors.
> > -
> > -config QCOM_RPROC_COMMON
> > - tristate
> > -
> > -config QCOM_Q6V5_COMMON
> > - tristate
> > - depends on ARCH_QCOM
> > - depends on QCOM_SMEM
> > + for the Qualcomm Hexagon v5 based remote processors.
> >
> > config QCOM_Q6V5_PIL
> > tristate "Qualcomm Hexagon V5 Peripherial Image Loader"
> > diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
> > index 03332fa7e2ee..eb86c8ba5a87 100644
> > --- a/drivers/remoteproc/Makefile
> > +++ b/drivers/remoteproc/Makefile
> > @@ -14,9 +14,9 @@ obj-$(CONFIG_OMAP_REMOTEPROC) += omap_remoteproc.o
> > obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o
> > obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o
> > obj-$(CONFIG_KEYSTONE_REMOTEPROC) += keystone_remoteproc.o
> > -obj-$(CONFIG_QCOM_ADSP_PIL) += qcom_adsp_pil.o
> > obj-$(CONFIG_QCOM_RPROC_COMMON) += qcom_common.o
> > obj-$(CONFIG_QCOM_Q6V5_COMMON) += qcom_q6v5.o
> > +obj-$(CONFIG_QCOM_Q6V5_PAS) += qcom_q6v5_pas.o
> > obj-$(CONFIG_QCOM_Q6V5_PIL) += qcom_q6v5_pil.o
> > obj-$(CONFIG_QCOM_Q6V5_WCSS) += qcom_q6v5_wcss.o
> > obj-$(CONFIG_QCOM_SYSMON) += qcom_sysmon.o
> > diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_q6v5_pas.c
> > similarity index 98%
> > rename from drivers/remoteproc/qcom_adsp_pil.c
> > rename to drivers/remoteproc/qcom_q6v5_pas.c
> > index d4339a6da616..2478ef3cd519 100644
> > --- a/drivers/remoteproc/qcom_adsp_pil.c
> > +++ b/drivers/remoteproc/qcom_q6v5_pas.c
> > @@ -364,11 +364,11 @@ static struct platform_driver adsp_driver = {
> > .probe = adsp_probe,
> > .remove = adsp_remove,
> > .driver = {
> > - .name = "qcom_adsp_pil",
> > + .name = "qcom_q6v5_pas",
> > .of_match_table = adsp_of_match,
> > },
> > };
> >
> > module_platform_driver(adsp_driver);
> > -MODULE_DESCRIPTION("Qualcomm MSM8974/MSM8996 ADSP Peripherial Image Loader");
> > +MODULE_DESCRIPTION("Qualcomm Hexagon v5 Peripheral Authentication Service driver");
> > MODULE_LICENSE("GPL v2");
> > --
> > 2.18.0
> >
