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.
David/Jakub, it would be best to take all three of these patches through the same tree. I have discussed this with Bjorn and he agreed to ack them, and I request that you take them through net-next.
Thanks.
-Alex
Alex Elder (3):
remoteproc: qcom: expose types for COMPILE_TEST
soc: qcom: mdt_loader: define stubs for COMPILE_TEST
net: ipa: support COMPILE_TEST
drivers/net/ipa/Kconfig | 10 +++++--- include/linux/remoteproc/qcom_rproc.h | 4 +-- include/linux/soc/qcom/mdt_loader.h | 35 +++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 6 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/3 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
Re: [PATCH net-next 1/3] remoteproc: qcom: expose types for COMPILE_TEST
Quoted 5 lines · Alex Elder
Stub functions are defined for SSR notifier registration in case
QCOM_RPROC_COMMONis not configured. As a result, code that uses these functions can link successfully even if the common remoteproc code is not built.
Quoted 8 lines
Code that registers an SSR notifier function likely needs the types defined in "
qcom_rproc.h", but those are only exposed ifQCOM_RPROC_COMMONis enabled.Rearrange the conditional definition so the
qcom_ssr_notify_datastructure andqcom_ssr_notify_typeenumerated type are defined whether or notQCOM_RPROC_COMMONis enabled.
@Jakub, @Dave, as this is a prerequisite for allowing IPA to be compile tested feel free to merge it together with patch 3.
Regards,
Bjorn
Quoted 30 lines
Signed-off-by Alex Elder <[email protected]>--- 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/3 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
Re: [PATCH net-next 2/3] soc: qcom: mdt_loader: define stubs for COMPILE_TEST
Quoted 5 lines · Alex Elder
Define stub functions for the exposed MDT functions in case
QCOM_MDT_LOADERis not configured. This allows users of these functions to link correctly forCOMPILE_TESTbuilds withoutQCOM_SCMenabled.
@Jakub, @Dave, as with patch 1, please take this through your tree as well.
Regards,
Bjorn
Quoted 59 lines
Signed-off-by Alex Elder <[email protected]>--- 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/3 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
kernel test robot
build botI love your patch! Perhaps something to improve:
Hi Alex,
I love your patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/Alex-Elder/net-ipa-support-COMPILE_TEST/20210106-104149 base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 config: alpha-allyesconfig (attached as .config) compiler: alpha-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/7ab1759d9336e95f4de013bb171246b66f94e2f4
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Alex-Elder/net-ipa-support-COMPILE_TEST/20210106-104149 git checkout 7ab1759d9336e95f4de013bb171246b66f94e2f4
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=alpha
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
In file included from drivers/net/ipa/ipa_gsi.c:10:
>> drivers/net/ipa/gsi_trans.h:170:56: warning: 'struct page' declared inside parameter list will not be visible outside of this definition or declaration
170 | int gsi_trans_page_add(struct gsi_trans *trans, struct page *page, u32 size,
| ^~~~
vim +170 drivers/net/ipa/gsi_trans.h
9dd441e4ed5755c Alex Elder 2020-03-05 149 9dd441e4ed5755c Alex Elder 2020-03-05 150 /** 9dd441e4ed5755c Alex Elder 2020-03-05 151 * gsi_trans_cmd_add() - Add an immediate command to a transaction 9dd441e4ed5755c Alex Elder 2020-03-05 152 * @trans: Transaction 9dd441e4ed5755c Alex Elder 2020-03-05 153 * @buf: Buffer pointer for command payload 9dd441e4ed5755c Alex Elder 2020-03-05 154 * @size: Number of bytes in buffer 9dd441e4ed5755c Alex Elder 2020-03-05 155 * @addr: DMA address for payload 9dd441e4ed5755c Alex Elder 2020-03-05 156 * @direction: Direction of DMA transfer (or DMA_NONE if none required) 9dd441e4ed5755c Alex Elder 2020-03-05 157 * @opcode: IPA immediate command opcode 9dd441e4ed5755c Alex Elder 2020-03-05 158 */ 9dd441e4ed5755c Alex Elder 2020-03-05 159 void gsi_trans_cmd_add(struct gsi_trans *trans, void *buf, u32 size, 9dd441e4ed5755c Alex Elder 2020-03-05 160 dma_addr_t addr, enum dma_data_direction direction, 9dd441e4ed5755c Alex Elder 2020-03-05 161 enum ipa_cmd_opcode opcode); 9dd441e4ed5755c Alex Elder 2020-03-05 162 9dd441e4ed5755c Alex Elder 2020-03-05 163 /** 9dd441e4ed5755c Alex Elder 2020-03-05 164 * gsi_trans_page_add() - Add a page transfer to a transaction 9dd441e4ed5755c Alex Elder 2020-03-05 165 * @trans: Transaction 9dd441e4ed5755c Alex Elder 2020-03-05 166 * @page: Page pointer 9dd441e4ed5755c Alex Elder 2020-03-05 167 * @size: Number of bytes (starting at offset) to transfer 9dd441e4ed5755c Alex Elder 2020-03-05 168 * @offset: Offset within page for start of transfer 9dd441e4ed5755c Alex Elder 2020-03-05 169 */
9dd441e4ed5755c Alex Elder 2020-03-05 @170 int gsi_trans_page_add(struct gsi_trans *trans, struct page *page, u32 size,9dd441e4ed5755c Alex Elder 2020-03-05 171 u32 offset);9dd441e4ed5755c Alex Elder 2020-03-05 172
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Quoted 5 lines · kernel test robot
Hi Alex,
I love your patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
I think I just need to define at the top of "gsi_trans.h":
struct page;
I'll submit v2 of this series, with this one change (assuming it's the correct fix). I will incorporate Bjorn's review tags on the first two patches.
-Alex
Quoted 56 lines
url: https://github.com/0day-ci/linux/commits/Alex-Elder/net-ipa-support-COMPILE_TEST/20210106-104149 base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 config: alpha-allyesconfig (attached as .config) compiler: alpha-linux-gcc (GCC) 9.3.0reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/7ab1759d9336e95f4de013bb171246b66f94e2f4
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Alex-Elder/net-ipa-support-COMPILE_TEST/20210106-104149 git checkout7ab1759d9336e95f4de013bb171246b66f94e2f4
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=alphaIf you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
In file included from
drivers/net/ipa/ipa_gsi.c:10:Quoted 1 line
Quoted 1 line
drivers/net/ipa/gsi_trans.h:170:56: warning: 'struct page' declared inside parameter list will not be visible outside of this definition or declaration170 | int gsi_trans_page_add(struct
gsi_trans*trans, struct page *page, u32 size,
| ^~~~vim +170
drivers/net/ipa/gsi_trans.h9dd441e4ed5755c Alex Elder 2020-03-05 149 9dd441e4ed5755c Alex Elder 2020-03-05 150 /** 9dd441e4ed5755c Alex Elder 2020-03-05 151 * gsi_trans_cmd_add() - Add an immediate command to a transaction 9dd441e4ed5755c Alex Elder 2020-03-05 152 * @trans: Transaction 9dd441e4ed5755c Alex Elder 2020-03-05 153 * @buf: Buffer pointer for command payload 9dd441e4ed5755c Alex Elder 2020-03-05 154 * @size: Number of bytes in buffer 9dd441e4ed5755c Alex Elder 2020-03-05 155 * @addr: DMA address for payload 9dd441e4ed5755c Alex Elder 2020-03-05 156 * @direction: Direction of DMA transfer (or DMA_NONE if none required) 9dd441e4ed5755c Alex Elder 2020-03-05 157 * @opcode: IPA immediate command opcode 9dd441e4ed5755c Alex Elder 2020-03-05 158 */ 9dd441e4ed5755c Alex Elder 2020-03-05 159 void gsi_trans_cmd_add(struct gsi_trans *trans, void *buf, u32 size, 9dd441e4ed5755c Alex Elder 2020-03-05 160 dma_addr_t addr, enum dma_data_direction direction, 9dd441e4ed5755c Alex Elder 2020-03-05 161 enum ipa_cmd_opcode opcode); 9dd441e4ed5755c Alex Elder 2020-03-05 162 9dd441e4ed5755c Alex Elder 2020-03-05 163 /** 9dd441e4ed5755c Alex Elder 2020-03-05 164 * gsi_trans_page_add() - Add a page transfer to a transaction 9dd441e4ed5755c Alex Elder 2020-03-05 165 * @trans: Transaction 9dd441e4ed5755c Alex Elder 2020-03-05 166 * @page: Page pointer 9dd441e4ed5755c Alex Elder 2020-03-05 167 * @size: Number of bytes (starting at offset) to transfer 9dd441e4ed5755c Alex Elder 2020-03-05 168 * @offset: Offset within page for start of transfer 9dd441e4ed5755c Alex Elder 2020-03-05 169 */
9dd441e4ed5755cAlex Elder 2020-03-05 @170 int gsi_trans_page_add(structgsi_trans*trans, struct page *page, u32 size,9dd441e4ed5755cAlex Elder 2020-03-05 171 u32 offset);9dd441e4ed5755cAlex Elder 2020-03-05 172---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org