Skip to contentSkip to conversation

remoteproc: clean up notification config

PATCH Applied Alex Elder 4 participants 4 messages Mar 16, 2020 – Apr 16, 2020

Subsystems (5)
lore
Share & tools
lore

Alex Elder

author
#0 lore raw

PATCH v2 1/1 remoteproc: clean up notification config

Rearrange the config files for remoteproc and IPA to fix their interdependencies.

First, have CONFIG_QCOM_Q6V5_MSS select QCOM_Q6V5_IPA_NOTIFY so the notification code is built regardless of whether IPA needs it.

Next, represent QCOM_IPA as being dependent on QCOM_Q6V5_MSS rather than setting its value to match QCOM_Q6V5_COMMON (which is selected by QCOM_Q6V5_MSS).

Drop all dependencies from QCOM_Q6V5_IPA_NOTIFY. The notification code will be built whenever QCOM_Q6V5_MSS is set, and it has no other dependencies.

---
v2: - Fix subject line
- Incorporate a change I thought I had already squashed

Dave,
I noticed some problems with the interaction between the IPA and remoteproc configs, and after some discussion with Bjorn we came up with this, which simplifies things a bit. Both Kconfig files are in net-next now, so I'm sending this to you.

Two other things:
- I will *not* be implementing the COMPILE_TEST suggestion until after the next merge window.
- I learned of another issue that arises when ARM64 is built with PAGE_SIZE > 4096. I intend to fix that in the next day or so.

-Alex

 drivers/net/ipa/Kconfig    | 2 +-
 drivers/remoteproc/Kconfig | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/net/ipa/Kconfig +1 -1
index b8cb7cadbf75..9f0d2a93379c 100644
@@ -1,9 +1,9 @@
 config QCOM_IPA
 	tristate "Qualcomm IPA support"
 	depends on ARCH_QCOM && 64BIT && NET
+	depends on QCOM_Q6V5_MSS
 	select QCOM_QMI_HELPERS
 	select QCOM_MDT_LOADER
-	default QCOM_Q6V5_COMMON
 	help
 	  Choose Y or M here to include support for the Qualcomm
 	  IP Accelerator (IPA), a hardware block present in some
drivers/remoteproc/Kconfig +1 -3
index 56084635dd63..ffdb5bc25d6d 100644
@@ -128,6 +128,7 @@ config QCOM_Q6V5_MSS
 	select MFD_SYSCON
 	select QCOM_MDT_LOADER
 	select QCOM_Q6V5_COMMON
+	select QCOM_Q6V5_IPA_NOTIFY
 	select QCOM_RPROC_COMMON
 	select QCOM_SCM
 	help
@@ -169,9 +170,6 @@ config QCOM_Q6V5_WCSS
 
 config QCOM_Q6V5_IPA_NOTIFY
 	tristate
-	depends on QCOM_IPA
-	depends on QCOM_Q6V5_MSS
-	default QCOM_IPA
 
 config QCOM_SYSMON
 	tristate "Qualcomm sysmon driver"
Signature · 1 line
2.20.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · Alex Elder

Rearrange the config files for remoteproc and IPA to fix their interdependencies.

First, have CONFIG_QCOM_Q6V5_MSS select QCOM_Q6V5_IPA_NOTIFY so the notification code is built regardless of whether IPA needs it.

Next, represent QCOM_IPA as being dependent on QCOM_Q6V5_MSS rather than setting its value to match QCOM_Q6V5_COMMON (which is selected by QCOM_Q6V5_MSS).

Quoted 5 lines

Drop all dependencies from QCOM_Q6V5_IPA_NOTIFY. The notification code will be built whenever QCOM_Q6V5_MSS is set, and it has no other dependencies.

Regards,
Bjorn

Quoted 63 lines

---
v2: - Fix subject line
- Incorporate a change I thought I had already squashed

