14 files changed, 102 insertions, 17 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index e31dc1bd5e51..48f9a6e678ee 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -250,8 +250,8 @@ SUBDIR=	\
 	${_mly} \
 	mmc \
 	mmcsd \
-	mpr \
-	mps \
+	${_mpr} \
+	${_mps} \
 	mpt \
 	mqueue \
 	mrsas \
@@ -523,6 +523,13 @@ _rtwnfw=	rtwnfw
 _cxgbe=		cxgbe
 .endif
 
+# These rely on 64bit atomics
+.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspc" && \
+	${MACHINE_CPUARCH} != "mips"
+_mps=		mps
+_mpr=		mpr
+.endif
+
 .if ${MK_TESTS} != "no" || defined(ALL_MODULES)
 SUBDIR+=	tests
 .endif
diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile
index d35287bab5cf..8714bbb287dd 100644
--- a/sys/modules/cxgbe/if_cxgbe/Makefile
+++ b/sys/modules/cxgbe/if_cxgbe/Makefile
@@ -15,6 +15,7 @@ SRCS+=	opt_ofed.h
 SRCS+=	opt_ratelimit.h
 SRCS+=	opt_rss.h
 SRCS+=	pci_if.h pci_iov_if.h
+SRCS+=	t4_clip.c
 SRCS+=	t4_filter.c
 SRCS+=	t4_hw.c
 SRCS+=	t4_if.c t4_if.h
diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile
index df7fe9b75e68..86277c1da3e2 100644
--- a/sys/modules/dtb/allwinner/Makefile
+++ b/sys/modules/dtb/allwinner/Makefile
@@ -44,7 +44,8 @@ DTS=	\
 	allwinner/sun50i-a64-sopine-baseboard.dts \
 	allwinner/sun50i-h5-orangepi-pc2.dts
 
-DTSO=	sun50i-a64-sid.dtso \
+DTSO=	sun50i-a64-opp.dtso \
+	sun50i-a64-sid.dtso \
 	sun50i-a64-ths.dtso \
 	sun50i-a64-timer.dtso
 
diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile
new file mode 100644
index 000000000000..aefbc9e9a3b9
--- /dev/null
+++ b/sys/modules/dtb/rockchip/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+# For now only for rk3328-rock64 dts file.
+
+DTS=	\
+	rockchip/rk3328-rock64.dts
+
+.include <bsd.dtb.mk>
diff --git a/sys/modules/iavf/Makefile b/sys/modules/iavf/Makefile
index 48d9c1fe23c9..c3a1c3f5400f 100644
--- a/sys/modules/iavf/Makefile
+++ b/sys/modules/iavf/Makefile
@@ -15,4 +15,6 @@ SRCS    += i40e_common.c i40e_nvm.c i40e_adminq.c
 # Enable asserts and other debugging facilities
 # CFLAGS += -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS
 
