Introduce LINUXKPI_GENSRCS.

Centralize the list of generated files required by linuxkpi consumers,
into the common variable.  This way, consumers that use the variable
are insulated from possible changes in the list.

Reviewed by:	hselasky, imp
Sponsored by:	Mellanox Technologies
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D24137

20 files changed, 55 insertions, 69 deletions

diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index ecf9f6b5fa22..55c8344e7da1 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -94,6 +94,16 @@ WERROR?=	-Wno-error
 WERROR?=	-Werror
 .endif
 
+LINUXKPI_GENSRCS+= \
+	bus_if.h \
+	device_if.h \
+	pci_if.h \
+	pci_iov_if.h \
+	vnode_if.h \
+	usb_if.h \
+	opt_usb.h \
+	opt_stack.h
+
 CFLAGS+=	${WERROR}
 CFLAGS+=	-D_KERNEL
 CFLAGS+=	-DKLD_MODULE
diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile
index e21281e478fc..6b17979e0df2 100644
--- a/sys/modules/cxgbe/iw_cxgbe/Makefile
+++ b/sys/modules/cxgbe/iw_cxgbe/Makefile
@@ -4,24 +4,17 @@ CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}/iw_cxgbe
 
 KMOD=	iw_cxgbe
-SRCS=	bus_if.h
 SRCS+=	cm.c
 SRCS+=	cq.c
 SRCS+=	device.c
-SRCS+=	device_if.h
 SRCS+=	ev.c
 SRCS+=	id_table.c
 SRCS+=	mem.c
-SRCS+=	opt_inet.h
-SRCS+=	opt_ktr.h
-SRCS+=	opt_ofed.h
-SRCS+=	opt_sched.h
-SRCS+=	pci_if.h
-SRCS+=	pcib_if.h
 SRCS+=	provider.c
 SRCS+=	qp.c
 SRCS+=	resource.c
-SRCS+=	vnode_if.h
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h opt_ktr.h opt_ofed.h opt_sched.h
 
 CFLAGS+= -I${CXGBE} -I${SRCTOP}/sys/ofed/include -DLINUX_TYPES_DEFINED
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile
index bb8156c01439..ba1f65748117 100644
--- a/sys/modules/ibcore/Makefile
+++ b/sys/modules/ibcore/Makefile
@@ -2,8 +2,7 @@
 .PATH:  ${SRCTOP}/sys/ofed/drivers/infiniband/core
 
 KMOD=	ibcore
-SRCS=	vnode_if.h device_if.h bus_if.h pci_if.h pci_iov_if.h \
-	opt_inet.h opt_inet6.h \
+SRCS= \
 	ib_addr.c \
 	ib_agent.c \
 	ib_cache.c \
@@ -32,6 +31,8 @@ SRCS=	vnode_if.h device_if.h bus_if.h pci_if.h pci_iov_if.h \
 	ib_uverbs_main.c \
 	ib_uverbs_marshall.c \
 	ib_verbs.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
diff --git a/sys/modules/ipoib/Makefile b/sys/modules/ipoib/Makefile
index 5b1a771442ab..2eb9f348e91b 100644
--- a/sys/modules/ipoib/Makefile
+++ b/sys/modules/ipoib/Makefile
@@ -2,10 +2,10 @@
 .PATH:  ${SRCTOP}/sys/ofed/drivers/infiniband/ulp/ipoib
 
 KMOD=	ipoib
-SRCS=	device_if.h bus_if.h vnode_if.h pci_if.h \
-	opt_inet.h opt_inet6.h opt_ofed.h \
-	ipoib_cm.c ipoib_ib.c ipoib_main.c \
+SRCS= 	ipoib_cm.c ipoib_ib.c ipoib_main.c \
 	ipoib_multicast.c ipoib_verbs.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h opt_ofed.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/drivers/infiniband/ulp/ipoib
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
diff --git a/sys/modules/iser/Makefile b/sys/modules/iser/Makefile
index 027f4f9bd8e4..c24c42a0f6fb 100644
--- a/sys/modules/iser/Makefile
+++ b/sys/modules/iser/Makefile
@@ -11,13 +11,9 @@ SRCS=	icl_iser.c
 SRCS+=	iser_initiator.c
 SRCS+=	iser_memory.c
 SRCS+=	iser_verbs.c
