net: ipa: support COMPILE_TEST
Subsystems (6)
cover net: ipa: support COMPILE_TEST
This series adds the IPA driver as a possible target when the COMPILE_TEST configuration is enabled. Two small changes to dependent subsystems needed to be made for this to work.
Version 2 of this series adds one more patch, which adds the declation of struct page to "gsi_trans.h". The Intel kernel test robot reported that this was a problem for the alpha build.
David/Jakub, please take all four of these patches through the net-next tree if you find them acceptable.
Thanks.
-Alex
Alex Elder (4):
remoteproc: qcom: expose types for COMPILE_TEST
soc: qcom: mdt_loader: define stubs for COMPILE_TEST
net: ipa: declare the page pointer type in "gsi_trans.h"
net: ipa: support COMPILE_TEST
drivers/net/ipa/Kconfig | 10 +++++--- drivers/net/ipa/gsi_trans.h | 1 + include/linux/remoteproc/qcom_rproc.h | 4 +-- include/linux/soc/qcom/mdt_loader.h | 35 +++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/4 remoteproc: qcom: expose types for COMPILE_TEST
Stub functions are defined for SSR notifier registration in case QCOM_RPROC_COMMON is not configured. As a result, code that uses these functions can link successfully even if the common remoteproc code is not built.
Code that registers an SSR notifier function likely needs the types defined in "qcom_rproc.h", but those are only exposed if QCOM_RPROC_COMMON is enabled.
Rearrange the conditional definition so the qcom_ssr_notify_data structure and qcom_ssr_notify_type enumerated type are defined whether or not QCOM_RPROC_COMMON is enabled.
--- include/linux/remoteproc/qcom_rproc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/remoteproc/qcom_rproc.h +2 -2
@@ -3,8 +3,6 @@struct notifier_block ; -#if IS_ENABLED (CONFIG_QCOM_RPROC_COMMON ) -/** * enum qcom_ssr_notify_type - Startup/Shutdown events related to a remoteproc * processor.
@@ -26,6 +24,8 @@ struct qcom_ssr_notify_data {bool crashed; }; +#if IS_ENABLED (CONFIG_QCOM_RPROC_COMMON ) +void *qcom_register_ssr_notifier (const char *name,struct notifier_block *nb);int qcom_unregister_ssr_notifier (void *notify,struct notifier_block *nb);
Signature · 1 line
2.20.1
PATCH 2/4 soc: qcom: mdt_loader: define stubs for COMPILE_TEST
In reply to Alex ElderDefine stub functions for the exposed MDT functions in case QCOM_MDT_LOADER is not configured. This allows users of these functions to link correctly for COMPILE_TEST builds without QCOM_SCM enabled.
--- include/linux/soc/qcom/mdt_loader.h | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
include/linux/soc/qcom/mdt_loader.h +35 -0
@@ -11,6 +11,8 @@struct device ;struct firmware ; +#if IS_ENABLED (CONFIG_QCOM_MDT_LOADER ) +ssize_t qcom_mdt_get_size (const struct firmware *fw); int qcom_mdt_load(struct device *dev, const struct firmware *fw, const char *fw_name, int pas_id, void *mem_region,
@@ -23,4 +25,37 @@ int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw, phys_addr_t *reloc_base);void *qcom_mdt_read_metadata (const struct firmware *fw,size_t *data_len); +#else /* !IS_ENABLED(CONFIG_QCOM_MDT_LOADER) */ + +static inline ssize_t qcom_mdt_get_size (const struct firmware *fw) +{ +return -ENODEV ; +} + +static inline int qcom_mdt_load (struct device *dev,const struct firmware *fw, +const char *fw_name,int pas_id, +void *mem_region,phys_addr_t mem_phys, +size_t mem_size,phys_addr_t *reloc_base) +{ +return -ENODEV ; +} + +static inline int qcom_mdt_load_no_init (struct device *dev, +const struct firmware *fw, +const char *fw_name,int pas_id, +void *mem_region,phys_addr_t mem_phys, +size_t mem_size, +phys_addr_t *reloc_base) +{ +return -ENODEV ; +} + +static inline void *qcom_mdt_read_metadata (const struct firmware *fw, +size_t *data_len) +{ +return ERR_PTR (-ENODEV ); +} + +#endif /* !IS_ENABLED(CONFIG_QCOM_MDT_LOADER) */ +#endif
Signature · 1 line
2.20.1
PATCH 3/4 net: ipa: declare the page pointer type in "gsi_trans.h"
In reply to Alex ElderThe second argument to gsi_trans_page_add() is a page pointer. That declaration is found in header files used by "gsi_trans.h" for (at least) arm64 and x86 builds, but apparently not for alpha builds.
Fix this by adding a declaration of struct page to the top of "gsi_trans.h".
--- drivers/net/ipa/gsi_trans.h | 1 + 1 file changed, 1 insertion(+)
drivers/net/ipa/gsi_trans.h +1 -0
@@ -13,6 +13,7 @@#include "ipa_cmd.h" +struct page ;struct scatterlist ;struct device ;struct sk_buff ;
Signature · 1 line
2.20.1
PATCH 4/4 net: ipa: support COMPILE_TEST
In reply to Alex ElderArrange for the IPA driver to be built when COMPILE_TEST is enabled.
Update the help text to reflect that we support two Qualcomm SoCs.
--- drivers/net/ipa/Kconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ipa/Kconfig +6 -4
@@ -1,9 +1,10 @@ config QCOM_IPA tristate "Qualcomm IPA support" - depends on ARCH_QCOM && 64BIT && NET - depends on QCOM_Q6V5_MSS + depends on 64BIT && NET + depends on ARCH_QCOM || COMPILE_TEST + depends on QCOM_RPROC_COMMON || (QCOM_RPROC_COMMON=n && COMPILE_TEST) + select QCOM_MDT_LOADER if ARCH_QCOM select QCOM_QMI_HELPERS - select QCOM_MDT_LOADER help Choose Y or M here to include support for the Qualcomm IP Accelerator (IPA), a hardware block present in some
@@ -11,7 +12,8 @@ config QCOM_IPA that is capable of generic hardware handling of IP packets, including routing, filtering, and NAT. Currently the IPA driver supports only basic transport of network traffic - between the AP and modem, on the Qualcomm SDM845 SoC. + between the AP and modem, on the Qualcomm SDM845 and SC7180 + SoCs. Note that if selected, the selection type must match that of QCOM_Q6V5_COMMON (Y or M).
Signature · 1 line
2.20.1
Quoted 6 lines · Alex Elder
Arrange for the IPA driver to be built when
COMPILE_TESTis enabled.Update the help text to reflect that we support two Qualcomm SoCs.
Suggested-by Jakub Kicinski <[email protected]>Signed-off-by Alex Elder <[email protected]>
Regards,
Bjorn
Quoted 35 lines
--- drivers/net/ipa/Kconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/net/ipa/Kconfig +6
-4@@ -1,9 +1,10 @@ config QCOM_IPA tristate "Qualcomm IPA support" - depends on ARCH_QCOM && 64BIT && NET - depends on QCOM_Q6V5_MSS + depends on 64BIT && NET + depends on ARCH_QCOM || COMPILE_TEST + depends on QCOM_RPROC_COMMON || (QCOM_RPROC_COMMON=n && COMPILE_TEST) + select QCOM_MDT_LOADER if ARCH_QCOM select QCOM_QMI_HELPERS - select QCOM_MDT_LOADER help Choose Y or M here to include support for the Qualcomm IP Accelerator (IPA), a hardware block present in some@@ -11,7 +12,8 @@ config QCOM_IPA that is capable of generic hardware handling of IP packets, including routing, filtering, and NAT. Currently the IPA driver supports only basic transport of network traffic - between the AP and modem, on the Qualcomm SDM845 SoC. + between the AP and modem, on the Qualcomm SDM845 and SC7180 + SoCs. Note that if selected, the selection type must match that of QCOM_Q6V5_COMMON (Y or M).Signature · 1 line
2.20.1
Quoted 10 lines · On Thu, 7 Jan 2021 17:34:00 -0600 Alex Elder wrote:
This series adds the IPA driver as a possible target when the
COMPILE_TESTconfiguration is enabled. Two small changes to dependent subsystems needed to be made for this to work.Version 2 of this series adds one more patch, which adds the declation of struct page to "
gsi_trans.h". The Intel kernel test robot reported that this was a problem for the alpha build.David/Jakub, please take all four of these patches through the net-next tree if you find them acceptable.
Applied, thanks a lot for doing this!
This series was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
Quoted 9 lines · On Thu, 7 Jan 2021 17:34:00 -0600 you wrote:
This series adds the IPA driver as a possible target when the
COMPILE_TESTconfiguration is enabled. Two small changes to dependent subsystems needed to be made for this to work.Version 2 of this series adds one more patch, which adds the declation of struct page to "
gsi_trans.h". The Intel kernel test robot reported that this was a problem for the alpha build.[...]
Here is the summary with links:
- [net-next,1/4] remoteproc: qcom: expose types for COMPILE_TEST
https://git.kernel.org/qcom/c/994122211665 - [net-next,2/4] soc: qcom: mdt_loader: define stubs for COMPILE_TEST https://git.kernel.org/qcom/c/ce2ceb9b1cff - [net-next,3/4] net: ipa: declare the page pointer type in "gsi_trans.h" https://git.kernel.org/qcom/c/a2d7764b3731 - [net-next,4/4] net: ipa: support COMPILE_TEST https://git.kernel.org/qcom/c/38a4066f593c
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
This series was applied to andersson/remoteproc.git (refs/heads/for-next):
Hello:
This series was applied to andersson/remoteproc.git (refs/heads/for-next):
Quoted 9 lines · On Thu, 7 Jan 2021 17:34:00 -0600 you wrote:
This series adds the IPA driver as a possible target when the
COMPILE_TESTconfiguration is enabled. Two small changes to dependent subsystems needed to be made for this to work.Version 2 of this series adds one more patch, which adds the declation of struct page to "
gsi_trans.h". The Intel kernel test robot reported that this was a problem for the alpha build.[...]
Here is the summary with links:
- [net-next,1/4] remoteproc: qcom: expose types for COMPILE_TEST
https://git.kernel.org/andersson/remoteproc/c/994122211665 - [net-next,2/4] soc: qcom: mdt_loader: define stubs for COMPILE_TEST https://git.kernel.org/andersson/remoteproc/c/ce2ceb9b1cff - [net-next,3/4] net: ipa: declare the page pointer type in "gsi_trans.h" https://git.kernel.org/andersson/remoteproc/c/a2d7764b3731 - [net-next,4/4] net: ipa: support COMPILE_TEST https://git.kernel.org/andersson/remoteproc/c/38a4066f593c
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html