- Merge in OFED 1.5.3 from projects/ofed/head

18 files changed, 263 insertions, 0 deletions

diff --git a/contrib/ofed/usr.bin/Makefile b/contrib/ofed/usr.bin/Makefile
new file mode 100644
index 000000000000..aa27a51600d1
--- /dev/null
+++ b/contrib/ofed/usr.bin/Makefile
@@ -0,0 +1,7 @@
+.include <bsd.own.mk>
+
+SUBDIR	= ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat
+SUBDIR += ibsysstat ibtracert opensm perfquery saquery
+SUBDIR += sminfo smpdump smpquery vendstat
+
+.include <bsd.subdir.mk>
diff --git a/contrib/ofed/usr.bin/Makefile.inc b/contrib/ofed/usr.bin/Makefile.inc
new file mode 100644
index 000000000000..e6a0550b82d3
--- /dev/null
+++ b/contrib/ofed/usr.bin/Makefile.inc
@@ -0,0 +1,4 @@
+DIAGPATH=	${.CURDIR}/../../management/infiniband-diags
+BINDIR?=	/usr/bin
+CFLAGS+=	-I${.CURDIR}/../../include/infiniband
+CFLAGS+=	-I${.CURDIR}/../../management/opensm/include/
diff --git a/contrib/ofed/usr.bin/ibaddr/Makefile b/contrib/ofed/usr.bin/ibaddr/Makefile
new file mode 100644
index 000000000000..b0af50064ffd
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibaddr/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibaddr
+SRCS=   ibaddr.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	ibaddr.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/ibnetdiscover/Makefile b/contrib/ofed/usr.bin/ibnetdiscover/Makefile
new file mode 100644
index 000000000000..1e6bc0e799fb
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibnetdiscover/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibnetdiscover
+SRCS=   ibnetdiscover.c grouping.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad -losmcomp
+CFLAGS+= -pthread -I${DIAGPATH}/include
+MAN=	ibnetdiscover.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/ibping/Makefile b/contrib/ofed/usr.bin/ibping/Makefile
new file mode 100644
index 000000000000..f152855c495b
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibping/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibping
+SRCS=   ibping.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	ibping.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/ibportstate/Makefile b/contrib/ofed/usr.bin/ibportstate/Makefile
new file mode 100644
index 000000000000..e6af8bc28249
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibportstate/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibportstate
+SRCS=   ibportstate.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	ibportstate.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/ibroute/Makefile b/contrib/ofed/usr.bin/ibroute/Makefile
new file mode 100644
index 000000000000..bbbbda396075
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibroute/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibroute
+SRCS=   ibroute.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad -losmcomp
+CFLAGS+= -pthread -I${DIAGPATH}/include
+MAN=	ibroute.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/ibsendtrap/Makefile b/contrib/ofed/usr.bin/ibsendtrap/Makefile
new file mode 100644
index 000000000000..183e58d488f3
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibsendtrap/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibsendtrap
+SRCS=   ibsendtrap.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+NO_MAN=	true
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/ibstat/Makefile b/contrib/ofed/usr.bin/ibstat/Makefile
new file mode 100644
index 000000000000..6c2c23c96a19
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibstat/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibstat
+SRCS=   ibstat.c
+LDADD=	-libumad -libcommon
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	ibstat.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/ibsysstat/Makefile b/contrib/ofed/usr.bin/ibsysstat/Makefile
new file mode 100644
index 000000000000..974e015579e5
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibsysstat/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibsysstat
+SRCS=   ibsysstat.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	ibsysstat.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/ibtracert/Makefile b/contrib/ofed/usr.bin/ibtracert/Makefile
new file mode 100644
index 000000000000..cbfae3e1c7e6
--- /dev/null
+++ b/contrib/ofed/usr.bin/ibtracert/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   ibtracert
+SRCS=   ibtracert.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad -losmcomp
+CFLAGS+= -pthread -I${DIAGPATH}/include
+MAN=	ibtracert.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/opensm/Makefile b/contrib/ofed/usr.bin/opensm/Makefile
new file mode 100644
index 000000000000..ae45eaa4a230
--- /dev/null
+++ b/contrib/ofed/usr.bin/opensm/Makefile
@@ -0,0 +1,40 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+
+OPENSM	= ${.CURDIR}/../../management/opensm
+.PATH: ${OPENSM}/opensm ${OPENSM}/man
+
+PROG=   opensm
+
+SRCS=	main.c osm_console_io.c osm_console.c osm_db_files.c
+SRCS+=	osm_db_pack.c osm_drop_mgr.c osm_inform.c osm_lid_mgr.c
+SRCS+=	osm_lin_fwd_rcv.c osm_link_mgr.c osm_mcast_fwd_rcv.c osm_mcast_mgr.c
+SRCS+=	osm_mcast_tbl.c osm_mcm_info.c osm_mcm_port.c osm_mtree.c
+SRCS+=	osm_multicast.c osm_node.c osm_node_desc_rcv.c osm_node_info_rcv.c
+SRCS+=	osm_opensm.c osm_pkey.c osm_pkey_mgr.c osm_pkey_rcv.c osm_port.c
+SRCS+=	osm_port_info_rcv.c osm_remote_sm.c osm_req.c osm_resp.c osm_sa.c
+SRCS+=	osm_sa_class_port_info.c osm_sa_informinfo.c osm_sa_lft_record.c
+SRCS+=	osm_sa_mft_record.c osm_sa_link_record.c osm_sa_mad_ctrl.c
+SRCS+=	osm_sa_mcmember_record.c osm_sa_node_record.c osm_sa_path_record.c
+SRCS+=	osm_sa_pkey_record.c osm_sa_portinfo_record.c osm_sa_guidinfo_record.c
+SRCS+=	osm_sa_multipath_record.c osm_sa_service_record.c osm_sa_slvl_record.c
+SRCS+=	osm_sa_sminfo_record.c osm_sa_vlarb_record.c osm_sa_sw_info_record.c
+SRCS+=	osm_service.c osm_slvl_map_rcv.c osm_sm.c osm_sminfo_rcv.c
+SRCS+=	osm_sm_mad_ctrl.c osm_sm_state_mgr.c osm_state_mgr.c osm_subnet.c
+SRCS+=	osm_sw_info_rcv.c osm_switch.c osm_prtn.c osm_prtn_config.c osm_qos.c
+SRCS+=	osm_router.c osm_trap_rcv.c osm_ucast_mgr.c osm_ucast_updn.c
+SRCS+=	osm_ucast_lash.c osm_ucast_file.c osm_ucast_ftree.c osm_vl15intf.c
+SRCS+=	osm_vl_arb_rcv.c st.c osm_perfmgr.c osm_perfmgr_db.c osm_event_plugin.c
+SRCS+=	osm_dump.c osm_ucast_cache.c osm_qos_parser_y.y osm_qos_parser_l.l
+SRCS+=	osm_qos_policy.c
+
+LDADD=	-lopensm -losmvendor -losmcomp -libmad -libumad -libcommon
+CFLAGS+= -pthread
+CFLAGS+= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
+
+MAN=	opensm.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/perfquery/Makefile b/contrib/ofed/usr.bin/perfquery/Makefile
new file mode 100644
index 000000000000..792d575052e7
--- /dev/null
+++ b/contrib/ofed/usr.bin/perfquery/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   perfquery
+SRCS=   perfquery.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	perfquery.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/saquery/Makefile b/contrib/ofed/usr.bin/saquery/Makefile
new file mode 100644
index 000000000000..efb60366c597
--- /dev/null
+++ b/contrib/ofed/usr.bin/saquery/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   saquery
+SRCS=   saquery.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad -losmcomp -losmvendor -lopensm
+CFLAGS+= -I${DIAGPATH}/include
+CFLAGS+= -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
+CFLAGS+= -pthread
+MAN=	saquery.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/sminfo/Makefile b/contrib/ofed/usr.bin/sminfo/Makefile
new file mode 100644
index 000000000000..90f98873c9ad
--- /dev/null
+++ b/contrib/ofed/usr.bin/sminfo/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   sminfo
+SRCS=   sminfo.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	sminfo.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/smpdump/Makefile b/contrib/ofed/usr.bin/smpdump/Makefile
new file mode 100644
index 000000000000..4db68be51c26
--- /dev/null
+++ b/contrib/ofed/usr.bin/smpdump/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   smpdump
+SRCS=   smpdump.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	smpdump.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/smpquery/Makefile b/contrib/ofed/usr.bin/smpquery/Makefile
new file mode 100644
index 000000000000..edfedd1e11d1
--- /dev/null
+++ b/contrib/ofed/usr.bin/smpquery/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   smpquery
+SRCS=   smpquery.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad -losmcomp
+CFLAGS+= -pthread -I${DIAGPATH}/include
+MAN=	smpquery.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
diff --git a/contrib/ofed/usr.bin/vendstat/Makefile b/contrib/ofed/usr.bin/vendstat/Makefile
new file mode 100644
index 000000000000..bfca2c8848c5
--- /dev/null
+++ b/contrib/ofed/usr.bin/vendstat/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+.PATH: ${DIAGPATH}/src ${DIAGPATH}/man
+
+PROG=   vendstat
+SRCS=   vendstat.c ibdiag_common.c
+LDADD=	-libumad -libcommon -libmad
+CFLAGS+= -I${DIAGPATH}/include
+MAN=	vendstat.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>