-SRCS+=	vnode_if.h
-SRCS+=	opt_inet.h
-SRCS+=	opt_inet6.h
-SRCS+=	opt_cam.h
-SRCS+=	bus_if.h
-SRCS+=	device_if.h
-SRCS+=	icl_conn_if.h
+
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h opt_cam.h icl_conn_if.h
 
 CFLAGS+= -I${SYSDIR}/
 CFLAGS+= -I${SYSDIR}/ofed/include
diff --git a/sys/modules/lindebugfs/Makefile b/sys/modules/lindebugfs/Makefile
index 0cb732e77b95..da61fd519e96 100644
--- a/sys/modules/lindebugfs/Makefile
+++ b/sys/modules/lindebugfs/Makefile
@@ -3,9 +3,8 @@
 .PATH: ${SRCTOP}/sys/compat/lindebugfs
 
 KMOD=	lindebugfs
-SRCS=	vnode_if.h \
-	device_if.h bus_if.h  pci_if.h \
-	lindebugfs.c
+SRCS=	lindebugfs.c
+SRCS+=	${LINUXKPI_GENSRCS}
 
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 
diff --git a/sys/modules/linuxkpi/Makefile b/sys/modules/linuxkpi/Makefile
index a82b3df52a86..4016ee341bc0 100644
--- a/sys/modules/linuxkpi/Makefile
+++ b/sys/modules/linuxkpi/Makefile
@@ -21,14 +21,7 @@ SRCS=	linux_compat.c \
 	linux_usb.c \
 	linux_work.c
 
-SRCS+=	bus_if.h \
-	device_if.h \
-	pci_if.h \
-	pci_iov_if.h \
-	vnode_if.h \
-	usb_if.h \
-	opt_usb.h \
-	opt_stack.h
+SRCS+=	${LINUXKPI_GENSRCS}
 
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include
diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile
index c4d25dedc173..cb140a59854f 100644
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -2,8 +2,7 @@
 .PATH:  ${SRCTOP}/sys/dev/mlx4/mlx4_core
 
 KMOD=	mlx4
-SRCS=	device_if.h bus_if.h vnode_if.h pci_if.h pci_iov_if.h \
-	opt_inet.h opt_inet6.h \
+SRCS= \
 	mlx4_alloc.c \
 	mlx4_catas.c \
 	mlx4_cmd.c \
@@ -24,6 +23,8 @@ SRCS=	device_if.h bus_if.h vnode_if.h pci_if.h pci_iov_if.h \
 	mlx4_sense.c \
 	mlx4_srq.c \
 	mlx4_resource_tracker.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
diff --git a/sys/modules/mlx4en/Makefile b/sys/modules/mlx4en/Makefile
index 3c11d59dea4f..b03f93008333 100644
--- a/sys/modules/mlx4en/Makefile
+++ b/sys/modules/mlx4en/Makefile
@@ -2,8 +2,7 @@
 .PATH:  ${SRCTOP}/sys/dev/mlx4/mlx4_en
 
 KMOD=	mlx4en
-SRCS=	device_if.h bus_if.h pci_if.h pci_iov_if.h vnode_if.h \
-	opt_inet.h opt_inet6.h \
+SRCS= \
 	mlx4_en_cq.c \
 	mlx4_en_main.c \
 	mlx4_en_netdev.c \
@@ -11,6 +10,8 @@ SRCS=	device_if.h bus_if.h pci_if.h pci_iov_if.h vnode_if.h \
 	mlx4_en_resources.c \
 	mlx4_en_rx.c \
 	mlx4_en_tx.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