+LINKS=	${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/mlx5/Makefile b/sys/modules/mlx5/Makefile
index b39da364973a..f90db5ba92d7 100644
--- a/sys/modules/mlx5/Makefile
+++ b/sys/modules/mlx5/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
-.PATH:	${SRCTOP}/sys/dev/mlx5/mlx5_core
+.PATH:	${SRCTOP}/sys/dev/mlx5/mlx5_core \
+	${SRCTOP}/sys/dev/mlx5/mlx5_lib \
+	${SRCTOP}/sys/dev/mlx5/mlx5_fpga
 
 KMOD=mlx5
 SRCS= \
@@ -29,12 +31,23 @@ 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
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 
+.if defined(CONFIG_BUILD_FPGA)
+SRCS+= \
+	mlx5fpga_cmd.c \
+	mlx5fpga_core.c \
+	mlx5fpga_sdk.c \
+	mlx5fpga_trans.c \
+	mlx5fpga_xfer.c \
+	mlx5fpga_ipsec.c
+.endif
+
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/mlx5en/Makefile b/sys/modules/mlx5en/Makefile
index b413e2c32602..efac33e5e3fb 100644
--- a/sys/modules/mlx5en/Makefile
+++ b/sys/modules/mlx5en/Makefile
@@ -21,6 +21,10 @@ CFLAGS+= -DHAVE_PER_CQ_EVENT_PACKET
 CFLAGS+= -DHAVE_TCP_LRO_RX
 .endif
 
+.if defined(CONFIG_BUILD_FPGA)
+CFLAGS+= -DCONFIG_MLX5_FPGA
+.endif
+
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 
diff --git a/sys/modules/mlx5fpga_tools/Makefile b/sys/modules/mlx5fpga_tools/Makefile
new file mode 100644
index 000000000000..c9bb559c7fcf
--- /dev/null
+++ b/sys/modules/mlx5fpga_tools/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+.PATH:	${SRCTOP}/sys/dev/mlx5/mlx5_fpga_tools
+
+KMOD=mlx5fpga_tools
+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
+
+CFLAGS+= -I${SRCTOP}/sys/ofed/include
+CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+
+.include <bsd.kmod.mk>
+
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
+CFLAGS+= -DCONFIG_MLX5_FPGA -DCONFIG_MLX5_ACCEL
diff --git a/sys/modules/mlx5ib/Makefile b/sys/modules/mlx5ib/Makefile
index b3b823a07195..fb9c7fbc6612 100644
--- a/sys/modules/mlx5ib/Makefile
+++ b/sys/modules/mlx5ib/Makefile
@@ -23,6 +23,10 @@ CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
 
+.if defined(CONFIG_BUILD_FPGA)
+CFLAGS+= -DCONFIG_MLX5_FPGA
+.endif
+
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index ac674d16d812..56ad7bd4a543 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -11,6 +11,7 @@ SUBDIR=	async \
 	bpf \
 	bridge \
 	car \
+	checksum \
 	cisco \
 	deflate \
 	device \
diff --git a/sys/modules/netmap/Makefile b/sys/modules/netmap/Makefile
index dbc686823573..8d0b358115fd 100644
--- a/sys/modules/netmap/Makefile
+++ b/sys/modules/netmap/Makefile
@@ -3,12 +3,12 @@
 # Compile netmap as a module, useful if you want a netmap bridge
 # or loadable drivers.
 
-SYSDIR?=${SRCTOP}/sys
-.include "${SYSDIR}/conf/kern.opts.mk"
+.include <bsd.own.mk> # FreeBSD 10 and earlier
+# .include "${SYSDIR}/conf/kern.opts.mk"
 
-.PATH: ${SYSDIR}/dev/netmap
-.PATH.h: ${SYSDIR}/net
-CFLAGS += -I${SYSDIR}/ -D INET
+.PATH: ${.CURDIR}/../../dev/netmap
+.PATH.h: ${.CURDIR}/../../net
+CFLAGS += -I${.CURDIR}/../../ -D INET -D VIMAGE
 KMOD	= netmap
 SRCS	= device_if.h bus_if.h pci_if.h opt_netmap.h
 SRCS	+= netmap.c netmap.h netmap_kern.h
@@ -20,8 +20,10 @@ SRCS	+= netmap_freebsd.c
 SRCS	+= netmap_offloadings.c
 SRCS	+= netmap_pipe.c
 SRCS	+= netmap_monitor.c
-SRCS	+= netmap_pt.c
+SRCS	+= netmap_kloop.c
 SRCS	+= netmap_legacy.c
+SRCS	+= netmap_bdg.c
+SRCS	+= netmap_null.c
 SRCS	+= if_ptnet.c
 SRCS	+= opt_inet.h opt_inet6.h
 
diff --git a/sys/modules/rockchip/Makefile b/sys/modules/rockchip/Makefile
index 7003010e413d..a06f3e658da7 100644
--- a/sys/modules/rockchip/Makefile
+++ b/sys/modules/rockchip/Makefile
@@ -3,5 +3,6 @@
 
 SUBDIR = \
 	rk_i2c \
+	rk805
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/rockchip/rk805/Makefile b/sys/modules/rockchip/rk805/Makefile
new file mode 100644
index 000000000000..395b9fc49c72
--- /dev/null
+++ b/sys/modules/rockchip/rk805/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.PATH: ${SRCTOP}/sys/arm64/rockchip
+
+KMOD=	rk805
+SRCS=	rk805.c
+
+SRCS+=	\
+	bus_if.h \
+	device_if.h \
+	iicbus_if.h \
+	regnode_if.h \
+	regdev_if.h \
+	ofw_bus_if.h \
+	opt_platform.h \
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile
index a905663dea22..b16b6e48b887 100644
--- a/sys/modules/sfxge/Makefile
+++ b/sys/modules/sfxge/Makefile
@@ -16,11 +16,14 @@ SRCS+=	sfxge.h sfxge_rx.h sfxge_tx.h sfxge_version.h
 .PATH: ${SRCTOP}/sys/dev/sfxge/common
 SRCS+=	efx_bootcfg.c efx_crc32.c efx_ev.c efx_intr.c efx_lic.c efx_mac.c
 SRCS+=	efx_mcdi.c efx_mon.c efx_nic.c
-SRCS+=	efx_nvram.c efx_phy.c efx_port.c efx_rx.c efx_sram.c efx_tx.c
-SRCS+=	efx_vpd.c efx_filter.c efx_hash.c
+SRCS+=	efx_nvram.c efx_phy.c efx_port.c efx_rx.c efx_sram.c efx_tunnel.c
+SRCS+=	efx_tx.c efx_vpd.c efx_filter.c efx_hash.c
 SRCS+=	efsys.h
-SRCS+=	efx.h efx_check.h efx_impl.h efx_mcdi.h efx_regs.h efx_regs_ef10.h
-SRCS+=	efx_regs_mcdi.h efx_regs_pci.h efx_types.h efx_phy_ids.h
+SRCS+=	efx.h efx_annote.h efx_check.h efx_impl.h efx_mcdi.h
+SRCS+=	efx_regs.h efx_regs_ef10.h
+SRCS+=	efx_regs_mcdi.h efx_regs_mcdi_aoe.h efx_regs_mcdi_strs.h
+SRCS+=	efx_regs_pci.h efx_types.h
+SRCS+=	efx_phy_ids.h
 SRCS+=	ef10_tlv_layout.h
 
 SRCS+=	mcdi_mon.c mcdi_mon.h
@@ -29,9 +32,9 @@ SRCS+=	siena_mac.c siena_mcdi.c siena_nic.c siena_nvram.c siena_phy.c
 SRCS+=	siena_sram.c siena_vpd.c
 SRCS+=	siena_flash.h siena_impl.h
 
-SRCS+=	ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c ef10_mcdi.c ef10_nic.c
-SRCS+=	ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c ef10_vpd.c
-SRCS+=	ef10_impl.h
+SRCS+=	ef10_ev.c ef10_filter.c ef10_image.c ef10_intr.c ef10_mac.c ef10_mcdi.c
+SRCS+=	ef10_nic.c ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c ef10_vpd.c
+SRCS+=	ef10_impl.h ef10_signed_image_layout.h
 
 SRCS+=	hunt_nic.c
 SRCS+=	hunt_impl.h
@@ -39,6 +42,9 @@ SRCS+=	hunt_impl.h
 SRCS+=	medford_nic.c
 SRCS+=	medford_impl.h
 
+SRCS+=	medford2_nic.c
+SRCS+=	medford2_impl.h
+
 # Extra debug checks
 #CFLAGS += -DDEBUG=1