summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/pkgdefs/SUNWhea/prototype_com2
-rw-r--r--usr/src/pkgdefs/SUNWhermon/Makefile4
-rw-r--r--usr/src/pkgdefs/SUNWhermon/depend4
-rw-r--r--usr/src/pkgdefs/SUNWhermon/pkginfo.tmpl4
-rw-r--r--usr/src/pkgdefs/SUNWhermon/postinstall46
-rw-r--r--usr/src/pkgdefs/SUNWhermon/preremove31
-rw-r--r--usr/src/pkgdefs/SUNWhermon/prototype_com7
-rw-r--r--usr/src/pkgdefs/SUNWhermon/prototype_i3866
-rw-r--r--usr/src/pkgdefs/SUNWhermon/prototype_sparc5
-rw-r--r--usr/src/uts/common/io/warlock/hermon.wlcmd169
-rw-r--r--usr/src/uts/common/sys/Makefile1
-rw-r--r--usr/src/uts/common/sys/Makefile.syshdrs8
-rw-r--r--usr/src/uts/intel/Makefile.intel.shared1
-rw-r--r--usr/src/uts/intel/warlock/Makefile1
-rw-r--r--usr/src/uts/sparc/Makefile.sparc.shared1
-rw-r--r--usr/src/uts/sparc/warlock/Makefile1
16 files changed, 273 insertions, 18 deletions
diff --git a/usr/src/pkgdefs/SUNWhea/prototype_com b/usr/src/pkgdefs/SUNWhea/prototype_com
index c708ae29b4..91e68ba64f 100644
--- a/usr/src/pkgdefs/SUNWhea/prototype_com
+++ b/usr/src/pkgdefs/SUNWhea/prototype_com
@@ -908,6 +908,8 @@ d none usr/include/sys/ib 755 root bin
d none usr/include/sys/ib/adapters 755 root bin
d none usr/include/sys/ib/adapters/tavor 755 root bin
f none usr/include/sys/ib/adapters/tavor/tavor_ioctl.h 644 root bin
+d none usr/include/sys/ib/adapters/hermon 755 root bin
+f none usr/include/sys/ib/adapters/hermon/hermon_ioctl.h 644 root bin
f none usr/include/sys/ib/ib_pkt_hdrs.h 644 root bin
f none usr/include/sys/ib/ib_types.h 644 root bin
d none usr/include/sys/ib/ibtl 755 root bin
diff --git a/usr/src/pkgdefs/SUNWhermon/Makefile b/usr/src/pkgdefs/SUNWhermon/Makefile
index 73bedc55c2..e6e0ad0ae8 100644
--- a/usr/src/pkgdefs/SUNWhermon/Makefile
+++ b/usr/src/pkgdefs/SUNWhermon/Makefile
@@ -22,8 +22,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.com
@@ -31,7 +29,7 @@ CDDL=
.KEEP_STATE:
-all: $(FILES) depend
+all: $(FILES) depend postinstall preremove
install: all pkg
include ../Makefile.targ
diff --git a/usr/src/pkgdefs/SUNWhermon/depend b/usr/src/pkgdefs/SUNWhermon/depend
index 96bbb87a22..b375147c8e 100644
--- a/usr/src/pkgdefs/SUNWhermon/depend
+++ b/usr/src/pkgdefs/SUNWhermon/depend
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
# P indicates a prerequisite for installation
diff --git a/usr/src/pkgdefs/SUNWhermon/pkginfo.tmpl b/usr/src/pkgdefs/SUNWhermon/pkginfo.tmpl
index 5c593180cb..d2d904bb6a 100644
--- a/usr/src/pkgdefs/SUNWhermon/pkginfo.tmpl
+++ b/usr/src/pkgdefs/SUNWhermon/pkginfo.tmpl
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This required package information file describes characteristics of the
diff --git a/usr/src/pkgdefs/SUNWhermon/postinstall b/usr/src/pkgdefs/SUNWhermon/postinstall
new file mode 100644
index 0000000000..298ced6d37
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWhermon/postinstall
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+
+PATH="/usr/bin:/usr/sbin:${PATH}"
+export PATH
+
+#
+# Driver info
+#
+ADD_DRV="add_drv -b ${BASEDIR}"
+
+DRV=hermon
+grep "^${DRV} " $BASEDIR/etc/name_to_major > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+ ${ADD_DRV} -m '* 0666 root sys' -i \
+ '"pci15b3,6340" "pci15b3,634a" "pci15b3,6354"' ${DRV}
+ if [ $? -ne 0 ]; then
+ echo "\nFailed add_drv of ${DRV}!\n" >&2
+ exit 1
+ fi
+fi
+
+exit 0
diff --git a/usr/src/pkgdefs/SUNWhermon/preremove b/usr/src/pkgdefs/SUNWhermon/preremove
new file mode 100644
index 0000000000..be870bf3b7
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWhermon/preremove
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+
+# Remove driver
+/usr/sbin/rem_drv -b ${BASEDIR} hermon
+
+exit 0
+
diff --git a/usr/src/pkgdefs/SUNWhermon/prototype_com b/usr/src/pkgdefs/SUNWhermon/prototype_com
index c098ba0be0..f51740c426 100644
--- a/usr/src/pkgdefs/SUNWhermon/prototype_com
+++ b/usr/src/pkgdefs/SUNWhermon/prototype_com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# This required package information file contains a list of package contents.
# The 'pkgmk' command uses this file to identify the contents of a package
# and their location on the development machine when building the package.
@@ -39,6 +37,8 @@
i copyright
i pkginfo
i depend
+i preremove
+i postinstall
#
# source locations relative to the prototype file
#
@@ -46,3 +46,4 @@ i depend
#
d none kernel 0755 root sys
d none kernel/drv 0755 root sys
+f none kernel/drv/hermon.conf 0644 root sys
diff --git a/usr/src/pkgdefs/SUNWhermon/prototype_i386 b/usr/src/pkgdefs/SUNWhermon/prototype_i386
index 35fa460eb2..aca146b456 100644
--- a/usr/src/pkgdefs/SUNWhermon/prototype_i386
+++ b/usr/src/pkgdefs/SUNWhermon/prototype_i386
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# This required package information file contains a list of package contents.
# The 'pkgmk' command uses this file to identify the contents of a package
# and their location on the development machine when building the package.
@@ -44,4 +42,6 @@
#
# SUNWhermon
#
+f none kernel/drv/hermon 0755 root sys
d none kernel/drv/amd64 0755 root sys
+f none kernel/drv/amd64/hermon 0755 root sys
diff --git a/usr/src/pkgdefs/SUNWhermon/prototype_sparc b/usr/src/pkgdefs/SUNWhermon/prototype_sparc
index 2826e4c790..baccabd7e6 100644
--- a/usr/src/pkgdefs/SUNWhermon/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWhermon/prototype_sparc
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# This required package information file contains a list of package contents.
# The 'pkgmk' command uses this file to identify the contents of a package
# and their location on the development machine when building the package.
@@ -45,3 +43,4 @@
# SUNWhermon
#
d none kernel/drv/sparcv9 0755 root sys
+f none kernel/drv/sparcv9/hermon 0755 root sys
diff --git a/usr/src/uts/common/io/warlock/hermon.wlcmd b/usr/src/uts/common/io/warlock/hermon.wlcmd
new file mode 100644
index 0000000000..f3ef62b246
--- /dev/null
+++ b/usr/src/uts/common/io/warlock/hermon.wlcmd
@@ -0,0 +1,169 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+
+one hermon_state_s
+
+### IBTF CI interface entry points
+root hermon_ci_query_hca_ports
+root hermon_ci_modify_ports
+root hermon_ci_modify_system_image
+root hermon_ci_alloc_pd
+root hermon_ci_free_pd
+root hermon_ci_alloc_rdd
+root hermon_ci_free_rdd
+root hermon_ci_alloc_ah
+root hermon_ci_free_ah
+root hermon_ci_query_ah
+root hermon_ci_modify_ah
+root hermon_ci_alloc_qp
+root hermon_ci_alloc_special_qp
+root hermon_ci_free_qp
+root hermon_ci_release_qpn
+root hermon_ci_query_qp
+root hermon_ci_modify_qp
+root hermon_ci_alloc_cq
+root hermon_ci_free_cq
+root hermon_ci_query_cq
+root hermon_ci_resize_cq
+root hermon_ci_alloc_cq_sched
+root hermon_ci_free_cq_sched
+root hermon_ci_alloc_eec
+root hermon_ci_free_eec
+root hermon_ci_query_eec
+root hermon_ci_modify_eec
+root hermon_ci_register_mr
+root hermon_ci_register_buf
+root hermon_ci_register_shared_mr
+root hermon_ci_deregister_mr
+root hermon_ci_query_mr
+root hermon_ci_reregister_mr
+root hermon_ci_reregister_buf
+root hermon_ci_sync_mr
+root hermon_ci_alloc_mw
+root hermon_ci_free_mw
+root hermon_ci_query_mw
+root hermon_ci_attach_mcg
+root hermon_ci_detach_mcg
+root hermon_ci_post_send
+root hermon_ci_post_recv
+root hermon_ci_poll_cq
+root hermon_ci_notify_cq
+root hermon_ci_ci_data_in
+root hermon_ci_ci_data_out
+root hermon_ci_alloc_srq
+root hermon_ci_free_srq
+root hermon_ci_query_srq
+root hermon_ci_modify_srq
+root hermon_ci_post_srq
+root hermon_ci_map_mem_area
+root hermon_ci_unmap_mem_area
+root hermon_ci_alloc_lkey
+root hermon_ci_register_physical_mr
+root hermon_ci_reregister_physical_mr
+root hermon_ci_create_fmr_pool
+root hermon_ci_destroy_fmr_pool
+root hermon_ci_flush_fmr_pool
+root hermon_ci_register_physical_fmr
+root hermon_ci_deregister_fmr
+
+### Hermon Firmware commands (currently unused)
+root hermon_sync_tpt_cmd_post
+root hermon_read_mtt_cmd_post
+root hermon_write_mtt_cmd_post
+root hermon_close_hca_cmd_post
+root hermon_modify_mpt_cmd_post
+root hermon_setdebug_post
+root hermon_pci_capability_msix
+
+### Hermon Event Queue function pointers
+add hermon_eq_poll/eqfunction targets hermon_cq_handler \
+ hermon_cq_err_handler hermon_comm_estbl_handler hermon_eq_arm \
+ hermon_port_state_change_handler hermon_invreq_local_wq_err_handler \
+ hermon_local_acc_vio_wq_err_handler \
+ hermon_path_mig_handler hermon_path_mig_err_handler \
+ hermon_local_wq_cat_err_handler hermon_sendq_drained_handler \
+ hermon_eq_overflow_handler hermon_cmd_complete_handler \
+ hermon_srq_last_wqe_reached_handler hermon_catastrophic_handler \
+ hermon_ecc_detection_handler hermon_no_eqhandler hermon_eq_demux
+
+### Hermon agent callbacks
+root hermon_agent_handle_req
+root hermon_agent_request_cb
+root hermon_agent_response_cb
+
+### Hermon kmem_cache constructors and destructors
+root hermon_rsrc_cqhdl_constructor
+root hermon_rsrc_cqhdl_destructor
+root hermon_rsrc_qphdl_constructor
+root hermon_rsrc_qphdl_destructor
+root hermon_rsrc_pdhdl_constructor
+root hermon_rsrc_pdhdl_destructor
+root hermon_rsrc_refcnt_constructor
+root hermon_rsrc_refcnt_destructor
+root hermon_rsrc_ahhdl_constructor
+root hermon_rsrc_ahhdl_destructor
+root hermon_rsrc_mrhdl_constructor
+root hermon_rsrc_mrhdl_destructor
+root hermon_rsrc_srqhdl_constructor
+root hermon_rsrc_srqhdl_destructor
+
+### Hermon kstat callback
+root hermon_kstat_cntr_update
+
+### Hermon userland mapping callbacks and functions
+root hermon_umap_umemlock_cb
+root hermon_devmap_umem_map
+root hermon_devmap_umem_dup
+root hermon_devmap_umem_unmap
+root hermon_devmap_devmem_map
+root hermon_devmap_devmem_dup
+root hermon_devmap_devmem_unmap
+root hermon_devmap_dbrecmem_map
+root hermon_devmap_dbrecmem_dup
+root hermon_devmap_dbrecmem_unmap
+root hermon_umap_db_compare
+add hermon_umap_umemlock_cb/mr_callback targets warlock_dummy
+
+
+### Hermon cleanup on close callback(s)
+add hermon_umap_db_handle_onclose_cb/callback targets \
+ hermon_ioctl_flash_cleanup
+
+### Hermon QP number AVL tree compare function
+root hermon_qpn_avl_compare
+
+### Hermon FMR processing
+root hermon_fmr_avl_compare
+root hermon_fmr_processing
+add hermon_sw_fmr_s::fmr_flush_function targets warlock_dummy
+
+add bus_ops::bus_add_eventcall targets warlock_dummy
+add bus_ops::bus_get_eventcookie targets warlock_dummy
+add bus_ops::bus_post_event targets warlock_dummy
+add bus_ops::bus_remove_eventcall targets warlock_dummy
+add bus_ops::bus_intr_ctl targets warlock_dummy
+add bus_ops::bus_config targets warlock_dummy
+add bus_ops::bus_unconfig targets warlock_dummy
+
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index d8576f83a3..966e485e43 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -1051,6 +1051,7 @@ CHECKHDRS= \
$(IBMGTHDRS:%.h=ib/mgt/%.check) \
$(IBMFHDRS:%.h=ib/mgt/ibmf/%.check) \
$(TAVORHDRS:%.h=ib/adapters/tavor/%.check) \
+ $(HERMONHDRS:%.h=ib/adapters/hermon/%.check) \
$(ISOHDRS:%.h=iso/%.check) \
$(FMHDRS:%.h=fm/%.check) \
$(FMFSHDRS:%.h=fm/fs/%.check) \
diff --git a/usr/src/uts/common/sys/Makefile.syshdrs b/usr/src/uts/common/sys/Makefile.syshdrs
index 66fdf546f2..95aa0d88a7 100644
--- a/usr/src/uts/common/sys/Makefile.syshdrs
+++ b/usr/src/uts/common/sys/Makefile.syshdrs
@@ -71,6 +71,9 @@ ib/mgt/ibmf/%.check: ib/mgt/ibmf/%.h
ib/adapters/tavor/%.check: ib/adapters/tavor/%.h
$(DOT_H_CHECK)
+ib/adapters/hermon/%.check: ib/adapters/hermon/%.h
+ $(DOT_H_CHECK)
+
lvm/%.check: lvm/%.h
$(DOT_H_CHECK)
@@ -166,6 +169,7 @@ ROOTDIRS= \
$(ROOTDIR)/fs \
$(ROOTDIR)/ib \
$(ROOTDIR)/ib/adapters/tavor \
+ $(ROOTDIR)/ib/adapters/hermon \
$(ROOTDIR)/ib/ibtl \
$(ROOTDIR)/ib/ibtl/impl \
$(ROOTDIR)/ib/mgt \
@@ -218,6 +222,7 @@ ROOTIBNEXHDRS= $(IBNEXHDRS:%=$(ROOTDIR)/ib/ibnex/%)
ROOTIBMGTHDRS= $(IBMGTHDRS:%=$(ROOTDIR)/ib/mgt/%)
ROOTIBMFHDRS= $(IBMFHDRS:%=$(ROOTDIR)/ib/mgt/ibmf/%)
ROOTTAVORHDRS= $(TAVORHDRS:%=$(ROOTDIR)/ib/adapters/tavor/%)
+ROOTHERMONHDRS= $(HERMONHDRS:%=$(ROOTDIR)/ib/adapters/hermon/%)
ROOTISOHDRS= $(ISOHDRS:%=$(ROOTDIR)/iso/%)
@@ -327,6 +332,9 @@ $(ROOTDIR)/ib/mgt/ibmf/%: ib/mgt/ibmf/%
$(ROOTDIR)/ib/adapters/tavor/%: ib/adapters/tavor/%
$(INS.file)
+$(ROOTDIR)/ib/adapters/hermon/%: ib/adapters/hermon/%
+ $(INS.file)
+
$(ROOTDIR)/lvm/%: lvm/%
$(INS.file)
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index cf43b873e9..280b7b5c07 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -633,6 +633,7 @@ $(CLOSED_BUILD)CLOSED_XMODS = \
adpu320 \
bnx \
daplt \
+ hermon \
lsimega \
sdpib \
spwr \
diff --git a/usr/src/uts/intel/warlock/Makefile b/usr/src/uts/intel/warlock/Makefile
index af036d3c6e..028c88d4a4 100644
--- a/usr/src/uts/intel/warlock/Makefile
+++ b/usr/src/uts/intel/warlock/Makefile
@@ -123,6 +123,7 @@ warlock.ib:
@cd ../ibcm; $(MAKE) clean; $(MAKE) warlock
@cd ../ibd; $(MAKE) clean; $(MAKE) warlock
$(CLOSED_BUILD) @cd $(CLOSED)/uts/intel/tavor; $(MAKE) clean; $(MAKE) warlock
+$(CLOSED_BUILD) @cd $(CLOSED)/uts/intel/hermon; $(MAKE) clean; $(MAKE) warlock
$(CLOSED_BUILD) @cd $(CLOSED)/uts/intel/daplt; $(MAKE) clean; $(MAKE) warlock
warlock.sata:
diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared
index 489ed1153f..5dea216629 100644
--- a/usr/src/uts/sparc/Makefile.sparc.shared
+++ b/usr/src/uts/sparc/Makefile.sparc.shared
@@ -443,6 +443,7 @@ SVVS += svvs
XMODS +=
$(CLOSED_BUILD)CLOSED_XMODS = \
daplt \
+ hermon \
sdpib \
tavor \
wsdrv
diff --git a/usr/src/uts/sparc/warlock/Makefile b/usr/src/uts/sparc/warlock/Makefile
index a92c32fb56..68a9256259 100644
--- a/usr/src/uts/sparc/warlock/Makefile
+++ b/usr/src/uts/sparc/warlock/Makefile
@@ -137,6 +137,7 @@ warlock.ib:
@cd ../ibcm; $(MAKE) clean; $(MAKE) warlock
@cd ../ibd; $(MAKE) clean; $(MAKE) warlock
$(CLOSED_BUILD) @cd $(CLOSED)/uts/sparc/tavor; $(MAKE) clean; $(MAKE) warlock
+$(CLOSED_BUILD) @cd $(CLOSED)/uts/sparc/hermon; $(MAKE) clean; $(MAKE) warlock
$(CLOSED_BUILD) @cd $(CLOSED)/uts/sparc/daplt; $(MAKE) clean; $(MAKE) warlock
warlock.sata: