remoteproc: qcom: Rename adsp and mss drivers
Subsystems (2)
v2 cover remoteproc: qcom: Rename adsp and mss drivers
As we're introducing a non-TZ based remoteproc driver for the ADSP in SDM845 the current naming scheme becomes cumbersome. Rename the existing drivers in order to allow for the following:
qcom_q6v5_adsp - handle the non-TZ adsp subsystem qcom_q6v5_mss - handles the self-authenticated modem qcom_q6v5_pas - handles all TZ based "standard" subsystems qcom_q6v5_wcss - handles the non-TZ wireless subsystem
Bjorn Andersson (2):
remoteproc: qcom: Rename Hexagon v5 PAS driver
remoteproc: qcom: Rename Hexagon v5 modem driver
drivers/remoteproc/Kconfig | 35 ++++++++++---------
drivers/remoteproc/Makefile | 4 +--
.../{qcom_q6v5_pil.c => qcom_q6v5_mss.c} | 0
.../{qcom_adsp_pil.c => qcom_q6v5_pas.c} | 4 +--
4 files changed, 22 insertions(+), 21 deletions(-)
rename drivers/remoteproc/{qcom_q6v5_pil.c => qcom_q6v5_mss.c} (100%)
rename drivers/remoteproc/{qcom_adsp_pil.c => qcom_q6v5_pas.c} (98%)Signature · 1 line
2.18.0
PATCH v2 1/2 remoteproc: qcom: Rename Hexagon v5 PAS driver
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.
---
drivers/remoteproc/Kconfig | 27 ++++++++++---------
drivers/remoteproc/Makefile | 2 +-
.../{qcom_q6v5_pil.c => qcom_q6v5_mss.c} | 0
.../{qcom_adsp_pil.c => qcom_q6v5_pas.c} | 4 +--
4 files changed, 17 insertions(+), 16 deletions(-)
rename drivers/remoteproc/{qcom_q6v5_pil.c => qcom_q6v5_mss.c} (100%)
rename drivers/remoteproc/{qcom_adsp_pil.c => qcom_q6v5_pas.c} (98%)drivers/remoteproc/Kconfig +14 -13
@@ -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 - 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"
@@ -120,8 +120,9 @@ config QCOM_Q6V5_PIL select QCOM_RPROC_COMMON select QCOM_SCM help - Say y here to support the Qualcomm Peripherial Image Loader for the - Hexagon V5 based remote processors. + Say y here to support the TrustZone based Peripherial Image Loader + for the Qualcomm Hexagon v5 based remote processors. This is commonly + used to control subsystems such as ADSP, Compute and Sensor. config QCOM_Q6V5_WCSS tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"
drivers/remoteproc/Makefile +1 -1
@@ -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
drivers/remoteproc/qcom_q6v5_mss.c renamed from drivers/remoteproc/qcom_q6v5_pil.c +0 -0
drivers/remoteproc/qcom_q6v5_pas.c renamed from drivers/remoteproc/qcom_adsp_pil.c +2 -2
@@ -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" );
Signature · 1 line
2.18.0
Re: [PATCH v2 1/2] remoteproc: qcom: Rename Hexagon v5 PAS driver
Quoted 6 lines · Bjorn Andersson
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_pasin order to better suite this.Cc Rohit kumar <[email protected]>Signed-off-by Bjorn Andersson <[email protected]>
Quoted 8 lines
---
drivers/remoteproc/Kconfig | 27 ++++++++++---------
drivers/remoteproc/Makefile | 2 +-
.../{qcom_q6v5_pil.c => qcom_q6v5_mss.c} | 0
.../{qcom_adsp_pil.c => qcom_q6v5_pas.c} | 4 +--
4 files changed, 17 insertions(+), 16 deletions(-)
rename drivers/remoteproc/{qcom_q6v5_pil.c => qcom_q6v5_mss.c} (100%)
rename drivers/remoteproc/{qcom_adsp_pil.c => qcom_q6v5_pas.c} (98%)Hello Bjorn,
I would have expected the second rename to be in patch 2/2.
Kind regards,
Niklas
Quoted 96 lines
drivers/remoteproc/Kconfig +14
-13@@ -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 - 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"@@ -120,8 +120,9 @@ config QCOM_Q6V5_PIL select QCOM_RPROC_COMMON select QCOM_SCM help - Say y here to support the Qualcomm Peripherial Image Loader for the - Hexagon V5 based remote processors. + Say y here to support the TrustZone based Peripherial Image Loader + for the Qualcomm Hexagon v5 based remote processors. This is commonly + used to control subsystems such as ADSP, Compute and Sensor. config QCOM_Q6V5_WCSS tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"drivers/remoteproc/Makefile +1
-1@@ -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.odrivers/remoteproc/qcom_q6v5_mss.c renamed from drivers/remoteproc/qcom_q6v5_pil.c +0
-0drivers/remoteproc/qcom_q6v5_pas.c renamed from drivers/remoteproc/qcom_adsp_pil.c +2
-2@@ -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" );Signature · 1 line
2.18.0
PATCH v2 2/2 remoteproc: qcom: Rename Hexagon v5 modem driver
In reply to Bjorn AnderssonThe qcom_q6v5_pil implements support for the self-authenticating modem subsystem. With the introduction of other q6v5 based non-TZ based remoteproc driver the current name is cause for confusion, so rename it to be more specific.
No functional change.
--- drivers/remoteproc/Kconfig | 14 +++++++------- drivers/remoteproc/Makefile | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/remoteproc/Kconfig +7 -7
@@ -92,30 +92,30 @@ config QCOM_Q6V5_COMMON depends on ARCH_QCOM depends on QCOM_SMEM -config QCOM_Q6V5_PAS - tristate "Qualcomm Hexagon v5 Peripheral Authentication Service support" +config QCOM_Q6V5_MSS + tristate "Qualcomm Hexagon V5 self-authenticating modem subsystem support" depends on OF && ARCH_QCOM depends on QCOM_SMEM depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n) depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n depends on QCOM_SYSMON || QCOM_SYSMON=n select MFD_SYSCON - select QCOM_MDT_LOADER select QCOM_Q6V5_COMMON select QCOM_RPROC_COMMON select QCOM_SCM help - Say y here to support the TrustZone based Peripherial Image Loader - for the Qualcomm Hexagon v5 based remote processors. + Say y here to support the Qualcomm self-authenticating modem + subsystem based on Hexagon V5. -config QCOM_Q6V5_PIL - tristate "Qualcomm Hexagon V5 Peripherial Image Loader" +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) depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n depends on QCOM_SYSMON || QCOM_SYSMON=n select MFD_SYSCON + select QCOM_MDT_LOADER select QCOM_Q6V5_COMMON select QCOM_RPROC_COMMON select QCOM_SCM
drivers/remoteproc/Makefile +1 -1
@@ -16,8 +16,8 @@ obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o obj-$(CONFIG_KEYSTONE_REMOTEPROC) += keystone_remoteproc.o obj-$(CONFIG_QCOM_RPROC_COMMON) += qcom_common.o obj-$(CONFIG_QCOM_Q6V5_COMMON) += qcom_q6v5.o +obj-$(CONFIG_QCOM_Q6V5_MSS) += qcom_q6v5_mss.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 obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o
Signature · 1 line
2.18.0
Re: [PATCH v2 2/2] remoteproc: qcom: Rename Hexagon v5 modem driver
Quoted 5 lines · Bjorn Andersson
The
qcom_q6v5_pilimplements support for the self-authenticating modem subsystem. With the introduction of other q6v5 based non-TZ based remoteproc driver the current name is cause for confusion, so rename it to be more specific.
Quoted 7 lines
No functional change.
Signed-off-by Bjorn Andersson <[email protected]>--- drivers/remoteproc/Kconfig | 14 +++++++------- drivers/remoteproc/Makefile | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
Hello Bjorn,
Patch 1/2 modifies platform_driver.driver.name and MODULE_DESCRIPTION. I would have expected this patch to do the same.
Kind regards,
Niklas
Quoted 60 lines
drivers/remoteproc/Kconfig +7
-7@@ -92,30 +92,30 @@ config QCOM_Q6V5_COMMON depends on ARCH_QCOM depends on QCOM_SMEM -config QCOM_Q6V5_PAS - tristate "Qualcomm Hexagon v5 Peripheral Authentication Service support" +config QCOM_Q6V5_MSS + tristate "Qualcomm Hexagon V5 self-authenticating modem subsystem support" depends on OF && ARCH_QCOM depends on QCOM_SMEM depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n) depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n depends on QCOM_SYSMON || QCOM_SYSMON=n select MFD_SYSCON - select QCOM_MDT_LOADER select QCOM_Q6V5_COMMON select QCOM_RPROC_COMMON select QCOM_SCM help - Say y here to support the TrustZone based Peripherial Image Loader - for the Qualcomm Hexagon v5 based remote processors. + Say y here to support the Qualcomm self-authenticating modem + subsystem based on Hexagon V5. -config QCOM_Q6V5_PIL - tristate "Qualcomm Hexagon V5 Peripherial Image Loader" +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) depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n depends on QCOM_SYSMON || QCOM_SYSMON=n select MFD_SYSCON + select QCOM_MDT_LOADER select QCOM_Q6V5_COMMON select QCOM_RPROC_COMMON select QCOM_SCMdrivers/remoteproc/Makefile +1
-1@@ -16,8 +16,8 @@ obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o obj-$(CONFIG_KEYSTONE_REMOTEPROC) += keystone_remoteproc.o obj-$(CONFIG_QCOM_RPROC_COMMON) += qcom_common.o obj-$(CONFIG_QCOM_Q6V5_COMMON) += qcom_q6v5.o +obj-$(CONFIG_QCOM_Q6V5_MSS) += qcom_q6v5_mss.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 obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.oSignature · 1 line
2.18.0