Commit 7e34984c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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/20210107233404.17030-1-elder@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3f5ec374 38a4066f

drivers/net/ipa/Kconfig

+6 −4
Original line number Diff line number Diff line 
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).

drivers/net/ipa/gsi_trans.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include "ipa_cmd.h"



struct page;

struct scatterlist;

struct device;

struct sk_buff;

include/linux/remoteproc/qcom_rproc.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/soc/qcom/mdt_loader.h

+35 −0
Original line number Diff line number Diff line
@@ -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