Move the ConnectX-3 and ConnectX-2 driver from sys/ofed into sys/dev/mlx4

like other PCI network drivers. The sys/ofed directory is now mainly
reserved for generic infiniband code, with exception of the mthca driver.

- Add new manual page, mlx4en(4), describing how to configure and load
mlx4en.

- All relevant driver C-files are now prefixed mlx4, mlx4_en and
mlx4_ib respectivly to avoid object filename collisions when compiling
the kernel. This also fixes an issue with proper dependency file
generation for the C-files in question.

- Device mlxen is now device mlx4en and depends on device mlx4, see
mlx4en(4). Only the network device name remains unchanged.

- The mlx4 and mlx4en modules are now built by default on i386 and
amd64 targets. Only building the mlx4ib module depends on
WITH_OFED=YES .

Sponsored by:	Mellanox Technologies

5 files changed, 60 insertions, 30 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index bd6326175d5b..0be224ff1747 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -233,7 +233,7 @@ SUBDIR=	\
 	mlx \
 	${_mlx4} \
 	${_mlx4ib} \
-	${_mlxen} \
+	${_mlx4en} \
 	${_mlx5} \
 	${_mlx5en} \
 	${_mly} \
@@ -631,16 +631,16 @@ _iwifw=		iwifw
 _iwmfw=		iwmfw
 _iwnfw=		iwnfw
 .endif
-.if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mlx4=		mlx4
-_mlx4ib=	mlx4ib
-_mlxen=		mlxen
-.endif
 _mlx5=		mlx5
 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
+_mlx4en=	mlx4en
 _mlx5en=	mlx5en
 .endif
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
+_mlx4ib=	mlx4ib
+.endif
 _mly=		mly
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mthca=		mthca
diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile
index 0aed17d61555..6fd4620dffcc 100644
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -1,15 +1,30 @@
 # $FreeBSD$
-.PATH:  ${.CURDIR}/../../ofed/drivers/net/mlx4
+.PATH:  ${.CURDIR}/../../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 \
-	alloc.c catas.c cmd.c cq.c eq.c \
-	fw.c icm.c intf.c main.c mcg.c mr.c \
-	pd.c port.c profile.c qp.c reset.c sense.c \
-	srq.c resource_tracker.c sys_tune.c
+	mlx4_alloc.c \
+	mlx4_catas.c \
+	mlx4_cmd.c \
+	mlx4_cq.c \
+	mlx4_eq.c \
+	mlx4_fw.c \
+	mlx4_icm.c \
+	mlx4_intf.c \
+	mlx4_main.c \
+	mlx4_mcg.c \
+	mlx4_mr.c \
+	mlx4_pd.c \
+	mlx4_port.c \
+	mlx4_profile.c \
+	mlx4_qp.c \
+	mlx4_reset.c \
+	mlx4_sense.c \
+	mlx4_srq.c \
+	mlx4_resource_tracker.c \
+	mlx4_sys_tune.c
 
-CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include
 CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include
 
@@ -17,4 +32,4 @@ CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith
 
-CWARNFLAGS.mcg.c=	-Wno-unused
+CWARNFLAGS.mlx4_mcg.c=	-Wno-unused
diff --git a/sys/modules/mlx4en/Makefile b/sys/modules/mlx4en/Makefile
new file mode 100644
index 000000000000..2be20987fe7e
--- /dev/null
+++ b/sys/modules/mlx4en/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+.PATH:  ${.CURDIR}/../../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 \
+	mlx4_en_cq.c \
+	mlx4_en_main.c \
+	mlx4_en_netdev.c \
+	mlx4_en_port.c \
+	mlx4_en_resources.c \
+	mlx4_en_rx.c \
+	mlx4_en_tx.c
+
+CFLAGS+= -I${.CURDIR}/../../ofed/include
+CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/mlx4ib/Makefile b/sys/modules/mlx4ib/Makefile
index 4885bf712ec4..5912fe0a5928 100644
--- a/sys/modules/mlx4ib/Makefile
+++ b/sys/modules/mlx4ib/Makefile
@@ -1,14 +1,24 @@
 # $FreeBSD$
-.PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
+.PATH:  ${.CURDIR}/../../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 \
-	alias_GUID.c mcg.c sysfs.c ah.c cq.c \
-	mlx4_exp.c \
-	doorbell.c mad.c main.c mr.c qp.c srq.c wc.c cm.c
+	mlx4_ib_alias_GUID.c \
+	mlx4_ib_mcg.c \
+	mlx4_ib_sysfs.c \
+	mlx4_ib_ah.c \
+	mlx4_ib_cq.c \
+	mlx4_ib_exp.c \
+	mlx4_ib_doorbell.c \
+	mlx4_ib_mad.c \
+	mlx4_ib_main.c \
+	mlx4_ib_mr.c \
+	mlx4_ib_qp.c \
+	mlx4_ib_srq.c \
+	mlx4_ib_wc.c \
+	mlx4_ib_cm.c
 
-CFLAGS+= -I${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include
 CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include
 CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
diff --git a/sys/modules/mlxen/Makefile b/sys/modules/mlxen/Makefile
deleted file mode 100644
index 4c439987cb90..000000000000
--- a/sys/modules/mlxen/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-.PATH:  ${.CURDIR}/../../ofed/drivers/net/mlx4
-
-KMOD    = mlxen
-SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
-SRCS	+= en_cq.c en_main.c en_netdev.c en_port.c en_resources.c
-SRCS	+= en_rx.c en_tx.c
-SRCS	+= opt_inet.h opt_inet6.h
-CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
-CFLAGS+= -I${.CURDIR}/../../ofed/include
-CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include
-
-.include <bsd.kmod.mk>