diff --git a/sys/modules/mlx4ib/Makefile b/sys/modules/mlx4ib/Makefile
index 641c282ac238..dc819d7ef01d 100644
--- a/sys/modules/mlx4ib/Makefile
+++ b/sys/modules/mlx4ib/Makefile
@@ -2,8 +2,7 @@
 .PATH:  ${SRCTOP}/sys/dev/mlx4/mlx4_ib
 
 KMOD=	mlx4ib
-SRCS=	device_if.h bus_if.h vnode_if.h pci_if.h pci_iov_if.h \
-	opt_inet.h opt_inet6.h \
+SRCS= \
 	mlx4_ib_alias_GUID.c \
 	mlx4_ib_mcg.c \
 	mlx4_ib_sysfs.c \
@@ -17,6 +16,8 @@ SRCS=	device_if.h bus_if.h vnode_if.h pci_if.h pci_iov_if.h \
 	mlx4_ib_srq.c \
 	mlx4_ib_wc.c \
 	mlx4_ib_cm.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
diff --git a/sys/modules/mlx5/Makefile b/sys/modules/mlx5/Makefile
index 9972419b8fe8..26b46f8efdbd 100644
--- a/sys/modules/mlx5/Makefile
+++ b/sys/modules/mlx5/Makefile
@@ -33,9 +33,9 @@ mlx5_uar.c \
 mlx5_vport.c \
 mlx5_vsc.c \
 mlx5_wq.c \
-mlx5_gid.c \
-device_if.h bus_if.h vnode_if.h pci_if.h pci_iov_if.h \
-opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
+mlx5_gid.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
diff --git a/sys/modules/mlx5en/Makefile b/sys/modules/mlx5en/Makefile
index 26a9cd0803e0..8ecf2c77f117 100644
--- a/sys/modules/mlx5en/Makefile
+++ b/sys/modules/mlx5en/Makefile
@@ -12,10 +12,9 @@ mlx5_en_hw_tls.c \
 mlx5_en_rx.c \
 mlx5_en_rl.c \
 mlx5_en_txrx.c \
-mlx5_en_port_buffer.c \
-device_if.h bus_if.h vnode_if.h pci_if.h pci_iov_if.h \
-opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h \
-opt_kern_tls.h
+mlx5_en_port_buffer.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h opt_kern_tls.h
 
 .if defined(HAVE_PER_CQ_EVENT_PACKET)
 CFLAGS+= -DHAVE_PER_CQ_EVENT_PACKET
diff --git a/sys/modules/mlx5fpga_tools/Makefile b/sys/modules/mlx5fpga_tools/Makefile
index 76c3fbc173e0..23ae912589e2 100644
--- a/sys/modules/mlx5fpga_tools/Makefile
+++ b/sys/modules/mlx5fpga_tools/Makefile
@@ -6,9 +6,8 @@ SRCS= \
 	mlx5fpga_tools_main.c \
 	mlx5fpga_tools_char.c
 
-SRCS+= \
-	device_if.h bus_if.h vnode_if.h pci_if.h pci_iov_if.h \
-	opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+= 	opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
diff --git a/sys/modules/mlx5ib/Makefile b/sys/modules/mlx5ib/Makefile
index 09e12a06a24a..af0a1eb08b15 100644
--- a/sys/modules/mlx5ib/Makefile
+++ b/sys/modules/mlx5ib/Makefile
@@ -14,9 +14,9 @@ mlx5_ib_mem.c \
 mlx5_ib_mr.c \
 mlx5_ib_qp.c \
 mlx5_ib_srq.c \
-mlx5_ib_virt.c \
-device_if.h bus_if.h vnode_if.h pci_if.h pci_iov_if.h \
-opt_inet.h opt_inet6.h opt_ratelimit.h
+mlx5_ib_virt.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+= 	opt_inet.h opt_inet6.h opt_ratelimit.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
diff --git a/sys/modules/mlxfw/Makefile b/sys/modules/mlxfw/Makefile
index 6811d5fface7..98817b3954b9 100644
--- a/sys/modules/mlxfw/Makefile
+++ b/sys/modules/mlxfw/Makefile
@@ -5,8 +5,8 @@ KMOD=mlxfw
 SRCS= \
 mlxfw_fsm.c \
 mlxfw_mfa2.c \
