Author: kib
Date: Fri Mar 27 20:06:40 2020
New Revision: 359378
URL: https://svnweb.freebsd.org/changeset/base/359378
Log:
MFC r359185:
Introduce LINUXKPI_GENSRCS.
For MFC, pci_iov_if.h is excluded from the list. It will be readded
when linuxkpi support for SRIOV is merged.
Sponsored by: Mellanox Technologies
Modified:
stable/12/sys/conf/kmod.mk
stable/12/sys/modules/cxgbe/iw_cxgbe/Makefile
stable/12/sys/modules/ibcore/Makefile
stable/12/sys/modules/ipoib/Makefile
stable/12/sys/modules/iser/Makefile
stable/12/sys/modules/linuxkpi/Makefile
stable/12/sys/modules/mlx4/Makefile
stable/12/sys/modules/mlx4en/Makefile
stable/12/sys/modules/mlx4ib/Makefile
stable/12/sys/modules/mlx5/Makefile
stable/12/sys/modules/mlx5en/Makefile
stable/12/sys/modules/mlx5fpga_tools/Makefile
stable/12/sys/modules/mlx5ib/Makefile
stable/12/sys/modules/mlxfw/Makefile
stable/12/sys/modules/mthca/Makefile
stable/12/sys/modules/qlnx/qlnxe/Makefile
stable/12/sys/modules/qlnx/qlnxev/Makefile
stable/12/sys/modules/rdma/krping/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/conf/kmod.mk
==============================================================================
--- stable/12/sys/conf/kmod.mk Fri Mar 27 19:39:14 2020 (r359377)
+++ stable/12/sys/conf/kmod.mk Fri Mar 27 20:06:40 2020 (r359378)
@@ -113,6 +113,15 @@ WERROR?= -Wno-error
WERROR?= -Werror
.endif
+LINUXKPI_GENSRCS+= \
+ bus_if.h \
+ device_if.h \
+ pci_if.h \
+ vnode_if.h \
+ usb_if.h \
+ opt_usb.h \
+ opt_stack.h
+
CFLAGS+= ${WERROR}
CFLAGS+= -D_KERNEL
CFLAGS+= -DKLD_MODULE
Modified: stable/12/sys/modules/cxgbe/iw_cxgbe/Makefile
==============================================================================
--- stable/12/sys/modules/cxgbe/iw_cxgbe/Makefile Fri Mar 27 19:39:14
2020 (r359377)
+++ stable/12/sys/modules/cxgbe/iw_cxgbe/Makefile Fri Mar 27 20:06:40
2020 (r359378)
@@ -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
Modified: stable/12/sys/modules/ibcore/Makefile
==============================================================================
--- stable/12/sys/modules/ibcore/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/ibcore/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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 \
- 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 \
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
Modified: stable/12/sys/modules/ipoib/Makefile
==============================================================================
--- stable/12/sys/modules/ipoib/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/ipoib/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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
Modified: stable/12/sys/modules/iser/Makefile
==============================================================================
--- stable/12/sys/modules/iser/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/iser/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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
Modified: stable/12/sys/modules/linuxkpi/Makefile
==============================================================================
--- stable/12/sys/modules/linuxkpi/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/linuxkpi/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -19,13 +19,7 @@ SRCS= linux_compat.c \
linux_usb.c \
linux_work.c
-SRCS+= bus_if.h \
- device_if.h \
- pci_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
Modified: stable/12/sys/modules/mlx4/Makefile
==============================================================================
--- stable/12/sys/modules/mlx4/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/mlx4/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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 \
- 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 \
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
Modified: stable/12/sys/modules/mlx4en/Makefile
==============================================================================
--- stable/12/sys/modules/mlx4en/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/mlx4en/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -2,8 +2,7 @@
.PATH: ${SRCTOP}/sys/dev/mlx4/mlx4_en
KMOD= mlx4en
-SRCS= device_if.h bus_if.h pci_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 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
Modified: stable/12/sys/modules/mlx4ib/Makefile
==============================================================================
--- stable/12/sys/modules/mlx4ib/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/mlx4ib/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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 \
- 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 \
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
Modified: stable/12/sys/modules/mlx5/Makefile
==============================================================================
--- stable/12/sys/modules/mlx5/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/mlx5/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -31,9 +31,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 \
-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
Modified: stable/12/sys/modules/mlx5en/Makefile
==============================================================================
--- stable/12/sys/modules/mlx5en/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/mlx5en/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -11,9 +11,9 @@ mlx5_en_flow_table.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 \
-opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
+mlx5_en_port_buffer.c
+SRCS+= ${LINUXKPI_GENSRCS}
+SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
.if defined(HAVE_PER_CQ_EVENT_PACKET)
CFLAGS+= -DHAVE_PER_CQ_EVENT_PACKET
Modified: stable/12/sys/modules/mlx5fpga_tools/Makefile
==============================================================================
--- stable/12/sys/modules/mlx5fpga_tools/Makefile Fri Mar 27 19:39:14
2020 (r359377)
+++ stable/12/sys/modules/mlx5fpga_tools/Makefile Fri Mar 27 20:06:40
2020 (r359378)
@@ -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 \
- 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
Modified: stable/12/sys/modules/mlx5ib/Makefile
==============================================================================
--- stable/12/sys/modules/mlx5ib/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/mlx5ib/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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 \
-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
Modified: stable/12/sys/modules/mlxfw/Makefile
==============================================================================
--- stable/12/sys/modules/mlxfw/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/mlxfw/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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 \
Modified: stable/12/sys/modules/mthca/Makefile
==============================================================================
--- stable/12/sys/modules/mthca/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/mthca/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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
Modified: stable/12/sys/modules/qlnx/qlnxe/Makefile
==============================================================================
--- stable/12/sys/modules/qlnx/qlnxe/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/qlnx/qlnxe/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -50,11 +50,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>
Modified: stable/12/sys/modules/qlnx/qlnxev/Makefile
==============================================================================
--- stable/12/sys/modules/qlnx/qlnxev/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/qlnx/qlnxev/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -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>
Modified: stable/12/sys/modules/rdma/krping/Makefile
==============================================================================
--- stable/12/sys/modules/rdma/krping/Makefile Fri Mar 27 19:39:14 2020
(r359377)
+++ stable/12/sys/modules/rdma/krping/Makefile Fri Mar 27 20:06:40 2020
(r359378)
@@ -3,7 +3,7 @@
KMOD= krping
SRCS= krping.c krping_dev.c getopt.c
-SRCS+= bus_if.h device_if.h pci_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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