Dave,
I noticed some problems with the interaction between the IPA and remoteproc configs, and after some discussion with Bjorn we came up with this, which simplifies things a bit. Both Kconfig files are in net-next now, so I'm sending this to you.

Two other things:
- I will *not* be implementing the COMPILE_TEST suggestion until after the next merge window.
- I learned of another issue that arises when ARM64 is built with PAGE_SIZE > 4096. I intend to fix that in the next day or so.

-Alex

 drivers/net/ipa/Kconfig    | 2 +-
 drivers/remoteproc/Kconfig | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/net/ipa/Kconfig +1 -1
index b8cb7cadbf75..9f0d2a93379c 100644
@@ -1,9 +1,9 @@
 config QCOM_IPA
 	tristate "Qualcomm IPA support"
 	depends on ARCH_QCOM && 64BIT && NET
+	depends on QCOM_Q6V5_MSS
 	select QCOM_QMI_HELPERS
 	select QCOM_MDT_LOADER
-	default QCOM_Q6V5_COMMON
 	help
 	  Choose Y or M here to include support for the Qualcomm
 	  IP Accelerator (IPA), a hardware block present in some
drivers/remoteproc/Kconfig +1 -3
index 56084635dd63..ffdb5bc25d6d 100644
@@ -128,6 +128,7 @@ config QCOM_Q6V5_MSS
 	select MFD_SYSCON
 	select QCOM_MDT_LOADER
 	select QCOM_Q6V5_COMMON
+	select QCOM_Q6V5_IPA_NOTIFY
 	select QCOM_RPROC_COMMON
 	select QCOM_SCM
 	help
@@ -169,9 +170,6 @@ config QCOM_Q6V5_WCSS
 
 config QCOM_Q6V5_IPA_NOTIFY
 	tristate
-	depends on QCOM_IPA
-	depends on QCOM_Q6V5_MSS
-	default QCOM_IPA
 
 config QCOM_SYSMON
 	tristate "Qualcomm sysmon driver"
Signature · 1 line
2.20.1
maintainer Applied
#2 lore raw
In reply to Alex Elder

From: Alex Elder <[email protected]>
Date: Mon, 16 Mar 2020 17:51:21 -0500

Quoted 10 lines

Rearrange the config files for remoteproc and IPA to fix their interdependencies.

First, have CONFIG_QCOM_Q6V5_MSS select QCOM_Q6V5_IPA_NOTIFY so the notification code is built regardless of whether IPA needs it.

Next, represent QCOM_IPA as being dependent on QCOM_Q6V5_MSS rather than setting its value to match QCOM_Q6V5_COMMON (which is selected by QCOM_Q6V5_MSS).

Quoted 8 lines

Drop all dependencies from QCOM_Q6V5_IPA_NOTIFY. The notification code will be built whenever QCOM_Q6V5_MSS is set, and it has no other dependencies.

---
v2: - Fix subject line
- Incorporate a change I thought I had already squashed

Applied to net-next, thanks.

#3 lore raw
In reply to Alex Elder
This patch was applied to andersson/remoteproc.git (refs/heads/for-next).

Hello:

This patch was applied to andersson/remoteproc.git (refs/heads/for-next).

Quoted 11 lines · On Mon, 16 Mar 2020 17:51:21 -0500 you wrote:

Rearrange the config files for remoteproc and IPA to fix their interdependencies.

First, have CONFIG_QCOM_Q6V5_MSS select QCOM_Q6V5_IPA_NOTIFY so the notification code is built regardless of whether IPA needs it.

Next, represent QCOM_IPA as being dependent on QCOM_Q6V5_MSS rather than setting its value to match QCOM_Q6V5_COMMON (which is selected by QCOM_Q6V5_MSS).

[...]

Here is a summary with links:
- [v2] remoteproc: clean up notification config

    https://git.kernel.org/andersson/remoteproc/c/5e0ef51b161c79e1c768d240b38837bdc06e0506

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/pwbot