-mlxfw_mfa2_tlv_multi.c \
-device_if.h bus_if.h vnode_if.h pci_if.h
+mlxfw_mfa2_tlv_multi.c
+SRCS+=	${LINUXKPI_GENSRCS}
 
 CFLAGS+= \
 	-I${SRCTOP}/sys/ofed/include \
diff --git a/sys/modules/mthca/Makefile b/sys/modules/mthca/Makefile
index ef436cc96355..584a86b6ada7 100644
--- a/sys/modules/mthca/Makefile
+++ b/sys/modules/mthca/Makefile
@@ -20,9 +20,9 @@ mthca_provider.c \
 mthca_qp.c \
 mthca_reset.c \
 mthca_srq.c \
-mthca_uar.c \
-device_if.h bus_if.h vnode_if.h pci_if.h \
-        opt_inet.h opt_inet6.h
+mthca_uar.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
diff --git a/sys/modules/qlnx/qlnxe/Makefile b/sys/modules/qlnx/qlnxe/Makefile
index 9bdd80ca153e..718040776496 100644
--- a/sys/modules/qlnx/qlnxe/Makefile
+++ b/sys/modules/qlnx/qlnxe/Makefile
@@ -57,15 +57,10 @@ SRCS+=ecore_ooo.c
 SRCS+=ecore_ll2.c
 SRCS+=qlnx_rdma.c
 
-
 SRCS+=qlnx_ioctl.c
 SRCS+=qlnx_os.c
 
-SRCS+= device_if.h
-SRCS+= bus_if.h
-SRCS+= pci_if.h
-SRCS+= pci_iov_if.h
-
+SRCS+=	${LINUXKPI_GENSRCS}
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/modules/qlnx/qlnxev/Makefile b/sys/modules/qlnx/qlnxev/Makefile
index f0b1fde34959..4c79eee59a55 100644
--- a/sys/modules/qlnx/qlnxev/Makefile
+++ b/sys/modules/qlnx/qlnxev/Makefile
@@ -51,10 +51,7 @@ SRCS+=ecore_vf.c
 SRCS+=qlnx_ioctl.c
 SRCS+=qlnx_os.c
 
-SRCS+= device_if.h
-SRCS+= bus_if.h
-SRCS+= pci_if.h
-SRCS+= pci_iov_if.h
+SRCS+=	${LINUXKPI_GENSRCS}
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/modules/qlnx/qlnxr/Makefile b/sys/modules/qlnx/qlnxr/Makefile
index 0f7486cbe155..f193ff09e7ef 100644
--- a/sys/modules/qlnx/qlnxr/Makefile
+++ b/sys/modules/qlnx/qlnxr/Makefile
@@ -41,11 +41,12 @@ OFEDDIR=${SRCTOP}/sys
 ETHDRVR=${SRCTOP}/sys/dev/qlnx/qlnxe
 
 KMOD=   qlnxr
-SRCS=   device_if.h bus_if.h vnode_if.h pci_if.h \
-        opt_inet.h opt_inet6.h \
+SRCS=   \
         qlnxr_os.c\
 	qlnxr_cm.c\
 	qlnxr_verbs.c
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_inet.h opt_inet6.h
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/modules/rdma/krping/Makefile b/sys/modules/rdma/krping/Makefile
index 989cc46def7a..f3f8e1270f5e 100644
--- a/sys/modules/rdma/krping/Makefile
+++ b/sys/modules/rdma/krping/Makefile
@@ -3,7 +3,7 @@
 
 KMOD= krping
 SRCS= krping.c krping_dev.c getopt.c
-SRCS+=  bus_if.h device_if.h pci_if.h pci_iov_if.h pcib_if.h vnode_if.h
+SRCS+=	${LINUXKPI_GENSRCS}
 SRCS+=  opt_sched.h opt_inet.h opt_inet6.h
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi