Skip to content

Commit 7e34984

Browse files
committed
Merge branch 'net-ipa-support-compile_test'
Alex Elder says: ==================== 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. ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 3f5ec37 + 38a4066 commit 7e34984

File tree

4 files changed

+44
-6
lines changed

4 files changed

+44
-6
lines changed

drivers/net/ipa/Kconfig

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
config QCOM_IPA
22
tristate "Qualcomm IPA support"
3-
depends on ARCH_QCOM && 64BIT && NET
4-
depends on QCOM_Q6V5_MSS
3+
depends on 64BIT && NET
4+
depends on ARCH_QCOM || COMPILE_TEST
5+
depends on QCOM_RPROC_COMMON || (QCOM_RPROC_COMMON=n && COMPILE_TEST)
6+
select QCOM_MDT_LOADER if ARCH_QCOM
57
select QCOM_QMI_HELPERS
6-
select QCOM_MDT_LOADER
78
help
89
Choose Y or M here to include support for the Qualcomm
910
IP Accelerator (IPA), a hardware block present in some
1011
Qualcomm SoCs. The IPA is a programmable protocol processor
1112
that is capable of generic hardware handling of IP packets,
1213
including routing, filtering, and NAT. Currently the IPA
1314
driver supports only basic transport of network traffic
14-
between the AP and modem, on the Qualcomm SDM845 SoC.
15+
between the AP and modem, on the Qualcomm SDM845 and SC7180
16+
SoCs.
1517

1618
Note that if selected, the selection type must match that
1719
of QCOM_Q6V5_COMMON (Y or M).

drivers/net/ipa/gsi_trans.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include "ipa_cmd.h"
1515

16+
struct page;
1617
struct scatterlist;
1718
struct device;
1819
struct sk_buff;

include/linux/remoteproc/qcom_rproc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
struct notifier_block;
55

6-
#if IS_ENABLED(CONFIG_QCOM_RPROC_COMMON)
7-
86
/**
97
* enum qcom_ssr_notify_type - Startup/Shutdown events related to a remoteproc
108
* processor.
@@ -26,6 +24,8 @@ struct qcom_ssr_notify_data {
2624
bool crashed;
2725
};
2826

27+
#if IS_ENABLED(CONFIG_QCOM_RPROC_COMMON)
28+
2929
void *qcom_register_ssr_notifier(const char *name, struct notifier_block *nb);
3030
int qcom_unregister_ssr_notifier(void *notify, struct notifier_block *nb);
3131

include/linux/soc/qcom/mdt_loader.h

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
struct device;
1212
struct firmware;
1313

14+
#if IS_ENABLED(CONFIG_QCOM_MDT_LOADER)
15+
1416
ssize_t qcom_mdt_get_size(const struct firmware *fw);
1517
int qcom_mdt_load(struct device *dev, const struct firmware *fw,
1618
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,
2325
phys_addr_t *reloc_base);
2426
void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len);
2527

28+
#else /* !IS_ENABLED(CONFIG_QCOM_MDT_LOADER) */
29+
30+
static inline ssize_t qcom_mdt_get_size(const struct firmware *fw)
31+
{
32+
return -ENODEV;
33+
}
34+
35+
static inline int qcom_mdt_load(struct device *dev, const struct firmware *fw,
36+
const char *fw_name, int pas_id,
37+
void *mem_region, phys_addr_t mem_phys,
38+
size_t mem_size, phys_addr_t *reloc_base)
39+
{
40+
return -ENODEV;
41+
}
42+
43+
static inline int qcom_mdt_load_no_init(struct device *dev,
44+
const struct firmware *fw,
45+
const char *fw_name, int pas_id,
46+
void *mem_region, phys_addr_t mem_phys,
47+
size_t mem_size,
48+
phys_addr_t *reloc_base)
49+
{
50+
return -ENODEV;
51+
}
52+
53+
static inline void *qcom_mdt_read_metadata(const struct firmware *fw,
54+
size_t *data_len)
55+
{
56+
return ERR_PTR(-ENODEV);
57+
}
58+
59+
#endif /* !IS_ENABLED(CONFIG_QCOM_MDT_LOADER) */
60+
2661
#endif

0 commit comments

Comments
 (0)