Add the 'ciss' driver, which supports the Compaq SmartRAID 5* family of

RAID controllers (5300, 532, 5i, etc.)

Thanks to Compaq and Yahoo! for support during the development of this
driver.

MFC after:	1 week

9 files changed, 4643 insertions, 0 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 3a436c0..1c19957 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1509,6 +1509,13 @@ options 	DPT_RESET_HBA
 options 	DPT_ALLOW_MEMIO
 
 #
+# Compaq "CISS" RAID controllers (SmartRAID 5* series)
+# These controllers have a SCSI-like interface, and require the
+# CAM infrastructure.
+#
+device		ciss
+
+#
 # Mylex AcceleRAID and eXtremeRAID controllers with v6 and later
 # firmware.  These controllers have a SCSI-like interface, and require
 # the CAM infrastructure.
diff --git a/sys/conf/files b/sys/conf/files
index abe4bdb..7c2407d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -288,6 +288,7 @@ dev/buslogic/bt_pci.c	optional bt pci
 dev/cardbus/cardbus.c	optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
 dev/ccd/ccd.c		optional ccd
+dev/ciss/ciss.c		optional ciss
 dev/cnw/if_cnw.c	optional cnw card
 #dev/cnw/if_cnw.c	optional cnw pccard
 dev/cs/if_cs.c		optional cs
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
new file mode 100644
index 0000000..69e0318
--- /dev/null
+++ b/sys/dev/ciss/ciss.c
@@ -0,0 +1,3368 @@
+/*-
+ * Copyright (c) 2001 Michael Smith
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD$
+ */
+
+/*
+ * Common Interface for SCSI-3 Support driver.
+ *
+ * CISS claims to provide a common interface between a generic SCSI
+ * transport and an intelligent host adapter.
+ *
+ * This driver supports CISS as defined in the document "CISS Command
+ * Interface for SCSI-3 Support Open Specification", Version 1.04,
+ * Valence Number 1, dated 20001127, produced by Compaq Computer
+ * Corporation.  This document appears to be a hastily and somewhat
+ * arbitrarlily cut-down version of a larger (and probably even more
+ * chaotic and inconsistent) Compaq internal document.  Various
+ * details were also gleaned from Compaq's "cciss" driver for Linux.
+ *
+ * We provide a shim layer between the CISS interface and CAM,
+ * offloading most of the queueing and being-a-disk chores onto CAM.
+ * Entry to the driver is via the PCI bus attachment (ciss_probe,
+ * ciss_attach, etc) and via the CAM interface (ciss_cam_action,
+ * ciss_cam_poll).  The Compaq CISS adapters are, however, poor SCSI
+ * citizens and we have to fake up some responses to get reasonable
+ * behaviour out of them.  In addition, the CISS command set is by no
+ * means adequate to support the functionality of a RAID controller,
+ * and thus the supported Compaq adapters utilise portions of the
+ * control protocol from earlier Compaq adapter families.
+ *
+ * Note that we only support the "simple" transport layer over PCI.
+ * This interface (ab)uses the I2O register set (specifically the post
+ * queues) to exchange commands with the adapter.  Other interfaces
+ * are available, but we aren't supposed to know about them, and it is
+ * dubious whether they would provide major performance improvements
+ * except under extreme load.
+ * 
+ * Currently the only supported CISS adapters are the Compaq Smart
+ * Array 5* series (5300, 5i, 532).  Even with only three adapters,
+ * Compaq still manage to have interface variations.
+ *
+ *
+ * Thanks must go to Fred Harris and Darryl DeVinney at Compaq, as
+ * well as Paul Saab at Yahoo! for their assistance in making this
+ * driver happen.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/devicestat.h>
+#include <sys/stat.h>
+
+#include <cam/cam.h>
+#include <cam/cam_ccb.h>
+#include <cam/cam_periph.h>
+#include <cam/cam_sim.h>
+#include <cam/cam_xpt_sim.h>
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_message.h>
+
+#include <machine/clock.h>
+#include <machine/bus_memio.h>
+#include <machine/bus.h>
+#include <machine/endian.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+
+#include <pci/pcireg.h>
+#include <pci/pcivar.h>
+
+#include <dev/ciss/cissreg.h>
+#include <dev/ciss/cissvar.h>
+#include <dev/ciss/cissio.h>
+
+MALLOC_DEFINE(CISS_MALLOC_CLASS, "ciss_data", "ciss internal data buffers");
+
+/* pci interface */
+static int	ciss_lookup(device_t dev);
+static int	ciss_probe(device_t dev);
+static int	ciss_attach(device_t dev);
+static int	ciss_detach(device_t dev);
+static int	ciss_shutdown(device_t dev);
+
+/* (de)initialisation functions, control wrappers */
+static int	ciss_init_pci(struct ciss_softc *sc);
+static int	ciss_wait_adapter(struct ciss_softc *sc);
+static int	ciss_flush_adapter(struct ciss_softc *sc);
+static int	ciss_init_requests(struct ciss_softc *sc);
+static void	ciss_command_map_helper(void *arg, bus_dma_segment_t *segs,
+					int nseg, int error);
+static int	ciss_identify_adapter(struct ciss_softc *sc);
+static int	ciss_init_logical(struct ciss_softc *sc);
+static int	ciss_identify_logical(struct ciss_softc *sc, struct ciss_ldrive *ld);
+static int	ciss_get_ldrive_status(struct ciss_softc *sc,  struct ciss_ldrive *ld);
+static int	ciss_update_config(struct ciss_softc *sc);
+static int	ciss_accept_media(struct ciss_softc *sc, int ldrive, int async);
+static void	ciss_accept_media_complete(struct ciss_request *cr);
+static void	ciss_free(struct ciss_softc *sc);
+
+/* request submission/completion */
+static int	ciss_start(struct ciss_request *cr);
+static void	ciss_done(struct ciss_softc *sc);
+static void	ciss_intr(void *arg);
+static void	ciss_complete(struct ciss_softc *sc);
+static int	ciss_report_request(struct ciss_request *cr, int *command_status,
+				    int *scsi_status);
+static int	ciss_synch_request(struct ciss_request *cr, int timeout);
+static int	ciss_poll_request(struct ciss_request *cr, int timeout);
+static int	ciss_wait_request(struct ciss_request *cr, int timeout);
+static int	ciss_abort_request(struct ciss_request *cr);
+
+/* request queueing */
+static int	ciss_get_request(struct ciss_softc *sc, struct ciss_request **crp);
+static void	ciss_preen_command(struct ciss_request *cr);
+static void 	ciss_release_request(struct ciss_request *cr);
+
+/* request helpers */
+static int	ciss_get_bmic_request(struct ciss_softc *sc, struct ciss_request **crp,
+				      int opcode, void **bufp, size_t bufsize);
+static int	ciss_user_command(struct ciss_softc *sc, IOCTL_Command_struct *ioc);
+
+/* DMA map/unmap */
+static int	ciss_map_request(struct ciss_request *cr);
+static void	ciss_request_map_helper(void *arg, bus_dma_segment_t *segs,
+					int nseg, int error);
+static void	ciss_unmap_request(struct ciss_request *cr);
+
+/* CAM interface */
+static int	ciss_cam_init(struct ciss_softc *sc);
+static void	ciss_cam_rescan_target(struct ciss_softc *sc, int target);
+static void	ciss_cam_rescan_all(struct ciss_softc *sc);
+static void	ciss_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb);
+static void	ciss_cam_action(struct cam_sim *sim, union ccb *ccb);
+static int	ciss_cam_action_io(struct cam_sim *sim, struct ccb_scsiio *csio);
+static int	ciss_cam_emulate(struct ciss_softc *sc, struct ccb_scsiio *csio);
+static void	ciss_cam_poll(struct cam_sim *sim);
+static void	ciss_cam_complete(struct ciss_request *cr);
+static void	ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio);
+static struct cam_periph *ciss_find_periph(struct ciss_softc *sc, int target);
+static int	ciss_name_device(struct ciss_softc *sc, int target);
+
+/* periodic status monitoring */
+static void	ciss_periodic(void *arg);
+static void	ciss_notify_event(struct ciss_softc *sc);
+static void	ciss_notify_complete(struct ciss_request *cr);
+static int	ciss_notify_abort(struct ciss_softc *sc);
+static int	ciss_notify_abort_bmic(struct ciss_softc *sc);
+static void	ciss_notify_logical(struct ciss_softc *sc, struct ciss_notify *cn);
+static void	ciss_notify_physical(struct ciss_softc *sc, struct ciss_notify *cn);
+
+/* debugging output */
+static void	ciss_print_request(struct ciss_request *cr);
+static void	ciss_print_ldrive(struct ciss_softc *sc, struct ciss_ldrive *ld);
+static const char *ciss_name_ldrive_status(int status);
+static int	ciss_decode_ldrive_status(int status);
+static const char *ciss_name_ldrive_org(int org);
+static const char *ciss_name_command_status(int status);
+
+/*
+ * PCI bus interface.
+ */
+static device_method_t ciss_methods[] = {
+    /* Device interface */
+    DEVMETHOD(device_probe,	ciss_probe),
+    DEVMETHOD(device_attach,	ciss_attach),
+    DEVMETHOD(device_detach,	ciss_detach),
+    DEVMETHOD(device_shutdown,	ciss_shutdown),
+    { 0, 0 }
+};
+
+static driver_t ciss_pci_driver = {
+    "ciss",
+    ciss_methods,
+    sizeof(struct ciss_softc)
+};
+
+static devclass_t	ciss_devclass;
+DRIVER_MODULE(ciss, pci, ciss_pci_driver, ciss_devclass, 0, 0);
+
+/*
+ * Control device interface.
+ */
+static d_open_t		ciss_open;
+static d_close_t	ciss_close;
+static d_ioctl_t	ciss_ioctl;
+
+#define CISS_CDEV_MAJOR  166
+
+static struct cdevsw ciss_cdevsw = {
+    ciss_open, ciss_close, noread, nowrite, ciss_ioctl,
+    nopoll, nommap, nostrategy, "ciss", CISS_CDEV_MAJOR,
+    nodump, nopsize, 0, -1
+};
+
+/************************************************************************
+ * CISS adapters amazingly don't have a defined programming interface
+ * value.  (One could say some very despairing things about PCI and
+ * people just not getting the general idea.)  So we are forced to
+ * stick with matching against subvendor/subdevice, and thus have to
+ * be updated for every new CISS adapter that appears.
+ */
+#define CISS_BOARD_SA5	(1<<0)
+#define CISS_BOARD_SA5B	(1<<1)
+
+static struct
+{
+    u_int16_t	subvendor;
+    u_int16_t	subdevice;
+    int		flags;
+    char	*desc;
+} ciss_vendor_data[] = {
+    { 0x0e11, 0x4070, CISS_BOARD_SA5,	"Compaq Smart Array 5300" },
+    { 0x0e11, 0x4080, CISS_BOARD_SA5B,	"Compaq Smart Array 5i" },
+    { 0x0e11, 0x4082, CISS_BOARD_SA5B,	"Compaq Smart Array 532" },
+    { 0, 0, NULL }
+};
+
+/************************************************************************
+ * Find a match for the device in our list of known adapters.
+ */
+static int
+ciss_lookup(device_t dev)
+{
+    int 	i;
+    
+    for (i = 0; ciss_vendor_data[i].desc != NULL; i++)
+	if ((pci_get_subvendor(dev) == ciss_vendor_data[i].subvendor) &&
+	    (pci_get_subdevice(dev) == ciss_vendor_data[i].subdevice)) {
+	    return(i);
+	}
+    return(-1);
+}
+
+/************************************************************************
+ * Match a known CISS adapter.
+ */
+static int
+ciss_probe(device_t dev)
+{
+    int		i;
+    
+    i = ciss_lookup(dev);
+    if (i != -1) {
+	device_set_desc(dev, ciss_vendor_data[i].desc);
+	return(-10);
+    }
+    return(ENOENT);
+}	
+
+/************************************************************************
+ * Attach the driver to this adapter.
+ */
+static int
+ciss_attach(device_t dev)
+{
+    struct ciss_softc	*sc;
+    int			i, error;
+
+    debug_called(1);
+
+#ifdef CISS_DEBUG
+    /* print structure/union sizes */
+    debug_struct(ciss_command);
+    debug_struct(ciss_header);
+    debug_union(ciss_device_address);
+    debug_struct(ciss_cdb);
+    debug_struct(ciss_report_cdb);
+    debug_struct(ciss_notify_cdb);
+    debug_struct(ciss_notify);
+    debug_struct(ciss_message_cdb);
+    debug_struct(ciss_error_info_pointer);
+    debug_struct(ciss_error_info);
+    debug_struct(ciss_sg_entry);
+    debug_struct(ciss_config_table);
+    debug_struct(ciss_bmic_cdb);
+    debug_struct(ciss_bmic_id_ldrive);
+    debug_struct(ciss_bmic_id_lstatus);
+    debug_struct(ciss_bmic_id_table);
+    debug_struct(ciss_bmic_id_pdrive);
+    debug_struct(ciss_bmic_blink_pdrive);
+    debug_struct(ciss_bmic_flush_cache);
+    debug_const(CISS_MAX_REQUESTS);
+    debug_const(CISS_MAX_LOGICAL);
+    debug_const(CISS_INTERRUPT_COALESCE_DELAY);
+    debug_const(CISS_INTERRUPT_COALESCE_COUNT);
+    debug_const(CISS_COMMAND_ALLOC_SIZE);
+    debug_const(CISS_COMMAND_SG_LENGTH);
+
+    debug_type(cciss_pci_info_struct);
+    debug_type(cciss_coalint_struct);
+    debug_type(cciss_coalint_struct);
+    debug_type(NodeName_type);
+    debug_type(NodeName_type);
+    debug_type(Heartbeat_type);
+    debug_type(BusTypes_type);
+    debug_type(FirmwareVer_type);
+    debug_type(DriverVer_type);
+    debug_type(IOCTL_Command_struct);
+#endif
+
+    sc = device_get_softc(dev);
+    sc->ciss_dev = dev;
+
+    /*
+     * Work out adapter type.
+     */
+    i = ciss_lookup(dev);
+    if (ciss_vendor_data[i].flags & CISS_BOARD_SA5) {
+	sc->ciss_interrupt_mask = CISS_TL_SIMPLE_INTR_OPQ_SA5;
+    } else if (ciss_vendor_data[i].flags & CISS_BOARD_SA5B) {
+	sc->ciss_interrupt_mask = CISS_TL_SIMPLE_INTR_OPQ_SA5B;
+    } else {
+	/* really an error on our part */
+	ciss_printf(sc, "unable to determine hardware type\n");
+	error = ENXIO;
+	goto out;
+    }
+	
+    /*
+     * Do PCI-specific init.
+     */
+    if ((error = ciss_init_pci(sc)) != 0)
+	goto out;
+
+    /*
+     * Initialise driver queues.
+     */
+    ciss_initq_free(sc);
+    ciss_initq_busy(sc);
+    ciss_initq_complete(sc);
+
+    /*
+     * Initialise command/request pool.
+     */
+    if ((error = ciss_init_requests(sc)) != 0)
+	goto out;
+
+    /*
+     * Get adapter information.
+     */
+    if ((error = ciss_identify_adapter(sc)) != 0)
+	goto out;
+    
+    /*
+     * Build our private table of logical devices.
+     */
+    if ((error = ciss_init_logical(sc)) != 0)
+	goto out;
+
+    /*
+     * Enable interrupts so that the CAM scan can complete.
+     */
+    CISS_TL_SIMPLE_ENABLE_INTERRUPTS(sc);
+
+    /*
+     * Initialise the CAM interface.
+     */
+    if ((error = ciss_cam_init(sc)) != 0)
+	goto out;
+
+    /*
+     * Start the heartbeat routine and event chain.
+     */
+    ciss_periodic(sc);
+
+   /*
+     * Create the control device.
+     */
+    sc->ciss_dev_t = make_dev(&ciss_cdevsw, device_get_unit(sc->ciss_dev),
+			      UID_ROOT, GID_OPERATOR, S_IRUSR | S_IWUSR,
+			      "ciss%d", device_get_unit(sc->ciss_dev));
+    sc->ciss_dev_t->si_drv1 = sc;
+
+    /*
+     * The adapter is running; synchronous commands can now sleep
+     * waiting for an interrupt to signal completion.
+     */
+    sc->ciss_flags |= CISS_FLAG_RUNNING;
+
+    error = 0;
+ out:
+    if (error != 0)
+	ciss_free(sc);
+    return(error);
+}
+
+/************************************************************************
+ * Detach the driver from this adapter.
+ */
+static int
+ciss_detach(device_t dev)
+{
+    struct ciss_softc	*sc = device_get_softc(dev);
+
+    debug_called(1);
+    
+    /* flush adapter cache */
+    ciss_flush_adapter(sc);
+
+    /* release all resources */
+    ciss_free(sc);
+
+    return(0);
+    
+}
+
+/************************************************************************
+ * Prepare adapter for system shutdown.
+ */
+static int
+ciss_shutdown(device_t dev)
+{
+    struct ciss_softc	*sc = device_get_softc(dev);
+
+    debug_called(1);
+
+    /* flush adapter cache */
+    ciss_flush_adapter(sc);
+
+    return(0);
+}
+
+/************************************************************************
+ * Perform PCI-specific attachment actions.
+ */
+static int
+ciss_init_pci(struct ciss_softc *sc)
+{
+    uintptr_t		cbase, csize, cofs;
+    int			error;
+
+    debug_called(1);
+
+    /*
+     * Allocate register window first (we need this to find the config
+     * struct).
+     */
+    error = ENXIO;
+    sc->ciss_regs_rid = CISS_TL_SIMPLE_BAR_REGS;
+    if ((sc->ciss_regs_resource =
+	 bus_alloc_resource(sc->ciss_dev, SYS_RES_MEMORY, &sc->ciss_regs_rid,
+			    0, ~0, 1, RF_ACTIVE)) == NULL) {
+	ciss_printf(sc, "can't allocate register window\n");
+	return(ENXIO);
+    }
+    sc->ciss_regs_bhandle = rman_get_bushandle(sc->ciss_regs_resource);
+    sc->ciss_regs_btag = rman_get_bustag(sc->ciss_regs_resource);
+    
+    /*
+     * Find the BAR holding the config structure.  If it's not the one
+     * we already mapped for registers, map it too.
+     */
+    sc->ciss_cfg_rid = CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_CFG_BAR) & 0xffff;
+    if (sc->ciss_cfg_rid != sc->ciss_regs_rid) {
+	if ((sc->ciss_cfg_resource =
+	     bus_alloc_resource(sc->ciss_dev, SYS_RES_MEMORY, &sc->ciss_cfg_rid,
+				0, ~0, 1, RF_ACTIVE)) == NULL) {
+	    ciss_printf(sc, "can't allocate config window\n");
+	    return(ENXIO);
+	}
+	cbase = (uintptr_t)rman_get_virtual(sc->ciss_cfg_resource);
+	csize = rman_get_end(sc->ciss_cfg_resource) -
+	    rman_get_start(sc->ciss_cfg_resource) + 1;
+    } else {
+	cbase = (uintptr_t)rman_get_virtual(sc->ciss_regs_resource);
+	csize = rman_get_end(sc->ciss_regs_resource) -
+	    rman_get_start(sc->ciss_regs_resource) + 1;
+    }
+    cofs = CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_CFG_OFF);
+    
+    /*
+     * Use the base/size/offset values we just calculated to
+     * sanity-check the config structure.  If it's OK, point to it.
+     */
+    if ((cofs + sizeof(struct ciss_config_table)) > csize) {
+	ciss_printf(sc, "config table outside window\n");
+	return(ENXIO);
+    }
+    sc->ciss_cfg = (struct ciss_config_table *)(cbase + cofs);
+    debug(1, "config struct at %p", sc->ciss_cfg);
+    
+    /*
+     * Validate the config structure.  If we supported other transport
+     * methods, we could select amongst them at this point in time.
+     */
+    if (strncmp(sc->ciss_cfg->signature, "CISS", 4)) {
+	ciss_printf(sc, "config signature mismatch (got '%c%c%c%c')\n",
+		    sc->ciss_cfg->signature[0], sc->ciss_cfg->signature[1],
+		    sc->ciss_cfg->signature[2], sc->ciss_cfg->signature[3]);
+	return(ENXIO);
+    }
+    if ((sc->ciss_cfg->valence < CISS_MIN_VALENCE) ||
+	(sc->ciss_cfg->valence > CISS_MAX_VALENCE)) {
+	ciss_printf(sc, "adapter interface specification (%d) unsupported\n", 
+		    sc->ciss_cfg->valence);
+	return(ENXIO);
+    }
+
+    /*
+     * Put the board into simple mode, and tell it we're using the low
+     * 4GB of RAM.  Set the default interrupt coalescing options.
+     */
+    if (!(sc->ciss_cfg->supported_methods & CISS_TRANSPORT_METHOD_SIMPLE)) {
+	ciss_printf(sc, "adapter does not support 'simple' transport layer\n");
+	return(ENXIO);
+    }
+    sc->ciss_cfg->requested_method = CISS_TRANSPORT_METHOD_SIMPLE;
+    sc->ciss_cfg->command_physlimit = 0;
+    sc->ciss_cfg->interrupt_coalesce_delay = CISS_INTERRUPT_COALESCE_DELAY;
+    sc->ciss_cfg->interrupt_coalesce_count = CISS_INTERRUPT_COALESCE_COUNT;
+
+    if (ciss_update_config(sc)) {
+	ciss_printf(sc, "adapter refuses to accept config update (IDBR 0x%x)\n",
+		    CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IDBR));
+	return(ENXIO);
+    }
+    if (!(sc->ciss_cfg->active_method != CISS_TRANSPORT_METHOD_SIMPLE)) {
+	ciss_printf(sc,
+		    "adapter refuses to go into 'simple' transport mode (0x%x, 0x%x)\n",
+		    sc->ciss_cfg->supported_methods, sc->ciss_cfg->active_method);
+	return(ENXIO);
+    }
+
+    /*
+     * Wait for the adapter to come ready.
+     */
+    if ((error = ciss_wait_adapter(sc)) != 0)
+	return(error);
+
+    /*
+     * Turn off interrupts before we go routing anything.
+     */
+    CISS_TL_SIMPLE_DISABLE_INTERRUPTS(sc);
+    
+    /*
+     * Allocate and set up our interrupt.
+     */
+    sc->ciss_irq_rid = 0;
+    if ((sc->ciss_irq_resource =
+	 bus_alloc_resource(sc->ciss_dev, SYS_RES_IRQ, &sc->ciss_irq_rid, 0, ~0, 1, 
+			    RF_ACTIVE | RF_SHAREABLE)) == NULL) {
+	ciss_printf(sc, "can't allocate interrupt\n");
+	return(ENXIO);
+    }
+    if (bus_setup_intr(sc->ciss_dev, sc->ciss_irq_resource, INTR_TYPE_CAM, ciss_intr, sc,
+		       &sc->ciss_intr)) {
+	ciss_printf(sc, "can't set up interrupt\n");
+	return(ENXIO);
+    }
+
+    /*
+     * Allocate the parent bus DMA tag appropriate for our PCI
+     * interface.
+     * 
+     * Note that "simple" adapters can only address within a 32-bit
+     * span.
+     */
+    if (bus_dma_tag_create(NULL, 			/* parent */
+			   1, 0, 			/* alignment, boundary */
+			   BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+			   BUS_SPACE_MAXADDR, 		/* highaddr */
+			   NULL, NULL, 			/* filter, filterarg */
+			   MAXBSIZE, CISS_COMMAND_SG_LENGTH,	/* maxsize, nsegments */
+			   BUS_SPACE_MAXSIZE_32BIT,	/* maxsegsize */
+			   BUS_DMA_ALLOCNOW,		/* flags */
+			   &sc->ciss_parent_dmat)) {
+	ciss_printf(sc, "can't allocate parent DMA tag\n");
+	return(ENOMEM);
+    }
+
+    /*
+     * Create DMA tag for mapping buffers into adapter-addressable
+     * space.
+     */
+    if (bus_dma_tag_create(sc->ciss_parent_dmat, 	/* parent */
+			   1, 0, 			/* alignment, boundary */
+			   BUS_SPACE_MAXADDR,		/* lowaddr */
+			   BUS_SPACE_MAXADDR, 		/* highaddr */
+			   NULL, NULL, 			/* filter, filterarg */
+			   MAXBSIZE, CISS_COMMAND_SG_LENGTH,	/* maxsize, nsegments */
+			   BUS_SPACE_MAXSIZE_32BIT,	/* maxsegsize */
+			   0,				/* flags */
+			   &sc->ciss_buffer_dmat)) {
+	ciss_printf(sc, "can't allocate buffer DMA tag\n");
+	return(ENOMEM);
+    }
+    return(0);
+}
+
+/************************************************************************
+ * Wait for the adapter to come ready.
+ */
+static int
+ciss_wait_adapter(struct ciss_softc *sc)
+{
+    int		i;
+
+    debug_called(1);
+    
+    /*
+     * Wait for the adapter to come ready.
+     */
+    if (!(sc->ciss_cfg->active_method & CISS_TRANSPORT_METHOD_READY)) {
+	ciss_printf(sc, "waiting for adapter to come ready...\n");
+	for (i = 0; !(sc->ciss_cfg->active_method & CISS_TRANSPORT_METHOD_READY); i++) {
+	    DELAY(1000000);	/* one second */
+	    if (i > 30) {
+		ciss_printf(sc, "timed out waiting for adapter to come ready\n");
+		return(EIO);
+	    }
+	}
+    }
+    return(0);
+}
+
+/************************************************************************
+ * Flush the adapter cache.
+ */
+static int
+ciss_flush_adapter(struct ciss_softc *sc)
+{
+    struct ciss_request			*cr;
+    struct ciss_bmic_flush_cache	*cbfc;
+    int					error, command_status;
+
+    debug_called(1);
+
+    cr = NULL;
+    cbfc = NULL;
+
+    /*
+     * Build a BMIC request to flush the cache.  We don't disable
+     * it, as we may be going to do more I/O (eg. we are emulating
+     * the Synchronise Cache command).
+     */
+    if ((cbfc = malloc(sizeof(*cbfc), CISS_MALLOC_CLASS, M_NOWAIT | M_ZERO)) == NULL) {
+	error = ENOMEM;
+	goto out;
+    }
+    if ((error = ciss_get_bmic_request(sc, &cr, CISS_BMIC_FLUSH_CACHE,
+				       (void **)&cbfc, sizeof(*cbfc))) != 0)
+	goto out;
+
+    /*
+     * Submit the request and wait for it to complete.
+     */
+    if ((error = ciss_synch_request(cr, 60 * 1000)) != 0) {
+	ciss_printf(sc, "error sending BMIC FLUSH_CACHE command (%d)\n", error);
+	goto out;
+    }
+    
+    /*
+     * Check response.
+     */
+    ciss_report_request(cr, &command_status, NULL);
+    switch(command_status) {
+    case CISS_CMD_STATUS_SUCCESS:
+	break;
+    default:
+	ciss_printf(sc, "error flushing cache (%s)\n",  
+		    ciss_name_command_status(command_status));
+	error = EIO;
+	goto out;
+    }
+
+out:
+    if (cbfc != NULL)
+	free(cbfc, CISS_MALLOC_CLASS);
+    if (cr != NULL)
+	ciss_release_request(cr);
+    return(error);
+}
+
+/************************************************************************
+ * Allocate memory for the adapter command structures, initialise
+ * the request structures.
+ *
+ * Note that the entire set of commands are allocated in a single
+ * contiguous slab.
+ */
+static int
+ciss_init_requests(struct ciss_softc *sc)
+{
+    struct ciss_request	*cr;
+    int			i;
+
+    debug_called(1);
+    
+    /*
+     * Calculate the number of request structures/commands we are
+     * going to provide for this adapter.
+     */
+    sc->ciss_max_requests = min(CISS_MAX_REQUESTS, sc->ciss_cfg->max_outstanding_commands);
+    
+    if (1/*bootverbose*/)
+	ciss_printf(sc, "using %d of %d available commands\n",
+		    sc->ciss_max_requests, sc->ciss_cfg->max_outstanding_commands);
+
+    /*
+     * Create the DMA tag for commands.
+     */
+    if (bus_dma_tag_create(sc->ciss_parent_dmat,	/* parent */
+			   1, 0, 			/* alignment, boundary */
+			   BUS_SPACE_MAXADDR,		/* lowaddr */
+			   BUS_SPACE_MAXADDR, 		/* highaddr */
+			   NULL, NULL, 			/* filter, filterarg */
+			   CISS_COMMAND_ALLOC_SIZE * 
+			   sc->ciss_max_requests, 1,	/* maxsize, nsegments */
+			   BUS_SPACE_MAXSIZE_32BIT,	/* maxsegsize */
+			   0,				/* flags */
+			   &sc->ciss_command_dmat)) {
+	ciss_printf(sc, "can't allocate command DMA tag\n");
+	return(ENOMEM);
+    }
+    /*
+     * Allocate memory and make it available for DMA.
+     */
+    if (bus_dmamem_alloc(sc->ciss_command_dmat, (void **)&sc->ciss_command, 
+			 BUS_DMA_NOWAIT, &sc->ciss_command_map)) {
+	ciss_printf(sc, "can't allocate command memory\n");
+	return(ENOMEM);
+    }
+    bus_dmamap_load(sc->ciss_command_dmat, sc->ciss_command_map, sc->ciss_command, 
+		    sizeof(struct ciss_command) * sc->ciss_max_requests,
+		    ciss_command_map_helper, sc, 0);
+    bzero(sc->ciss_command, CISS_COMMAND_ALLOC_SIZE * sc->ciss_max_requests);
+
+    /*
+     * Set up the request and command structures, push requests onto
+     * the free queue.
+     */
+    for (i = 1; i < sc->ciss_max_requests; i++) {
+	cr = &sc->ciss_request[i];
+	cr->cr_sc = sc;
+	cr->cr_tag = i;
+	ciss_enqueue_free(cr);
+    }
+    return(0);
+}
+
+static void
+ciss_command_map_helper(void *arg, bus_dma_segment_t *segs, int nseg, int error)
+{
+    struct ciss_softc	*sc = (struct ciss_softc *)arg;
+
+    sc->ciss_command_phys = segs->ds_addr;
+}
+
+/************************************************************************
+ * Identify the adapter, print some information about it.
+ */
+static int
+ciss_identify_adapter(struct ciss_softc *sc)
+{
+    struct ciss_request	*cr;
+    int			error, command_status;
+
+    debug_called(1);
+
+    cr = NULL;
+
+    /*
+     * Get a request, allocate storage for the adapter data.
+     */
+    if ((error = ciss_get_bmic_request(sc, &cr, CISS_BMIC_ID_CTLR,
+				       (void **)&sc->ciss_id,
+				       sizeof(*sc->ciss_id))) != 0)
+	goto out;
+
+    /*
+     * Submit the request and wait for it to complete.
+     */
+    if ((error = ciss_synch_request(cr, 60 * 1000)) != 0) {
+	ciss_printf(sc, "error sending BMIC ID_CTLR command (%d)\n", error);
+	goto out;
+    }
+    
+    /*
+     * Check response.
+     */
+    ciss_report_request(cr, &command_status, NULL);
+    switch(command_status) {
+    case CISS_CMD_STATUS_SUCCESS:		/* buffer right size */
+	break;
+    case CISS_CMD_STATUS_DATA_UNDERRUN:
+    case CISS_CMD_STATUS_DATA_OVERRUN:
+	ciss_printf(sc, "data over/underrun reading adapter information\n");
+    default:
+	ciss_printf(sc, "error reading adapter information (%s)\n",
+		    ciss_name_command_status(command_status));
+	error = EIO;
+	goto out;
+    }
+
+    /* sanity-check reply */
+    if (!sc->ciss_id->big_map_supported) {
+	ciss_printf(sc, "adapter does not support BIG_MAP\n");
+	error = ENXIO;
+	goto out;
+    }
+
+    /* XXX later revisions may not need this */
+    sc->ciss_flags |= CISS_FLAG_FAKE_SYNCH;
+
+    /* XXX only really required for old 5300 adapters? */
+    sc->ciss_flags |= CISS_FLAG_BMIC_ABORT;
+    
+    /* print information */
+    if (1/*bootverbose*/) {
+	ciss_printf(sc, "  %d logical drive%s configured\n",
+		    sc->ciss_id->configured_logical_drives,
+		    (sc->ciss_id->configured_logical_drives == 1) ? "" : "s");
+	ciss_printf(sc, "  firmware %4.4s\n", sc->ciss_id->running_firmware_revision);
+	ciss_printf(sc, "  %d SCSI channels\n", sc->ciss_id->scsi_bus_count);
+
+	ciss_printf(sc, "  signature '%.4s'\n", sc->ciss_cfg->signature);
+	ciss_printf(sc, "  valence %d\n", sc->ciss_cfg->valence);
+	ciss_printf(sc, "  supported I/O methods 0x%b\n",
+		    sc->ciss_cfg->supported_methods, 
+		    "\20\1READY\2simple\3performant\4MEMQ\n");
+	ciss_printf(sc, "  active I/O method 0x%b\n",
+		    sc->ciss_cfg->active_method, "\20\2simple\3performant\4MEMQ\n");
+	ciss_printf(sc, "  4G page base 0x%08x\n",
+		    sc->ciss_cfg->command_physlimit);
+	ciss_printf(sc, "  interrupt coalesce delay %dus\n",
+		    sc->ciss_cfg->interrupt_coalesce_delay);
+	ciss_printf(sc, "  interrupt coalesce count %d\n",
+		    sc->ciss_cfg->interrupt_coalesce_count);
+	ciss_printf(sc, "  max outstanding commands %d\n",
+		    sc->ciss_cfg->max_outstanding_commands);
+	ciss_printf(sc, "  bus types 0x%b\n", sc->ciss_cfg->bus_types, 
+		    "\20\1ultra2\2ultra3\10fibre1\11fibre2\n");
+	ciss_printf(sc, "  server name '%.16s'\n", sc->ciss_cfg->server_name);
+	ciss_printf(sc, "  heartbeat 0x%x\n", sc->ciss_cfg->heartbeat);
+    }
+
+out:
+    if (error) {
+	if (sc->ciss_id != NULL) {
+	    free(sc->ciss_id, CISS_MALLOC_CLASS);
+	    sc->ciss_id = NULL;
+	}
+    }	
+    if (cr != NULL)
+	ciss_release_request(cr);
+    return(error);
+}
+
+/************************************************************************
+ * Find logical drives on the adapter.
+ */
+static int
+ciss_init_logical(struct ciss_softc *sc)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_report_cdb	*crc;
+    struct ciss_lun_report	*cll;
+    int				error, i;
+    size_t			report_size;
+    int				ndrives;
+    int				command_status;
+
+    debug_called(1);
+
+    cr = NULL;
+    cll = NULL;
+
+    /*
+     * Get a request, allocate storage for the address list.
+     */
+    if ((error = ciss_get_request(sc, &cr)) != 0)
+	goto out;
+    report_size = sizeof(*cll) + CISS_MAX_LOGICAL * sizeof(union ciss_device_address);
+    if ((cll = malloc(report_size, CISS_MALLOC_CLASS, M_NOWAIT | M_ZERO)) == NULL) {
+	ciss_printf(sc, "can't allocate memory for logical drive list\n");
+	error = ENOMEM;
+	goto out;
+    }
+
+    /*
+     * Build the Report Logical LUNs command.
+     */
+    cc = CISS_FIND_COMMAND(cr);
+    cr->cr_data = cll;
+    cr->cr_length = report_size;
+    cr->cr_flags = CISS_REQ_DATAIN;
+    
+    cc->header.address.physical.mode = CISS_HDR_ADDRESS_MODE_PERIPHERAL;
+    cc->header.address.physical.bus = 0;
+    cc->header.address.physical.target = 0;
+    cc->cdb.cdb_length = sizeof(*crc);
+    cc->cdb.type = CISS_CDB_TYPE_COMMAND;
+    cc->cdb.attribute = CISS_CDB_ATTRIBUTE_SIMPLE;
+    cc->cdb.direction = CISS_CDB_DIRECTION_READ;
+    cc->cdb.timeout = 30;	/* XXX better suggestions? */
+
+    crc = (struct ciss_report_cdb *)&(cc->cdb.cdb[0]);
+    bzero(crc, sizeof(*crc));
+    crc->opcode = CISS_OPCODE_REPORT_LOGICAL_LUNS;
+    crc->length = htonl(report_size);			/* big-endian field */
+    cll->list_size = htonl(report_size - sizeof(*cll));	/* big-endian field */
+    
+    /*
+     * Submit the request and wait for it to complete.  (timeout
+     * here should be much greater than above)
+     */
+    if ((error = ciss_synch_request(cr, 60 * 1000)) != 0) {
+	ciss_printf(sc, "error sending Report Logical LUNs command (%d)\n", error);
+	goto out;
+    }
+
+    /*
+     * Check response.  Note that data over/underrun is OK.
+     */
+    ciss_report_request(cr, &command_status, NULL);
+    switch(command_status) {
+    case CISS_CMD_STATUS_SUCCESS:	/* buffer right size */
+    case CISS_CMD_STATUS_DATA_UNDERRUN:	/* buffer too large, not bad */
+	break;
+    case CISS_CMD_STATUS_DATA_OVERRUN:
+	ciss_printf(sc, "WARNING: more logical drives than driver limit (%d), adjust CISS_MAX_LOGICAL\n",
+		    CISS_MAX_LOGICAL);
+	break;
+    default:
+	ciss_printf(sc, "error detecting logical drive configuration (%s)\n",
+		    ciss_name_command_status(command_status));
+	error = EIO;
+	goto out;
+    }
+    ciss_release_request(cr);
+    cr = NULL;
+
+    /* sanity-check reply */
+    ndrives = (ntohl(cll->list_size) / sizeof(union ciss_device_address));
+    if ((ndrives < 0) || (ndrives > CISS_MAX_LOGICAL)) {
+	ciss_printf(sc, "adapter claims to report absurd number of logical drives (%d > %d)\n",
+		    ndrives, CISS_MAX_LOGICAL);
+	return(ENXIO);
+    }
+
+    /*
+     * Save logical drive information.
+     */
+    if (1/*bootverbose*/)
+	ciss_printf(sc, "%d logical drive%s\n", ndrives, (ndrives > 1) ? "s" : "");
+    if (ndrives != sc->ciss_id->configured_logical_drives)
+	ciss_printf(sc, "logical drive map claims %d drives, but adapter claims %d\n",
+		    ndrives, sc->ciss_id->configured_logical_drives);
+    for (i = 0; i < CISS_MAX_LOGICAL; i++) {
+	if (i < ndrives) {
+	    sc->ciss_logical[i].cl_address = cll->lun[i];	/* XXX endianness? */
+	    if (ciss_identify_logical(sc, &sc->ciss_logical[i]) != 0)
+		continue;
+	    /*
+	     * If the drive has had media exchanged, we should bring it online.
+	     */
+	    if (sc->ciss_logical[i].cl_lstatus->media_exchanged)
+		ciss_accept_media(sc, i, 0);
+
+	} else {
+	    sc->ciss_logical[i].cl_status = CISS_LD_NONEXISTENT;
+	}
+    }
+    error = 0;
+    
+ out:
+    /*
+     * Note that if the error is a timeout, we are taking a slight
+     * risk here and assuming that the adapter will not respond at a
+     * later time, scribbling over host memory.
+     */
+    if (cr != NULL)
+	ciss_release_request(cr);
+    if (cll != NULL)
+	free(cll, CISS_MALLOC_CLASS);
+    return(error);
+}
+
+/************************************************************************
+ * Identify a logical drive, initialise state related to it.
+ */
+static int
+ciss_identify_logical(struct ciss_softc *sc, struct ciss_ldrive *ld)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_bmic_cdb	*cbc;
+    int				error, command_status;
+
+    debug_called(1);
+
+    cr = NULL;
+
+    /*
+     * Build a BMIC request to fetch the drive ID.
+     */
+    if ((error = ciss_get_bmic_request(sc, &cr, CISS_BMIC_ID_LDRIVE,
+				       (void **)&ld->cl_ldrive, 
+				       sizeof(*ld->cl_ldrive))) != 0)
+	goto out;
+    cc = CISS_FIND_COMMAND(cr);
+    cbc = (struct ciss_bmic_cdb *)&(cc->cdb.cdb[0]);
+    cbc->log_drive = ld->cl_address.logical.lun;
+
+    /*
+     * Submit the request and wait for it to complete.
+     */
+    if ((error = ciss_synch_request(cr, 60 * 1000)) != 0) {
+	ciss_printf(sc, "error sending BMIC LDRIVE command (%d)\n", error);
+	goto out;
+    }
+    
+    /*
+     * Check response.
+     */
+    ciss_report_request(cr, &command_status, NULL);
+    switch(command_status) {
+    case CISS_CMD_STATUS_SUCCESS:		/* buffer right size */
+	break;
+    case CISS_CMD_STATUS_DATA_UNDERRUN:
+    case CISS_CMD_STATUS_DATA_OVERRUN:
+	ciss_printf(sc, "data over/underrun reading logical drive ID\n");
+    default:
+	ciss_printf(sc, "error reading logical drive ID (%s)\n",
+		    ciss_name_command_status(command_status));
+	error = EIO;
+	goto out;
+    }
+    ciss_release_request(cr);
+    cr = NULL;
+
+    /*
+     * Build a CISS BMIC command to get the logical drive status.
+     */
+    if ((error = ciss_get_ldrive_status(sc, ld)) != 0)
+	goto out;
+
+    /*
+     * Print the drive's basic characteristics.
+     */
+    if (1/*bootverbose*/) {
+	ciss_printf(sc, "logical drive %d: %s, %dMB ",
+		    cbc->log_drive, ciss_name_ldrive_org(ld->cl_ldrive->fault_tolerance),
+		    ((ld->cl_ldrive->blocks_available / (1024 * 1024)) *
+		     ld->cl_ldrive->block_size));
+
+	ciss_print_ldrive(sc, ld);
+    }
+out:
+    if (error != 0) {
+	/* make the drive not-exist */
+	ld->cl_status = CISS_LD_NONEXISTENT;
+	if (ld->cl_ldrive != NULL) {
+	    free(ld->cl_ldrive, CISS_MALLOC_CLASS);
+	    ld->cl_ldrive = NULL;
+	}
+	if (ld->cl_lstatus != NULL) {
+	    free(ld->cl_lstatus, CISS_MALLOC_CLASS);
+	    ld->cl_lstatus = NULL;
+	}
+    }
+    if (cr != NULL)
+	ciss_release_request(cr);
+	
+    return(error);
+}
+
+/************************************************************************
+ * Get status for a logical drive.
+ *
+ * XXX should we also do this in response to Test Unit Ready?
+ */
+static int
+ciss_get_ldrive_status(struct ciss_softc *sc,  struct ciss_ldrive *ld)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_bmic_cdb	*cbc;
+    int				error, command_status;
+
+    /*
+     * Build a CISS BMIC command to get the logical drive status.
+     */
+    if ((error = ciss_get_bmic_request(sc, &cr, CISS_BMIC_ID_LSTATUS,
+				       (void **)&ld->cl_lstatus, 
+				       sizeof(*ld->cl_lstatus))) != 0)
+	goto out;
+    cc = CISS_FIND_COMMAND(cr);
+    cbc = (struct ciss_bmic_cdb *)&(cc->cdb.cdb[0]);
+    cbc->log_drive = ld->cl_address.logical.lun;
+
+    /*
+     * Submit the request and wait for it to complete.
+     */
+    if ((error = ciss_synch_request(cr, 60 * 1000)) != 0) {
+	ciss_printf(sc, "error sending BMIC LSTATUS command (%d)\n", error);
+	goto out;
+    }
+    
+    /*
+     * Check response.
+     */
+    ciss_report_request(cr, &command_status, NULL);
+    switch(command_status) {
+    case CISS_CMD_STATUS_SUCCESS:		/* buffer right size */
+	break;
+    case CISS_CMD_STATUS_DATA_UNDERRUN:
+    case CISS_CMD_STATUS_DATA_OVERRUN:
+	ciss_printf(sc, "data over/underrun reading logical drive status\n");
+    default:
+	ciss_printf(sc, "error reading logical drive status (%s)\n",
+		    ciss_name_command_status(command_status));
+	error = EIO;
+	goto out;
+    }
+
+    /*
+     * Set the drive's summary status based on the returned status.
+     *
+     * XXX testing shows that a failed JBOD drive comes back at next 
+     * boot in "queued for expansion" mode.  WTF?
+     */
+    ld->cl_status = ciss_decode_ldrive_status(ld->cl_lstatus->status);
+
+out:
+    if (cr != NULL)
+	ciss_release_request(cr);
+    return(error);
+}
+
+/************************************************************************
+ * Notify the adapter of a config update.
+ */
+static int
+ciss_update_config(struct ciss_softc *sc)
+{
+    int		i;
+
+    debug_called(1);
+
+    CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IDBR, CISS_TL_SIMPLE_IDBR_CFG_TABLE);
+    for (i = 0; i < 1000; i++) {
+	if (!(CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IDBR) &
+	      CISS_TL_SIMPLE_IDBR_CFG_TABLE)) {
+	    return(0);
+	}
+	DELAY(1000);
+    }
+    return(1);
+}
+
+/************************************************************************
+ * Accept new media into a logical drive.
+ *
+ * XXX The drive has previously been offline; it would be good if we
+ *     could make sure it's not open right now.
+ */
+static int
+ciss_accept_media(struct ciss_softc *sc, int ldrive, int async)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_bmic_cdb	*cbc;
+    int				error;
+
+    debug(0, "bringing logical drive %d back online %ssynchronously", 
+	  ldrive, async ? "a" : "");
+
+    /*
+     * Build a CISS BMIC command to bring the drive back online.
+     */
+    if ((error = ciss_get_bmic_request(sc, &cr, CISS_BMIC_ACCEPT_MEDIA,
+				       NULL, 0)) != 0)
+	goto out;
+    cc = CISS_FIND_COMMAND(cr);
+    cbc = (struct ciss_bmic_cdb *)&(cc->cdb.cdb[0]);
+    cbc->log_drive = ldrive;
+
+    /*
+     * Dispatch the request asynchronously if we can't sleep waiting
+     * for it to complete.
+     */
+    if (async) {
+	cr->cr_complete = ciss_accept_media_complete;
+	if ((error = ciss_start(cr)) != 0)
+	    goto out;
+	return(0);
+    } else {
+	/*
+	 * Submit the request and wait for it to complete.
+	 */
+	if ((error = ciss_synch_request(cr, 60 * 1000)) != 0) {
+	    ciss_printf(sc, "error sending BMIC LSTATUS command (%d)\n", error);
+	    goto out;
+	}
+    }
+
+    /*
+     * Call the completion callback manually.
+     */
+    ciss_accept_media_complete(cr);
+    return(0);
+    
+out:
+    if (cr != NULL)
+	ciss_release_request(cr);
+    return(error);
+}
+
+static void
+ciss_accept_media_complete(struct ciss_request *cr)
+{
+    int				command_status;
+    
+    /*
+     * Check response.
+     */
+    ciss_report_request(cr, &command_status, NULL);
+    switch(command_status) {
+    case CISS_CMD_STATUS_SUCCESS:		/* all OK */
+	/* we should get a logical drive status changed event here */
+	break;
+    default:
+	ciss_printf(cr->cr_sc, "error accepting media into failed logical drive (%s)\n",
+		    ciss_name_command_status(command_status));
+	break;
+    }
+    ciss_release_request(cr);
+}
+
+/************************************************************************
+ * Release adapter resources.
+ */
+static void
+ciss_free(struct ciss_softc *sc)
+{
+    debug_called(1);
+
+    /* we're going away */
+    sc->ciss_flags |= CISS_FLAG_ABORTING;
+
+    /* terminate the periodic heartbeat routine */
+    untimeout(ciss_periodic, sc, sc->ciss_periodic);
+
+    /* cancel the Event Notify chain */
+    ciss_notify_abort(sc);
+    
+    /* free the controller data */
+    if (sc->ciss_id != NULL)
+	free(sc->ciss_id, CISS_MALLOC_CLASS);
+
+    /* release I/O resources */
+    if (sc->ciss_regs_resource != NULL)
+	bus_release_resource(sc->ciss_dev, SYS_RES_MEMORY,
+			     sc->ciss_regs_rid, sc->ciss_regs_resource);
+    if (sc->ciss_cfg_resource != NULL)
+	bus_release_resource(sc->ciss_dev, SYS_RES_MEMORY,
+			     sc->ciss_cfg_rid, sc->ciss_cfg_resource);
+    if (sc->ciss_intr != NULL)
+	bus_teardown_intr(sc->ciss_dev, sc->ciss_irq_resource, sc->ciss_intr);
+    if (sc->ciss_irq_resource != NULL)
+	bus_release_resource(sc->ciss_dev, SYS_RES_IRQ,
+			     sc->ciss_irq_rid, sc->ciss_irq_resource);
+
+    /* destroy DMA tags */
+    if (sc->ciss_parent_dmat)
+	bus_dma_tag_destroy(sc->ciss_parent_dmat);
+    if (sc->ciss_buffer_dmat)
+	bus_dma_tag_destroy(sc->ciss_buffer_dmat);
+
+    /* destroy command memory and DMA tag */
+    if (sc->ciss_command != NULL) {
+	bus_dmamap_unload(sc->ciss_command_dmat, sc->ciss_command_map);
+	bus_dmamem_free(sc->ciss_command_dmat, sc->ciss_command, sc->ciss_command_map);
+    }
+    if (sc->ciss_buffer_dmat)
+	bus_dma_tag_destroy(sc->ciss_command_dmat);
+
+    /* disconnect from CAM */
+    if (sc->ciss_cam_sim) {
+	xpt_bus_deregister(cam_sim_path(sc->ciss_cam_sim));
+	cam_sim_free(sc->ciss_cam_sim, 0);
+    }
+    if (sc->ciss_cam_devq)
+	cam_simq_free(sc->ciss_cam_devq);
+    /* XXX what about ciss_cam_path? */
+}
+
+/************************************************************************
+ * Give a command to the adapter.
+ *
+ * Note that this uses the simple transport layer directly.  If we
+ * want to add support for other layers, we'll need a switch of some
+ * sort.
+ *
+ * Note that the simple transport layer has no way of refusing a
+ * command; we only have as many request structures as the adapter
+ * supports commands, so we don't have to check (this presumes that
+ * the adapter can handle commands as fast as we throw them at it).
+ */
+static int
+ciss_start(struct ciss_request *cr)
+{
+    struct ciss_command	*cc;	/* XXX debugging only */
+    int			error;
+
+    cc = CISS_FIND_COMMAND(cr);
+    debug(2, "post command %d tag %d ", cr->cr_tag, cc->header.host_tag);
+
+    /*
+     * Map the request's data.
+     */
+    if ((error = ciss_map_request(cr)))
+	return(error);
+
+#if 0
+    ciss_print_request(cr);
+#endif
+
+    /*
+     * Post the command to the adapter.
+     */
+    ciss_enqueue_busy(cr);
+    CISS_TL_SIMPLE_POST_CMD(cr->cr_sc, CISS_FIND_COMMANDPHYS(cr));
+
+    return(0);
+}
+
+/************************************************************************
+ * Fetch completed request(s) from the adapter, queue them for
+ * completion handling.
+ *
+ * Note that this uses the simple transport layer directly.  If we
+ * want to add support for other layers, we'll need a switch of some
+ * sort.
+ *
+ * Note that the simple transport mechanism does not require any
+ * reentrancy protection; the OPQ read is atomic.  If there is a
+ * chance of a race with something else that might move the request
+ * off the busy list, then we will have to lock against that
+ * (eg. timeouts, etc.)
+ */
+static void
+ciss_done(struct ciss_softc *sc)
+{
+    struct ciss_request	*cr;
+    struct ciss_command	*cc;
+    u_int32_t		tag, index;
+    int			complete;
+    
+    debug_called(3);
+
+    /*
+     * Loop quickly taking requests from the adapter and moving them
+     * from the busy queue to the completed queue.
+     */
+    complete = 0;
+    for (;;) {
+
+	/* see if the OPQ contains anything */
+	if (!CISS_TL_SIMPLE_OPQ_INTERRUPT(sc))
+	    break;
+
+	tag = CISS_TL_SIMPLE_FETCH_CMD(sc);
+	if (tag == CISS_TL_SIMPLE_OPQ_EMPTY)
+	    break;
+	index = tag >> 2;
+	debug(2, "completed command %d%s", index, 
+	      (tag & CISS_HDR_HOST_TAG_ERROR) ? " with error" : "");
+	if (index >= sc->ciss_max_requests) {
+	    ciss_printf(sc, "completed invalid request %d (0x%x)\n", index, tag);
+	    continue;
+	}
+	cr = &(sc->ciss_request[index]);
+	cc = CISS_FIND_COMMAND(cr);
+	cc->header.host_tag = tag;	/* not updated by adapter */
+	if (ciss_remove_busy(cr)) {
+	    /* assume this is garbage out of the adapter */
+	    ciss_printf(sc, "completed nonbusy request %d\n", index);
+	} else {
+	    ciss_enqueue_complete(cr);
+	}
+	complete = 1;
+    }
+    
+    /*
+     * Invoke completion processing.  If we can defer this out of
+     * interrupt context, that'd be good.
+     */
+    if (complete)
+	ciss_complete(sc);
+}
+
+/************************************************************************
+ * Take an interrupt from the adapter.
+ */
+static void
+ciss_intr(void *arg)
+{
+    struct ciss_softc	*sc = (struct ciss_softc *)arg;
+
+    /*
+     * The only interrupt we recognise indicates that there are
+     * entries in the outbound post queue.
+     */
+    ciss_done(sc);
+}
+
+/************************************************************************
+ * Process completed requests.
+ *
+ * Requests can be completed in three fashions:
+ *
+ * - by invoking a callback function (cr_complete is non-null)
+ * - by waking up a sleeper (cr_flags has CISS_REQ_SLEEP set)
+ * - by clearing the CISS_REQ_POLL flag in interrupt/timeout context
+ */
+static void
+ciss_complete(struct ciss_softc *sc)
+{
+    struct ciss_request	*cr;
+
+    debug_called(2);
+
+    /*
+     * Loop taking requests off the completed queue and performing
+     * completion processing on them.
+     */
+    for (;;) {
+	if ((cr = ciss_dequeue_complete(sc)) == NULL)
+	    break;
+	ciss_unmap_request(cr);
+	
+	/*
+	 * If the request has a callback, invoke it.
+	 */
+	if (cr->cr_complete != NULL) {
+	    cr->cr_complete(cr);
+	    continue;
+	}
+	
+	/*
+	 * If someone is sleeping on this request, wake them up.
+	 */
+	if (cr->cr_flags & CISS_REQ_SLEEP) {
+	    cr->cr_flags &= ~CISS_REQ_SLEEP;
+	    wakeup(cr);
+	    continue;
+	}
+
+	/*
+	 * If someone is polling this request for completion, signal.
+	 */
+	if (cr->cr_flags & CISS_REQ_POLL) {
+	    cr->cr_flags &= ~CISS_REQ_POLL;
+	    continue;
+	}
+	
+	/*
+	 * Give up and throw the request back on the free queue.  This
+	 * should never happen; resources will probably be lost.
+	 */
+	ciss_printf(sc, "WARNING: completed command with no submitter\n");
+	ciss_enqueue_free(cr);
+    }
+}
+
+/************************************************************************
+ * Report on the completion status of a request, and pass back SCSI
+ * and command status values.
+ */
+static int
+ciss_report_request(struct ciss_request *cr, int *command_status, int *scsi_status)
+{
+    struct ciss_command		*cc;
+    struct ciss_error_info	*ce;
+
+    debug_called(2);
+
+    cc = CISS_FIND_COMMAND(cr);
+    ce = (struct ciss_error_info *)&(cc->sg[0]);
+
+    /*
+     * We don't consider data under/overrun an error for the Report
+     * Logical/Physical LUNs commands.
+     */
+    if ((cc->header.host_tag & CISS_HDR_HOST_TAG_ERROR) &&
+	((cc->cdb.cdb[0] == CISS_OPCODE_REPORT_LOGICAL_LUNS) ||
+	 (cc->cdb.cdb[0] == CISS_OPCODE_REPORT_PHYSICAL_LUNS))) {
+	cc->header.host_tag &= ~CISS_HDR_HOST_TAG_ERROR;
+	debug(2, "ignoring irrelevant under/overrun error");
+    }
+    
+    /*
+     * Check the command's error bit, if clear, there's no status and
+     * everything is OK.
+     */
+    if (!(cc->header.host_tag & CISS_HDR_HOST_TAG_ERROR)) {
+	if (scsi_status != NULL)
+	    *scsi_status = SCSI_STATUS_OK;
+	if (command_status != NULL)
+	    *command_status = CISS_CMD_STATUS_SUCCESS;
+	return(0);
+    } else {
+	if (command_status != NULL)
+	    *command_status = ce->command_status;
+	if (scsi_status != NULL) {
+	    if (ce->command_status == CISS_CMD_STATUS_TARGET_STATUS) {
+		*scsi_status = ce->scsi_status;
+	    } else {
+		*scsi_status = -1;
+	    }
+	}
+	if (bootverbose)
+	    ciss_printf(cr->cr_sc, "command status 0x%x (%s) scsi status 0x%x\n",
+			ce->command_status, ciss_name_command_status(ce->command_status),
+			ce->scsi_status);
+	if (ce->command_status == CISS_CMD_STATUS_INVALID_COMMAND) {
+	    ciss_printf(cr->cr_sc, "invalid command, offense size %d at %d, value 0x%x\n",
+			ce->additional_error_info.invalid_command.offense_size,
+			ce->additional_error_info.invalid_command.offense_offset,
+			ce->additional_error_info.invalid_command.offense_value);
+	}
+    }
+    return(1);
+}
+
+/************************************************************************
+ * Issue a request and don't return until it's completed.
+ *
+ * Depending on adapter status, we may poll or sleep waiting for
+ * completion.
+ */
+static int
+ciss_synch_request(struct ciss_request *cr, int timeout)
+{
+    if (cr->cr_sc->ciss_flags & CISS_FLAG_RUNNING) {
+	return(ciss_wait_request(cr, timeout));
+    } else {
+	return(ciss_poll_request(cr, timeout));
+    }
+}
+
+/************************************************************************
+ * Issue a request and poll for completion.
+ *
+ * Timeout in milliseconds.
+ */
+static int
+ciss_poll_request(struct ciss_request *cr, int timeout)
+{
+    int		error;
+    
+    debug_called(2);
+
+    cr->cr_flags |= CISS_REQ_POLL;
+    if ((error = ciss_start(cr)) != 0)
+	return(error);
+
+    do {
+	ciss_done(cr->cr_sc);
+	if (!(cr->cr_flags & CISS_REQ_POLL))
+	    return(0);
+	DELAY(1000);
+    } while (timeout-- >= 0);
+    return(EWOULDBLOCK);
+}
+
+/************************************************************************
+ * Issue a request and sleep waiting for completion.
+ *
+ * Timeout in milliseconds.  Note that a spurious wakeup will reset
+ * the timeout.
+ */
+static int
+ciss_wait_request(struct ciss_request *cr, int timeout)
+{
+    int		s, error;
+
+    debug_called(2);
+
+    cr->cr_flags |= CISS_REQ_SLEEP;
+    if ((error = ciss_start(cr)) != 0)
+	return(error);
+
+    s = splcam();
+    while (cr->cr_flags & CISS_REQ_SLEEP) {
+	error = tsleep(cr, PCATCH, "cissREQ", (timeout * hz) / 1000);
+	/* 
+	 * On wakeup or interruption due to restartable activity, go
+	 * back and check to see if we're done.
+	 */
+	if ((error == 0) || (error == ERESTART)) {
+	    error = 0;
+	    continue;
+	}
+	/*
+	 * Timeout, interrupted system call, etc.
+	 */
+	break;
+    }
+    splx(s);
+    return(error);
+}
+
+/************************************************************************
+ * Abort a request.  Note that a potential exists here to race the
+ * request being completed; the caller must deal with this.
+ */
+static int
+ciss_abort_request(struct ciss_request *ar)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_message_cdb	*cmc;
+    int				error;
+
+    debug_called(1);
+
+    /* get a request */
+    if ((error = ciss_get_request(ar->cr_sc, &cr)) != 0)
+	return(error);
+
+    /* build the abort command */	
+    cc = CISS_FIND_COMMAND(cr);
+    cc->header.address.mode.mode = CISS_HDR_ADDRESS_MODE_PERIPHERAL;	/* addressing? */
+    cc->header.address.physical.target = 0;
+    cc->header.address.physical.bus = 0;
+    cc->cdb.cdb_length = sizeof(*cmc);
+    cc->cdb.type = CISS_CDB_TYPE_MESSAGE;
+    cc->cdb.attribute = CISS_CDB_ATTRIBUTE_SIMPLE;
+    cc->cdb.direction = CISS_CDB_DIRECTION_NONE;
+    cc->cdb.timeout = 30;
+
+    cmc = (struct ciss_message_cdb *)&(cc->cdb.cdb[0]);
+    cmc->opcode = CISS_OPCODE_MESSAGE_ABORT;
+    cmc->type = CISS_MESSAGE_ABORT_TASK;
+    cmc->abort_tag = ar->cr_tag;	/* endianness?? */
+
+    /*
+     * Send the request and wait for a response.  If we believe we
+     * aborted the request OK, clear the flag that indicates it's
+     * running.
+     */
+    error = ciss_synch_request(cr, 35 * 1000);
+    if (!error)
+	error = ciss_report_request(cr, NULL, NULL);
+    ciss_release_request(cr);
+
+    return(error);
+}
+
+
+/************************************************************************
+ * Fetch and initialise a request
+ */
+static int
+ciss_get_request(struct ciss_softc *sc, struct ciss_request **crp)
+{
+    struct ciss_request *cr;
+
+    debug_called(2);
+
+    /*
+     * Get a request and clean it up.
+     */
+    if ((cr = ciss_dequeue_free(sc)) == NULL)
+	return(ENOMEM);
+
+    cr->cr_data = NULL;
+    cr->cr_flags = 0;
+    cr->cr_complete = NULL;
+    
+    ciss_preen_command(cr);
+    *crp = cr;
+    return(0);
+}
+
+static void
+ciss_preen_command(struct ciss_request *cr)
+{
+    struct ciss_command	*cc;
+    u_int32_t		cmdphys;
+
+    /*
+     * Clean up the command structure.
+     *
+     * Note that we set up the error_info structure here, since the
+     * length can be overwritten by any command.
+     */
+    cc = CISS_FIND_COMMAND(cr);
+    cc->header.sg_in_list = 0;		/* kinda inefficient this way */
+    cc->header.sg_total = 0;
+    cc->header.host_tag = cr->cr_tag << 2;
+    cc->header.host_tag_zeroes = 0;
+    cmdphys = CISS_FIND_COMMANDPHYS(cr);
+    cc->error_info.error_info_address = cmdphys + sizeof(struct ciss_command);
+    cc->error_info.error_info_length = CISS_COMMAND_ALLOC_SIZE - sizeof(struct ciss_command);
+    
+}
+
+/************************************************************************
+ * Release a request to the free list.
+ */
+static void
+ciss_release_request(struct ciss_request *cr)
+{
+    struct ciss_softc	*sc;
+
+    debug_called(2);
+
+    sc = cr->cr_sc;
+    
+    /* release the request to the free queue */
+    ciss_requeue_free(cr);
+}
+
+/************************************************************************
+ * Allocate a request that will be used to send a BMIC command.  Do some
+ * of the common setup here to avoid duplicating it everywhere else.
+ */
+static int
+ciss_get_bmic_request(struct ciss_softc *sc, struct ciss_request **crp,
+		      int opcode, void **bufp, size_t bufsize)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_bmic_cdb	*cbc;
+    void			*buf;
+    int				error;
+    int				dataout;
+
+    debug_called(2);
+
+    cr = NULL;
+    buf = NULL;	
+
+    /*
+     * Get a request.
+     */
+    if ((error = ciss_get_request(sc, &cr)) != 0)
+	goto out;
+
+    /*
+     * Allocate data storage if requested, determine the data direction.
+     */
+    dataout = 0;
+    if ((bufsize > 0) && (bufp != NULL)) {
+	if (*bufp == NULL) {
+	    if ((buf = malloc(bufsize, CISS_MALLOC_CLASS, M_NOWAIT | M_ZERO)) == NULL) {
+		error = ENOMEM;
+		goto out;
+	    }
+	} else {
+	    buf = *bufp;
+	    dataout = 1;	/* we are given a buffer, so we are writing */
+	}
+    }
+
+    /*
+     * Build a CISS BMIC command to get the logical drive ID.
+     */
+    cr->cr_data = buf;
+    cr->cr_length = bufsize;
+    if (!dataout)
+	cr->cr_flags = CISS_REQ_DATAIN;
+    
+    cc = CISS_FIND_COMMAND(cr);
+    cc->header.address.physical.mode = CISS_HDR_ADDRESS_MODE_PERIPHERAL;
+    cc->header.address.physical.bus = 0;
+    cc->header.address.physical.target = 0;
+    cc->cdb.cdb_length = sizeof(*cbc);
+    cc->cdb.type = CISS_CDB_TYPE_COMMAND;
+    cc->cdb.attribute = CISS_CDB_ATTRIBUTE_SIMPLE;
+    cc->cdb.direction = dataout ? CISS_CDB_DIRECTION_WRITE : CISS_CDB_DIRECTION_READ;
+    cc->cdb.timeout = 0;
+
+    cbc = (struct ciss_bmic_cdb *)&(cc->cdb.cdb[0]);
+    bzero(cbc, sizeof(*cbc));
+    cbc->opcode = dataout ? CISS_ARRAY_CONTROLLER_WRITE : CISS_ARRAY_CONTROLLER_READ;
+    cbc->bmic_opcode = opcode;
+    cbc->size = htons((u_int16_t)bufsize);
+
+out:
+    if (error) {
+	if (cr != NULL)
+	    ciss_release_request(cr);
+	if ((bufp != NULL) && (*bufp == NULL) && (buf != NULL))
+	    free(buf, CISS_MALLOC_CLASS);
+    } else {
+	*crp = cr;
+	if ((bufp != NULL) && (*bufp == NULL) && (buf != NULL))
+	    *bufp = buf;
+    }
+    return(error);
+}
+
+/************************************************************************
+ * Handle a command passed in from userspace.
+ */
+static int
+ciss_user_command(struct ciss_softc *sc, IOCTL_Command_struct *ioc)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_error_info	*ce;
+    int				error;
+
+    debug_called(1);
+
+    cr = NULL;
+
+    /*
+     * Get a request.
+     */
+    if ((error = ciss_get_request(sc, &cr)) != 0)
+	goto out;
+    cc = CISS_FIND_COMMAND(cr);
+
+    /*
+     * Allocate an in-kernel databuffer if required, copy in user data.
+     */
+    cr->cr_length = ioc->buf_size;
+    if (ioc->buf_size > 0) {
+	if ((cr->cr_data = malloc(ioc->buf_size, CISS_MALLOC_CLASS, M_WAITOK)) == NULL) {
+	    error = ENOMEM;
+	    goto out;
+	}
+	if ((error = copyin(ioc->buf, cr->cr_data, ioc->buf_size))) {
+	    debug(0, "copyin: bad data buffer %p/%d", ioc->buf, ioc->buf_size);
+	    goto out;
+	}
+    }
+
+    /*
+     * Build the request based on the user command.
+     */
+    bcopy(&ioc->LUN_info, &cc->header.address, sizeof(cc->header.address));
+    bcopy(&ioc->Request, &cc->cdb, sizeof(cc->cdb));
+
+    /* XXX anything else to populate here? */
+
+    /*
+     * Run the command.
+     */
+    if ((error = ciss_synch_request(cr, 60 * 1000))) {
+	debug(0, "request failed - %d", error);
+	goto out;
+    }
+
+    /*
+     * Copy the results back to the user.
+     */
+    ce = (struct ciss_error_info *)&(cc->sg[0]);
+    bcopy(ce, &ioc->error_info, sizeof(*ce));
+    if ((ioc->buf_size > 0) &&
+	(error = copyout(cr->cr_data, ioc->buf, ioc->buf_size))) {
+	debug(0, "copyout: bad data buffer %p/%d", ioc->buf, ioc->buf_size);
+	goto out;
+    }
+
+    /* done OK */
+    error = 0;
+
+out:
+    if ((cr != NULL) && (cr->cr_data != NULL))
+	free(cr->cr_data, CISS_MALLOC_CLASS);
+    if (cr != NULL)
+	ciss_release_request(cr);
+    return(error);
+}
+
+/************************************************************************
+ * Map a request into bus-visible space, initialise the scatter/gather
+ * list.
+ */
+static int
+ciss_map_request(struct ciss_request *cr)
+{
+    struct ciss_softc	*sc;
+
+    debug_called(2);
+    
+    sc = cr->cr_sc;
+
+    /* check that mapping is necessary */
+    if ((cr->cr_flags & CISS_REQ_MAPPED) || (cr->cr_data == NULL))
+	return(0);
+    
+    bus_dmamap_load(sc->ciss_buffer_dmat, cr->cr_datamap, cr->cr_data, cr->cr_length,
+		    ciss_request_map_helper, CISS_FIND_COMMAND(cr), 0);
+	
+    if (cr->cr_flags & CISS_REQ_DATAIN)
+	bus_dmamap_sync(sc->ciss_buffer_dmat, cr->cr_datamap, BUS_DMASYNC_PREREAD);
+    if (cr->cr_flags & CISS_REQ_DATAOUT)
+	bus_dmamap_sync(sc->ciss_buffer_dmat, cr->cr_datamap, BUS_DMASYNC_PREWRITE);
+
+    cr->cr_flags |= CISS_REQ_MAPPED;
+    return(0);
+}
+
+static void
+ciss_request_map_helper(void *arg, bus_dma_segment_t *segs, int nseg, int error)
+{
+    struct ciss_command	*cc;
+    int			i;
+
+    debug_called(2);
+    
+    cc = (struct ciss_command *)arg;
+    for (i = 0; i < nseg; i++) {
+	cc->sg[i].address = segs[i].ds_addr;
+	cc->sg[i].length = segs[i].ds_len;
+	cc->sg[i].extension = 0;
+    }
+    /* we leave the s/g table entirely within the command */
+    cc->header.sg_in_list = nseg;
+    cc->header.sg_total = nseg;
+}
+
+/************************************************************************
+ * Unmap a request from bus-visible space.
+ */
+static void
+ciss_unmap_request(struct ciss_request *cr)
+{
+    struct ciss_softc	*sc;
+
+    debug_called(2);
+    
+    sc = cr->cr_sc;
+
+    /* check that unmapping is necessary */
+    if (!(cr->cr_flags & CISS_REQ_MAPPED) || (cr->cr_data == NULL))
+	return;
+
+    if (cr->cr_flags & CISS_REQ_DATAIN)
+	bus_dmamap_sync(sc->ciss_buffer_dmat, cr->cr_datamap, BUS_DMASYNC_POSTREAD);
+    if (cr->cr_flags & CISS_REQ_DATAOUT)
+	bus_dmamap_sync(sc->ciss_buffer_dmat, cr->cr_datamap, BUS_DMASYNC_POSTWRITE);
+
+    bus_dmamap_unload(sc->ciss_buffer_dmat, cr->cr_datamap);
+    cr->cr_flags &= ~CISS_REQ_MAPPED;
+}
+
+/************************************************************************
+ * Attach the driver to CAM.
+ *
+ * We put all the logical drives on a single SCSI bus.
+ */
+static int
+ciss_cam_init(struct ciss_softc *sc)
+{
+
+    debug_called(1);
+
+    /*
+     * Allocate a devq.  We can reuse this for the masked physical
+     * devices if we decide to export these as well.
+     */
+    if ((sc->ciss_cam_devq = cam_simq_alloc(sc->ciss_max_requests)) == NULL) {
+	ciss_printf(sc, "can't allocate CAM SIM queue\n");
+	return(ENOMEM);
+    }
+
+    /*
+     * Create a SIM.
+     */
+    if ((sc->ciss_cam_sim = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc,
+					  device_get_unit(sc->ciss_dev), 1,
+					  sc->ciss_cfg->max_outstanding_commands,
+					  sc->ciss_cam_devq)) == NULL) {
+	ciss_printf(sc, "can't allocate CAM SIM\n");
+	return(ENOMEM);
+    }
+
+    /*
+     * Register bus 0 (the 'logical drives' bus) with this SIM.
+     */
+    if (xpt_bus_register(sc->ciss_cam_sim, 0) != 0) {
+	ciss_printf(sc, "can't register SCSI bus 0\n");
+	return(ENXIO);
+    }
+
+    /*
+     * Initiate a rescan of the bus.
+     */
+    ciss_cam_rescan_all(sc);
+    
+    return(0);
+}
+
+/************************************************************************
+ * Initiate a rescan of the 'logical devices' SIM
+ */ 
+static void
+ciss_cam_rescan_target(struct ciss_softc *sc, int target)
+{
+    union ccb	*ccb;
+
+    debug_called(1);
+
+    if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO)) == NULL) {
+	ciss_printf(sc, "rescan failed (can't allocate CCB)\n");
+	return;
+    }
+    
+    if (xpt_create_path(&sc->ciss_cam_path, xpt_periph, cam_sim_path(sc->ciss_cam_sim), target, 0)
+	!= CAM_REQ_CMP) {
+	ciss_printf(sc, "rescan failed (can't create path)\n");
+	return;
+    }
+    
+    xpt_setup_ccb(&ccb->ccb_h, sc->ciss_cam_path, 5/*priority (low)*/);
+    ccb->ccb_h.func_code = XPT_SCAN_BUS;
+    ccb->ccb_h.cbfcnp = ciss_cam_rescan_callback;
+    ccb->crcn.flags = CAM_FLAG_NONE;
+    xpt_action(ccb);
+ 
+    /* scan is now in progress */
+}
+
+static void
+ciss_cam_rescan_all(struct ciss_softc *sc)
+{
+    return(ciss_cam_rescan_target(sc, 0));
+}
+
+static void
+ciss_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb)
+{
+    free(ccb, M_TEMP);
+}
+
+/************************************************************************
+ * Handle requests coming from CAM
+ */
+static void
+ciss_cam_action(struct cam_sim *sim, union ccb *ccb)
+{
+    switch (ccb->ccb_h.func_code) {
+
+	/* perform SCSI I/O */
+    case XPT_SCSI_IO:
+	if (!ciss_cam_action_io(sim, (struct ccb_scsiio *)&ccb->csio))
+	    return;
+	break;
+
+	/* perform geometry calculations */
+    case XPT_CALC_GEOMETRY:
+    {
+	struct ccb_calc_geometry	*ccg = &ccb->ccg;
+        u_int32_t			secs_per_cylinder;
+
+	debug(1, "XPT_CALC_GEOMETRY %d:%d:%d", cam_sim_bus(sim), ccb->ccb_h.target_id, ccb->ccb_h.target_lun);
+
+	/*
+	 * This is the default geometry; hopefully we will have
+	 * successfully talked to the 'disk' and obtained its private
+	 * settings.
+	 */
+	ccg->heads = 255;
+	ccg->secs_per_track = 32;
+	secs_per_cylinder = ccg->heads * ccg->secs_per_track;
+        ccg->cylinders = ccg->volume_size / secs_per_cylinder;
+        ccb->ccb_h.status = CAM_REQ_CMP;
+        break;
+    }
+
+	/* handle path attribute inquiry */
+    case XPT_PATH_INQ:
+    {
+	struct ccb_pathinq	*cpi = &ccb->cpi;
+
+	debug(1, "XPT_PATH_INQ %d:%d:%d", cam_sim_bus(sim), ccb->ccb_h.target_id, ccb->ccb_h.target_lun);
+
+	cpi->version_num = 1;
+	cpi->hba_inquiry = PI_TAG_ABLE;	/* XXX is this correct? */
+	cpi->target_sprt = 0;
+	cpi->hba_misc = 0;
+	cpi->max_target = CISS_MAX_LOGICAL;
+	cpi->max_lun = 0;		/* 'logical drive' channel only */
+	cpi->initiator_id = CISS_MAX_LOGICAL;
+	strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
+        strncpy(cpi->hba_vid, "msmith@freebsd.org", HBA_IDLEN);
+        strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
+        cpi->unit_number = cam_sim_unit(sim);
+        cpi->bus_id = cam_sim_bus(sim);
+	cpi->base_transfer_speed = 132 * 1024;	/* XXX what to set this to? */
+	ccb->ccb_h.status = CAM_REQ_CMP;
+	break;
+    }
+
+    case XPT_GET_TRAN_SETTINGS:
+    {
+	struct ccb_trans_settings	*cts = &ccb->cts;
+	int				bus, target;
+
+	bus = cam_sim_bus(sim);
+	target = cts->ccb_h.target_id;
+
+	debug(1, "XPT_GET_TRAN_SETTINGS %d:%d", bus, target);
+	cts->valid = 0;
+
+	/* disconnect always OK */
+	cts->flags |= CCB_TRANS_DISC_ENB;
+	cts->valid |= CCB_TRANS_DISC_VALID;
+
+	cts->ccb_h.status = CAM_REQ_CMP;
+	break;
+    }
+
+    default:		/* we can't do this */
+	debug(1, "unspported func_code = 0x%x", ccb->ccb_h.func_code);
+	ccb->ccb_h.status = CAM_REQ_INVALID;
+	break;
+    }
+
+    xpt_done(ccb);
+}
+
+/************************************************************************
+ * Handle a CAM SCSI I/O request.
+ */
+static int
+ciss_cam_action_io(struct cam_sim *sim, struct ccb_scsiio *csio)
+{
+    struct ciss_softc	*sc;
+    int			bus, target;
+    struct ciss_request	*cr;
+    struct ciss_command	*cc;
+    int			error;
+
+    sc = cam_sim_softc(sim);
+    bus = cam_sim_bus(sim);
+    target = csio->ccb_h.target_id;
+
+    debug(2, "XPT_SCSI_IO %d:%d:%d", bus, target, csio->ccb_h.target_lun);
+
+    /* check for I/O attempt to nonexistent device */
+    if ((bus != 0) ||
+	(target > CISS_MAX_LOGICAL) ||
+	(sc->ciss_logical[target].cl_status == CISS_LD_NONEXISTENT)) {
+	debug(3, "  device does not exist");
+	csio->ccb_h.status = CAM_REQ_CMP_ERR;
+    }
+
+    /* firmware does not support commands > 10 bytes */
+    if (csio->cdb_len > 12/*CISS_CDB_BUFFER_SIZE*/) {
+	debug(3, "  command too large (%d > %d)", csio->cdb_len, CISS_CDB_BUFFER_SIZE);
+	csio->ccb_h.status = CAM_REQ_CMP_ERR;
+    }
+
+    /* check that the CDB pointer is not to a physical address */
+    if ((csio->ccb_h.flags & CAM_CDB_POINTER) && (csio->ccb_h.flags & CAM_CDB_PHYS)) {
+	debug(3, "  CDB pointer is to physical address");
+	csio->ccb_h.status = CAM_REQ_CMP_ERR;
+    }
+
+    /* if there is data transfer, it must be to/from a virtual address */
+    if ((csio->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
+	if (csio->ccb_h.flags & CAM_DATA_PHYS) {		/* we can't map it */
+	    debug(3, "  data pointer is to physical address");
+	    csio->ccb_h.status = CAM_REQ_CMP_ERR;
+	}
+	if (csio->ccb_h.flags & CAM_SCATTER_VALID) {	/* we want to do the s/g setup */
+	    debug(3, "  data has premature s/g setup");
+	    csio->ccb_h.status = CAM_REQ_CMP_ERR;
+	}
+    }
+
+    /* abandon aborted ccbs or those that have failed validation */
+    if ((csio->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_INPROG) {
+	debug(3, "abandoning CCB due to abort/validation failure");
+	return(EINVAL);
+    }
+
+    /* handle emulation of some SCSI commands ourself */
+    if (ciss_cam_emulate(sc, csio))
+	return(0);
+
+    /*
+     * Get a request to manage this command.  If we can't, return the
+     * ccb, freeze the queue and flag so that we unfreeze it when a
+     * request completes.
+     */
+    if ((error = ciss_get_request(sc, &cr)) != 0) {
+	xpt_freeze_simq(sc->ciss_cam_sim, 1);
+	csio->ccb_h.status |= CAM_REQUEUE_REQ;
+	return(error);
+    }
+
+    /*
+     * Build the command.
+     */
+    cc = CISS_FIND_COMMAND(cr);
+    cr->cr_data = csio->data_ptr;
+    cr->cr_length = csio->dxfer_len;
+    cr->cr_complete = ciss_cam_complete;
+    cr->cr_private = csio;
+	
+    cc->header.address.logical.mode = CISS_HDR_ADDRESS_MODE_LOGICAL;
+    cc->header.address.logical.lun = target;
+    cc->cdb.cdb_length = csio->cdb_len;
+    cc->cdb.type = CISS_CDB_TYPE_COMMAND;
+    cc->cdb.attribute = CISS_CDB_ATTRIBUTE_SIMPLE;	/* XXX ordered tags? */
+    if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) {
+	cr->cr_flags = CISS_REQ_DATAOUT;
+	cc->cdb.direction = CISS_CDB_DIRECTION_WRITE;
+    } else if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
+	cr->cr_flags = CISS_REQ_DATAIN;
+	cc->cdb.direction = CISS_CDB_DIRECTION_READ;
+    } else {
+	cr->cr_flags = 0;
+	cc->cdb.direction = CISS_CDB_DIRECTION_NONE;
+    }
+    cc->cdb.timeout = (csio->ccb_h.timeout / 1000) + 1;
+    if (csio->ccb_h.flags & CAM_CDB_POINTER) {
+	bcopy(csio->cdb_io.cdb_ptr, &cc->cdb.cdb[0], csio->cdb_len);
+    } else {
+	bcopy(csio->cdb_io.cdb_bytes, &cc->cdb.cdb[0], csio->cdb_len);
+    }
+
+    /*
+     * Submit the request to the adapter.
+     *
+     * Note that this may fail if we're unable to map the request (and
+     * if we ever learn a transport layer other than simple, may fail
+     * if the adapter rejects the command).
+     */
+    if ((error = ciss_start(cr)) != 0) {
+	xpt_freeze_simq(sc->ciss_cam_sim, 1);
+	csio->ccb_h.status |= CAM_REQUEUE_REQ;
+	ciss_release_request(cr);
+	return(error);
+    }
+	
+    return(0);
+}
+
+/************************************************************************
+ * Emulate SCSI commands the adapter doesn't handle as we might like.
+ */
+static int
+ciss_cam_emulate(struct ciss_softc *sc, struct ccb_scsiio *csio)
+{
+    int		target;
+    u_int8_t	opcode;
+    
+    
+    target = csio->ccb_h.target_id;
+    opcode = (csio->ccb_h.flags & CAM_CDB_POINTER) ? 
+	*(u_int8_t *)csio->cdb_io.cdb_ptr : csio->cdb_io.cdb_bytes[0];
+
+    /*
+     * Handle requests for volumes that don't exist.  A selection timeout
+     * is slightly better than an illegal request.  Other errors might be 
+     * better.
+     */
+    if (sc->ciss_logical[target].cl_status == CISS_LD_NONEXISTENT) {
+	csio->ccb_h.status = CAM_SEL_TIMEOUT;
+	xpt_done((union ccb *)csio);
+	return(1);
+    }
+
+    /*
+     * Handle requests for volumes that exist but are offline.
+     *
+     * I/O operations should fail, everything else should work.
+     */
+    if (sc->ciss_logical[target].cl_status == CISS_LD_OFFLINE) {
+	switch(opcode) {
+	case READ_6:
+	case READ_10:
+	case READ_12:
+	case WRITE_6:
+	case WRITE_10:
+	case WRITE_12:
+	    csio->ccb_h.status = CAM_SEL_TIMEOUT;
+	    xpt_done((union ccb *)csio);
+	    return(1);
+	}
+    }
+	    
+
+    /* if we have to fake Synchronise Cache */
+    if (sc->ciss_flags & CISS_FLAG_FAKE_SYNCH) {
+	
+	/*
+	 * If this is a Synchronise Cache command, typically issued when
+	 * a device is closed, flush the adapter and complete now.
+	 */
+	if (((csio->ccb_h.flags & CAM_CDB_POINTER) ? 
+	     *(u_int8_t *)csio->cdb_io.cdb_ptr : csio->cdb_io.cdb_bytes[0]) == SYNCHRONIZE_CACHE) {
+	    ciss_flush_adapter(sc);
+	    csio->ccb_h.status = CAM_REQ_CMP;
+	    xpt_done((union ccb *)csio);
+	    return(1);
+	}
+    }
+
+    return(0);
+}
+
+/************************************************************************
+ * Check for possibly-completed commands.
+ */
+static void
+ciss_cam_poll(struct cam_sim *sim)
+{
+    struct ciss_softc	*sc = cam_sim_softc(sim);
+
+    debug_called(2);
+
+    ciss_done(sc);
+}
+
+/************************************************************************
+ * Handle completion of a command - pass results back through the CCB
+ */
+static void
+ciss_cam_complete(struct ciss_request *cr)
+{
+    struct ciss_softc		*sc;
+    struct ciss_command		*cc;
+    struct ciss_error_info	*ce;
+    struct ccb_scsiio		*csio;
+    int				scsi_status;
+    int				command_status;
+
+    debug_called(2);
+
+    sc = cr->cr_sc;
+    cc = CISS_FIND_COMMAND(cr);
+    ce = (struct ciss_error_info *)&(cc->sg[0]);
+    csio = (struct ccb_scsiio *)cr->cr_private;
+
+    /*
+     * Extract status values from request.
+     */
+    ciss_report_request(cr, &command_status, &scsi_status);
+    csio->scsi_status = scsi_status;
+    
+    /*
+     * Handle specific SCSI status values.
+     */
+    switch(scsi_status) {
+	/* no status due to adapter error */
+    case -1:				
+	debug(0, "adapter error");
+	csio->ccb_h.status = CAM_REQ_CMP_ERR;
+	break;
+	
+	/* no status due to command completed OK */
+    case SCSI_STATUS_OK:		/* CISS_SCSI_STATUS_GOOD */
+	debug(2, "SCSI_STATUS_OK");
+	csio->ccb_h.status = CAM_REQ_CMP;
+	break;
+
+	/* check condition, sense data included */
+    case SCSI_STATUS_CHECK_COND:	/* CISS_SCSI_STATUS_CHECK_CONDITION */
+	debug(0, "SCSI_STATUS_CHECK_COND  sense size %d  resid %d",
+	      ce->sense_length, ce->residual_count);
+	bzero(&csio->sense_data, SSD_FULL_SIZE);
+	bcopy(&ce->sense_info[0], &csio->sense_data, ce->sense_length);
+	csio->sense_len = ce->sense_length;
+	csio->resid = ce->residual_count;	
+	csio->ccb_h.status = CAM_SCSI_STATUS_ERROR | CAM_AUTOSNS_VALID;
+#ifdef CISS_DEBUG
+	{
+	    struct scsi_sense_data	*sns = (struct scsi_sense_data *)&ce->sense_info[0];
+	    debug(0, "sense key %x", sns->flags & SSD_KEY);
+	}
+#endif	    
+	break;
+
+    case SCSI_STATUS_BUSY:		/* CISS_SCSI_STATUS_BUSY */
+	debug(0, "SCSI_STATUS_BUSY");
+	csio->ccb_h.status = CAM_SCSI_BUSY;
+	break;
+
+    default:
+	debug(0, "unknown status 0x%x", csio->scsi_status);
+	csio->ccb_h.status = CAM_REQ_CMP_ERR;
+	break;
+    }
+
+    /* handle post-command fixup */
+    ciss_cam_complete_fixup(sc, csio);
+
+    xpt_done((union ccb *)csio);
+    ciss_release_request(cr);
+}
+
+/********************************************************************************
+ * Fix up the result of some commands here.
+ */
+static void
+ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio)
+{
+    struct scsi_inquiry_data	*inq;
+    struct ciss_ldrive		*cl;
+    int				target;
+
+    if (((csio->ccb_h.flags & CAM_CDB_POINTER) ? 
+	 *(u_int8_t *)csio->cdb_io.cdb_ptr : csio->cdb_io.cdb_bytes[0]) == INQUIRY) {
+
+	inq = (struct scsi_inquiry_data *)csio->data_ptr;
+	target = csio->ccb_h.target_id;
+	cl = &sc->ciss_logical[target];
+	
+	padstr(inq->vendor, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8);
+	padstr(inq->product, ciss_name_ldrive_status(cl->cl_lstatus->status), 16);
+	padstr(inq->revision, "", 4);
+    }
+}
+
+
+/********************************************************************************
+ * Find a peripheral attahed at (target)
+ */
+static struct cam_periph *
+ciss_find_periph(struct ciss_softc *sc, int target)
+{
+    struct cam_periph	*periph;
+    struct cam_path	*path;
+    int			status;
+
+    status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim), target, 0);
+    if (status == CAM_REQ_CMP) {
+	periph = cam_periph_find(path, NULL);
+	xpt_free_path(path);
+    } else {
+	periph = NULL;
+    }
+    return(periph);
+}
+
+/********************************************************************************
+ * Name the device at (target)
+ *
+ * XXX is this strictly correct?
+ */
+int
+ciss_name_device(struct ciss_softc *sc, int target)
+{
+    struct cam_periph	*periph;
+
+    if ((periph = ciss_find_periph(sc, target)) != NULL) {
+	sprintf(sc->ciss_logical[target].cl_name, "%s%d", periph->periph_name, periph->unit_number);
+	return(0);
+    }
+    sc->ciss_logical[target].cl_name[0] = 0;
+    return(ENOENT);
+}
+
+/************************************************************************
+ * Periodic status monitoring.
+ */
+static void
+ciss_periodic(void *arg)
+{
+    struct ciss_softc	*sc;
+
+    debug_called(1);
+    
+    sc = (struct ciss_softc *)arg;
+
+    /*
+     * Check the adapter heartbeat.
+     */
+    if (sc->ciss_cfg->heartbeat == sc->ciss_heartbeat) {
+	sc->ciss_heart_attack++;
+	debug(0, "adapter heart attack in progress 0x%x/%d", 
+	      sc->ciss_heartbeat, sc->ciss_heart_attack);
+	if (sc->ciss_heart_attack == 3) {
+	    ciss_printf(sc, "ADAPTER HEARTBEAT FAILED\n");
+	    /* XXX should reset adapter here */
+	}
+    } else {
+	sc->ciss_heartbeat = sc->ciss_cfg->heartbeat;
+	sc->ciss_heart_attack = 0;
+	debug(3, "new heartbeat 0x%x", sc->ciss_heartbeat);
+    }
+    
+    /*
+     * If the notify event request has died for some reason, or has
+     * not started yet, restart it.
+     */
+    if (!(sc->ciss_flags & CISS_FLAG_NOTIFY_OK)) {
+	debug(0, "(re)starting Event Notify chain");
+	ciss_notify_event(sc);
+    }
+
+    /*
+     * Reschedule.
+     */
+    if (!(sc->ciss_flags & CISS_FLAG_ABORTING))
+	sc->ciss_periodic = timeout(ciss_periodic, sc, CISS_HEARTBEAT_RATE * hz);
+}
+
+/************************************************************************
+ * Request a notification response from the adapter.
+ *
+ * If (cr) is NULL, this is the first request of the adapter, so
+ * reset the adapter's message pointer and start with the oldest
+ * message available.
+ */
+static void
+ciss_notify_event(struct ciss_softc *sc)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_notify_cdb	*cnc;
+    int				error;
+
+    debug_called(1);
+
+    cr = sc->ciss_periodic_notify;
+    
+    /* get a request if we don't already have one */
+    if (cr == NULL) {
+	if ((error = ciss_get_request(sc, &cr)) != 0) {
+	    debug(0, "can't get notify event request");
+	    goto out;
+	}
+	sc->ciss_periodic_notify = cr;
+	cr->cr_complete = ciss_notify_complete;
+	debug(1, "acquired request %d", cr->cr_tag);
+    }
+    
+    /* 
+     * Get a databuffer if we don't already have one, note that the
+     * adapter command wants a larger buffer than the actual
+     * structure.
+     */
+    if (cr->cr_data == NULL) {
+	if ((cr->cr_data = malloc(CISS_NOTIFY_DATA_SIZE, CISS_MALLOC_CLASS, M_NOWAIT)) == NULL) {
+	    debug(0, "can't get notify event request buffer");
+	    error = ENOMEM;
+	    goto out;
+	}
+	cr->cr_length = CISS_NOTIFY_DATA_SIZE;
+    }
+
+    /* re-setup the request's command (since we never release it) XXX overkill*/
+    ciss_preen_command(cr);
+
+    /* (re)build the notify event command */
+    cc = CISS_FIND_COMMAND(cr);
+    cc->header.address.physical.mode = CISS_HDR_ADDRESS_MODE_PERIPHERAL;
+    cc->header.address.physical.bus = 0;
+    cc->header.address.physical.target = 0;
+
+    cc->cdb.cdb_length = sizeof(*cnc);
+    cc->cdb.type = CISS_CDB_TYPE_COMMAND;
+    cc->cdb.attribute = CISS_CDB_ATTRIBUTE_SIMPLE;
+    cc->cdb.direction = CISS_CDB_DIRECTION_READ;
+    cc->cdb.timeout = 0;	/* no timeout, we hope */
+    
+    cnc = (struct ciss_notify_cdb *)&(cc->cdb.cdb[0]);
+    bzero(cr->cr_data, CISS_NOTIFY_DATA_SIZE);
+    cnc->opcode = CISS_OPCODE_READ;
+    cnc->command = CISS_COMMAND_NOTIFY_ON_EVENT;
+    cnc->timeout = 0;		/* no timeout, we hope */
+    cnc->synchronous = 0;
+    cnc->ordered = 0;
+    cnc->seek_to_oldest = 0;
+    cnc->new_only = 0;
+    cnc->length = htonl(CISS_NOTIFY_DATA_SIZE);
+
+    /* submit the request */
+    error = ciss_start(cr);
+
+ out:
+    if (error) {
+	if (cr != NULL) {
+	    if (cr->cr_data != NULL)
+		free(cr->cr_data, CISS_MALLOC_CLASS);
+	    ciss_release_request(cr);
+	}
+	sc->ciss_periodic_notify = NULL;
+	debug(0, "can't submit notify event request");
+	sc->ciss_flags &= ~CISS_FLAG_NOTIFY_OK;
+    } else {
+	debug(1, "notify event submitted");
+	sc->ciss_flags |= CISS_FLAG_NOTIFY_OK;
+    }
+}
+
+static void
+ciss_notify_complete(struct ciss_request *cr)
+{
+    struct ciss_command	*cc;
+    struct ciss_notify	*cn;
+    struct ciss_softc	*sc;
+    int			scsi_status;
+    int			command_status;
+
+    debug_called(1);
+    
+    cc = CISS_FIND_COMMAND(cr);
+    cn = (struct ciss_notify *)cr->cr_data;
+    sc = cr->cr_sc;
+    
+    /*
+     * Report request results, decode status.
+     */
+    ciss_report_request(cr, &command_status, &scsi_status);
+
+    /*
+     * Abort the chain on a fatal error.
+     *
+     * XXX which of these are actually errors?
+     */
+    if ((command_status != CISS_CMD_STATUS_SUCCESS) &&
+	(command_status != CISS_CMD_STATUS_TARGET_STATUS) &&
+	(command_status != CISS_CMD_STATUS_TIMEOUT)) {	/* XXX timeout? */
+	ciss_printf(sc, "fatal error in Notify Event request (%s)\n",
+		    ciss_name_command_status(command_status));
+	ciss_release_request(cr);
+	sc->ciss_flags &= ~CISS_FLAG_NOTIFY_OK;
+	return;
+    }
+
+    /* 
+     * If the adapter gave us a text message, print it.
+     */
+    if (cn->message[0] != 0)
+	ciss_printf(sc, "*** %.80s\n", cn->message);
+
+    debug(0, "notify event class %d subclass %d detail %d",
+		cn->class, cn->subclass, cn->detail);
+
+    /*
+     * If there's room, save the event for a user-level tool.
+     */
+    if (((sc->ciss_notify_head + 1) % CISS_MAX_EVENTS) != sc->ciss_notify_tail) {
+	sc->ciss_notify[sc->ciss_notify_head] = *cn;
+	sc->ciss_notify_head = (sc->ciss_notify_head + 1) % CISS_MAX_EVENTS;
+    }
+
+    /*
+     * Some events are directly of interest to us.
+     */
+    switch (cn->class) {
+    case CISS_NOTIFY_LOGICAL:
+	ciss_notify_logical(sc, cn);
+	break;
+    case CISS_NOTIFY_PHYSICAL:
+	ciss_notify_physical(sc, cn);
+	break;
+    }
+
+    /*
+     * If the response indicates that the notifier has been aborted,
+     * release the notifier command.
+     */
+    if ((cn->class == CISS_NOTIFY_NOTIFIER) &&
+	(cn->subclass == CISS_NOTIFY_NOTIFIER_STATUS) &&
+	(cn->detail == 1)) {
+	debug(0, "notifier exiting");
+	sc->ciss_flags &= ~CISS_FLAG_NOTIFY_OK;
+	ciss_release_request(cr);
+	sc->ciss_periodic_notify = NULL;
+	wakeup(&sc->ciss_periodic_notify);
+    }
+	
+    /*
+     * Send a new notify event command, if we're not aborting.
+     */
+    if (!(sc->ciss_flags & CISS_FLAG_ABORTING)) {
+	ciss_notify_event(sc);
+    }
+}
+
+/************************************************************************
+ * Abort the Notify Event chain.
+ *
+ * Note that we can't just abort the command in progress; we have to
+ * explicitly issue an Abort Notify Event command in order for the
+ * adapter to clean up correctly.
+ *
+ * If we are called with CISS_FLAG_ABORTING set in the adapter softc,
+ * the chain will not restart itself.
+ */
+static int
+ciss_notify_abort(struct ciss_softc *sc)
+{
+    struct ciss_request		*cr;
+    struct ciss_command		*cc;
+    struct ciss_notify_cdb	*cnc;
+    int				error, s, command_status, scsi_status;
+
+    debug_called(1);
+
+    cr = NULL;
+    error = 0;
+    
+    /* verify that there's an outstanding command */
+    if (!(sc->ciss_flags & CISS_FLAG_NOTIFY_OK))
+	goto out;
+    
+    /* get a command to issue the abort with */
+    if ((error = ciss_get_request(sc, &cr)))
+	goto out;
+
+    /* get a buffer for the result */
+    if ((cr->cr_data = malloc(CISS_NOTIFY_DATA_SIZE, CISS_MALLOC_CLASS, M_NOWAIT)) == NULL) {
+	debug(0, "can't get notify event request buffer");
+	error = ENOMEM;
+	goto out;
+    }
+    cr->cr_length = CISS_NOTIFY_DATA_SIZE;
+    
+    /* build the CDB */
+    cc = CISS_FIND_COMMAND(cr);
+    cc->header.address.physical.mode = CISS_HDR_ADDRESS_MODE_PERIPHERAL;
+    cc->header.address.physical.bus = 0;
+    cc->header.address.physical.target = 0;
+    cc->cdb.cdb_length = sizeof(*cnc);
+    cc->cdb.type = CISS_CDB_TYPE_COMMAND;
+    cc->cdb.attribute = CISS_CDB_ATTRIBUTE_SIMPLE;
+    cc->cdb.direction = CISS_CDB_DIRECTION_READ;
+    cc->cdb.timeout = 0;	/* no timeout, we hope */
+    
+    cnc = (struct ciss_notify_cdb *)&(cc->cdb.cdb[0]);
+    bzero(cnc, sizeof(*cnc));
+    cnc->opcode = CISS_OPCODE_WRITE;
+    cnc->command = CISS_COMMAND_ABORT_NOTIFY;
+    cnc->length = htonl(CISS_NOTIFY_DATA_SIZE);
+
+    ciss_print_request(cr);
+    
+    /*
+     * Submit the request and wait for it to complete.
+     */
+    if ((error = ciss_synch_request(cr, 60 * 1000)) != 0) {
+	ciss_printf(sc, "Abort Notify Event command failed (%d)\n", error);
+	goto out;
+    }
+
+    /*
+     * Check response.
+     */
+    ciss_report_request(cr, &command_status, &scsi_status);
+    switch(command_status) {
+    case CISS_CMD_STATUS_SUCCESS:
+	break;
+    case CISS_CMD_STATUS_INVALID_COMMAND:
+	/*
+	 * Some older adapters don't support the CISS version of this
+	 * command.  Fall back to using the BMIC version.
+	 */
+	error = ciss_notify_abort_bmic(sc);
+	if (error != 0)
+	    goto out;
+	break;
+	
+    case CISS_CMD_STATUS_TARGET_STATUS:
+	/*
+	 * This can happen if the adapter thinks there wasn't an outstanding
+	 * Notify Event command but we did.  We clean up here.
+	 */
+	if (scsi_status == CISS_SCSI_STATUS_CHECK_CONDITION) {
+	    if (sc->ciss_periodic_notify != NULL)
+		ciss_release_request(sc->ciss_periodic_notify);
+	    error = 0;
+	    goto out;
+	}
+	/* FALLTHROUGH */
+	    
+    default:
+	ciss_printf(sc, "Abort Notify Event command failed (%s)\n",
+		    ciss_name_command_status(command_status));
+	error = EIO;
+	goto out;
+    }
+    
+    /*
+     * Sleep waiting for the notifier command to complete.  Note
+     * that if it doesn't, we may end up in a bad situation, since
+     * the adapter may deliver it later.  Also note that the adapter
+     * requires the Notify Event command to be cancelled in order to
+     * maintain internal bookkeeping.
+     */
+    s = splcam();
+    while (sc->ciss_periodic_notify != NULL) {
+	error = tsleep(&sc->ciss_periodic_notify, 0, "cissNEA", hz * 5);
+	if (error == EWOULDBLOCK) {
+	    ciss_printf(sc, "Notify Event command failed to abort, adapter may wedge.\n");
+	    break;
+	}
+    }
+    splx(s);
+
+ out:
+    /* release the cancel request */
+    if (cr != NULL) {
+	if (cr->cr_data != NULL)
+	    free(cr->cr_data, CISS_MALLOC_CLASS);
+	ciss_release_request(cr);
+    }
+    if (error == 0)
+	sc->ciss_flags &= ~CISS_FLAG_NOTIFY_OK;
+    return(error);
+}
+
+/************************************************************************
+ * Abort the Notify Event chain using a BMIC command.
+ */
+static int
+ciss_notify_abort_bmic(struct ciss_softc *sc)
+{
+    struct ciss_request			*cr;
+    int					error, command_status;
+
+    debug_called(1);
+
+    cr = NULL;
+    error = 0;
+
+    /* verify that there's an outstanding command */
+    if (!(sc->ciss_flags & CISS_FLAG_NOTIFY_OK))
+	goto out;
+    
+    /*
+     * Build a BMIC command to cancel the Notify on Event command.
+     *
+     * Note that we are sending a CISS opcode here.  Odd.
+     */
+    if ((error = ciss_get_bmic_request(sc, &cr, CISS_COMMAND_ABORT_NOTIFY,
+				       NULL, 0)) != 0)
+	goto out;
+
+    /*
+     * Submit the request and wait for it to complete.
+     */
+    if ((error = ciss_synch_request(cr, 60 * 1000)) != 0) {
+	ciss_printf(sc, "error sending BMIC Cancel Notify on Event command (%d)\n", error);
+	goto out;
+    }
+    
+    /*
+     * Check response.
+     */
+    ciss_report_request(cr, &command_status, NULL);
+    switch(command_status) {
+    case CISS_CMD_STATUS_SUCCESS:
+	break;
+    default:
+	ciss_printf(sc, "error cancelling Notify on Event (%s)\n",  
+		    ciss_name_command_status(command_status));
+	error = EIO;
+	goto out;
+    }
+
+out:
+    if (cr != NULL)
+	ciss_release_request(cr);
+    return(error);
+}
+
+/************************************************************************
+ * Handle a notify event relating to the status of a logical drive.
+ *
+ * XXX need to be able to defer some of these to properly handle
+ *     calling the "ID Physical drive" command, unless the 'extended'
+ *     drive IDs are always in BIG_MAP format.
+ */
+static void
+ciss_notify_logical(struct ciss_softc *sc, struct ciss_notify *cn)
+{
+    struct ciss_ldrive	*ld;
+    int			ostatus;
+
+    debug_called(2);
+
+    ld = &sc->ciss_logical[cn->data.logical_status.logical_drive];
+
+    switch (cn->subclass) {
+    case CISS_NOTIFY_LOGICAL_STATUS:
+	switch (cn->detail) {
+	case 0:
+	    ciss_name_device(sc, cn->data.logical_status.logical_drive);
+	    ciss_printf(sc, "logical drive %d (%s) changed status %s->%s, spare status 0x%b\n",
+			cn->data.logical_status.logical_drive, ld->cl_name,
+			ciss_name_ldrive_status(cn->data.logical_status.previous_state),
+			ciss_name_ldrive_status(cn->data.logical_status.new_state),
+			cn->data.logical_status.spare_state,
+			"\20\1configured\2rebuilding\3failed\4in use\5available\n");
+
+	    /*
+	     * Update our idea of the drive's status.
+	     */
+	    ostatus = ciss_decode_ldrive_status(cn->data.logical_status.previous_state);
+	    ld->cl_status = ciss_decode_ldrive_status(cn->data.logical_status.new_state);
+	    if (ld->cl_status != NULL)
+		ld->cl_lstatus->status = cn->data.logical_status.new_state;
+
+	    break;
+
+	case 1:	/* logical drive has recognised new media, needs Accept Media Exchange */
+	    ciss_name_device(sc, cn->data.logical_status.logical_drive);
+	    ciss_printf(sc, "logical drive %d (%s) media exchanged, ready to go online\n",
+			cn->data.logical_status.logical_drive, ld->cl_name);
+	    ciss_accept_media(sc, cn->data.logical_status.logical_drive, 1);
+	    break;
+
+	case 2:
+	case 3:
+	    ciss_printf(sc, "rebuild of logical drive %d (%s) failed due to %s error\n",
+			cn->data.rebuild_aborted.logical_drive,
+			sc->ciss_logical[cn->data.rebuild_aborted.logical_drive].cl_name,
+			(cn->detail == 2) ? "read" : "write");
+	    break;
+	}
+	break;
+
+    case CISS_NOTIFY_LOGICAL_ERROR:
+	if (cn->detail == 0) {
+	    ciss_printf(sc, "FATAL I/O ERROR on logical drive %d (%s), SCSI port %d ID %d\n",
+			cn->data.io_error.logical_drive,
+			sc->ciss_logical[cn->data.io_error.logical_drive].cl_name,
+			cn->data.io_error.failure_bus,
+			cn->data.io_error.failure_drive);
+	    /* XXX should we take the drive down at this point, or will we be told? */
+	}
+	break;
+
+    case CISS_NOTIFY_LOGICAL_SURFACE:
+	if (cn->detail == 0)
+	    ciss_printf(sc, "logical drive %d (%s) completed consistency initialisation\n",
+			cn->data.consistency_completed.logical_drive,
+			sc->ciss_logical[cn->data.consistency_completed.logical_drive].cl_name);
+	break;
+    }
+}
+
+/************************************************************************
+ * Handle a notify event relating to the status of a physical drive.
+ */
+static void
+ciss_notify_physical(struct ciss_softc *sc, struct ciss_notify *cn)
+{
+    
+}
+
+/************************************************************************
+ * Print a request.
+ */
+static void
+ciss_print_request(struct ciss_request *cr)
+{
+    struct ciss_softc	*sc;
+    struct ciss_command	*cc;
+    int			i;
+
+    sc = cr->cr_sc;
+    cc = CISS_FIND_COMMAND(cr);
+    
+    ciss_printf(sc, "REQUEST @ %p\n", cr);
+    ciss_printf(sc, "  data %p/%d  tag %d  flags %b\n",
+	      cr->cr_data, cr->cr_length, cr->cr_tag, cr->cr_flags,
+	      "\20\1mapped\2sleep\3poll\4dataout\5datain\n");
+    ciss_printf(sc, "  sg list/total %d/%d  host tag 0x%x\n",
+		cc->header.sg_in_list, cc->header.sg_total, cc->header.host_tag);
+    switch(cc->header.address.mode.mode) {
+    case CISS_HDR_ADDRESS_MODE_PERIPHERAL:
+    case CISS_HDR_ADDRESS_MODE_MASK_PERIPHERAL:
+	ciss_printf(sc, "  physical bus %d target %d\n",
+		    cc->header.address.physical.bus, cc->header.address.physical.target);
+	break;
+    case CISS_HDR_ADDRESS_MODE_LOGICAL:
+	ciss_printf(sc, "  logical unit %d\n", cc->header.address.logical.lun);
+	break;
+    }
+    ciss_printf(sc, "  %s cdb length %d type %s attribute %s\n", 
+		(cc->cdb.direction == CISS_CDB_DIRECTION_NONE) ? "no-I/O" :
+		(cc->cdb.direction == CISS_CDB_DIRECTION_READ) ? "READ" :
+		(cc->cdb.direction == CISS_CDB_DIRECTION_WRITE) ? "WRITE" : "??",
+		cc->cdb.cdb_length,
+		(cc->cdb.type == CISS_CDB_TYPE_COMMAND) ? "command" :
+		(cc->cdb.type == CISS_CDB_TYPE_MESSAGE) ? "message" : "??",
+		(cc->cdb.attribute == CISS_CDB_ATTRIBUTE_UNTAGGED) ? "untagged" :
+		(cc->cdb.attribute == CISS_CDB_ATTRIBUTE_SIMPLE) ? "simple" :
+		(cc->cdb.attribute == CISS_CDB_ATTRIBUTE_HEAD_OF_QUEUE) ? "head-of-queue" :
+		(cc->cdb.attribute == CISS_CDB_ATTRIBUTE_ORDERED) ? "ordered" :
+		(cc->cdb.attribute == CISS_CDB_ATTRIBUTE_AUTO_CONTINGENT) ? "auto-contingent" : "??");
+    ciss_printf(sc, "  %*D\n", cc->cdb.cdb_length, &cc->cdb.cdb[0], " ");
+
+    if (cc->header.host_tag & CISS_HDR_HOST_TAG_ERROR) {
+	/* XXX print error info */
+    } else {
+	/* since we don't use chained s/g, don't support it here */
+	for (i = 0; i < cc->header.sg_in_list; i++) {
+	    if ((i % 4) == 0)
+		ciss_printf(sc, "   ");
+	    printf("0x%08x/%d ", (u_int32_t)cc->sg[i].address, cc->sg[i].length);
+	    if ((((i + 1) % 4) == 0) || (i == (cc->header.sg_in_list - 1)))
+		printf("\n");
+	}
+    }
+}
+
+/************************************************************************
+ * Print information about the status of a logical drive.
+ */
+static void
+ciss_print_ldrive(struct ciss_softc *sc, struct ciss_ldrive *ld)
+{
+    int		bus, target, i;
+
+    /* print drive status */
+    switch(ld->cl_lstatus->status) {
+    case CISS_LSTATUS_OK:
+	printf("online\n");
+	break;
+    case CISS_LSTATUS_INTERIM_RECOVERY:
+	printf("in interim recovery mode\n");
+	break;
+    case CISS_LSTATUS_READY_RECOVERY:
+	printf("ready to begin recovery\n");
+	break;
+    case CISS_LSTATUS_RECOVERING:
+	bus = CISS_BIG_MAP_BUS(sc, ld->cl_lstatus->drive_rebuilding);
+	target = CISS_BIG_MAP_BUS(sc, ld->cl_lstatus->drive_rebuilding);
+	printf("being recovered, working on physical drive %d.%d, %u blocks remaining\n",
+	       bus, target, ld->cl_lstatus->blocks_to_recover);
+	break;
+    case CISS_LSTATUS_EXPANDING:
+	printf("being expanded, %u blocks remaining\n",
+	       ld->cl_lstatus->blocks_to_recover);
+	break;
+    case CISS_LSTATUS_QUEUED_FOR_EXPANSION:
+	printf("queued for expansion\n");
+	break;
+    case CISS_LSTATUS_FAILED:
+	printf("queued for expansion\n");
+	break;
+    case CISS_LSTATUS_WRONG_PDRIVE:
+	printf("wrong physical drive inserted\n");
+	break;
+    case CISS_LSTATUS_MISSING_PDRIVE:
+	printf("missing a needed physical drive\n");
+	break;
+    case CISS_LSTATUS_BECOMING_READY:
+	printf("becoming ready\n");
+	break;
+    }
+
+    /* print failed drives */
+    for (i = 0; i < CISS_BIG_MAP_ENTRIES / 8; i++) {
+	bus = CISS_BIG_MAP_BUS(sc, ld->cl_lstatus->drive_failure_map[i]);
+	target = CISS_BIG_MAP_TARGET(sc, ld->cl_lstatus->drive_failure_map[i]);
+	if (bus == -1)
+	    continue;
+	ciss_printf(sc, "physical drive %d:%d (%x) failed\n", bus, target, 
+		    ld->cl_lstatus->drive_failure_map[i]);
+    }
+}
+
+/************************************************************************
+ * Return a name for a logical drive status value.
+ */
+static const char *
+ciss_name_ldrive_status(int status)
+{
+    switch (status) {
+    case CISS_LSTATUS_OK:
+	return("OK");
+    case CISS_LSTATUS_FAILED:
+	return("failed");
+    case CISS_LSTATUS_NOT_CONFIGURED:
+	return("not configured");
+    case CISS_LSTATUS_INTERIM_RECOVERY:
+	return("interim recovery");
+    case CISS_LSTATUS_READY_RECOVERY:
+	return("ready for recovery");
+    case CISS_LSTATUS_RECOVERING:
+	return("recovering");
+    case CISS_LSTATUS_WRONG_PDRIVE:
+	return("wrong physical drive inserted");
+    case CISS_LSTATUS_MISSING_PDRIVE:
+	return("missing physical drive");
+    case CISS_LSTATUS_EXPANDING:
+	return("expanding");
+    case CISS_LSTATUS_BECOMING_READY:
+	return("becoming ready");
+    case CISS_LSTATUS_QUEUED_FOR_EXPANSION:
+	return("queued for expansion");
+    }
+    return("unknown status");
+}
+
+/************************************************************************
+ * Return an online/offline/nonexistent value for a logical drive
+ * status value.
+ */
+static int
+ciss_decode_ldrive_status(int status)
+{
+    switch(status) {
+    case CISS_LSTATUS_NOT_CONFIGURED:
+	return(CISS_LD_NONEXISTENT);
+
+    case CISS_LSTATUS_OK:
+    case CISS_LSTATUS_INTERIM_RECOVERY:
+    case CISS_LSTATUS_READY_RECOVERY:
+    case CISS_LSTATUS_RECOVERING:
+    case CISS_LSTATUS_EXPANDING:
+    case CISS_LSTATUS_QUEUED_FOR_EXPANSION:
+	return(CISS_LD_ONLINE);
+
+    case CISS_LSTATUS_FAILED:
+    case CISS_LSTATUS_WRONG_PDRIVE:
+    case CISS_LSTATUS_MISSING_PDRIVE:
+    case CISS_LSTATUS_BECOMING_READY:
+    default:
+	return(CISS_LD_OFFLINE);
+    }
+}
+
+
+/************************************************************************
+ * Return a name for a logical drive's organisation.
+ */
+static const char *
+ciss_name_ldrive_org(int org)
+{
+    switch(org) {
+    case CISS_LDRIVE_RAID0:
+	return("RAID 0");
+    case CISS_LDRIVE_RAID1:
+	return("RAID 1");
+    case CISS_LDRIVE_RAID4:
+	return("RAID 4");
+    case CISS_LDRIVE_RAID5:
+	return("RAID 5");
+    }
+    return("unkown");
+}
+
+/************************************************************************
+ * Return a name for a command status value.
+ */
+static const char *
+ciss_name_command_status(int status)
+{
+    switch(status) {
+    case CISS_CMD_STATUS_SUCCESS:
+	return("success");
+    case CISS_CMD_STATUS_TARGET_STATUS:
+	return("target status");
+    case CISS_CMD_STATUS_DATA_UNDERRUN:
+	return("data underrun");
+    case CISS_CMD_STATUS_DATA_OVERRUN:
+	return("data overrun");
+    case CISS_CMD_STATUS_INVALID_COMMAND:
+	return("invalid command");
+    case CISS_CMD_STATUS_PROTOCOL_ERROR:
+	return("protocol error");
+    case CISS_CMD_STATUS_HARDWARE_ERROR:
+	return("hardware error");
+    case CISS_CMD_STATUS_CONNECTION_LOST:
+	return("connection lost");
+    case CISS_CMD_STATUS_ABORTED:
+	return("aborted");
+    case CISS_CMD_STATUS_ABORT_FAILED:
+	return("abort failed");
+    case CISS_CMD_STATUS_UNSOLICITED_ABORT:
+	return("unsolicited abort");
+    case CISS_CMD_STATUS_TIMEOUT:
+	return("timeout");
+    case CISS_CMD_STATUS_UNABORTABLE:
+	return("unabortable");
+    }
+    return("unknown status");
+}
+
+/************************************************************************
+ * Handle an open on the control device.
+ */
+static int
+ciss_open(dev_t dev, int flags, int fmt, struct proc *p)
+{
+    struct ciss_softc	*sc;
+
+    debug_called(1);
+    
+    sc = (struct ciss_softc *)dev->si_drv1;
+
+    /* we might want to veto if someone already has us open */
+	
+    sc->ciss_flags |= CISS_FLAG_CONTROL_OPEN;
+    return(0);
+}
+
+/************************************************************************
+ * Handle the last close on the control device.
+ */
+static int
+ciss_close(dev_t dev, int flags, int fmt, struct proc *p)
+{
+    struct ciss_softc	*sc;
+
+    debug_called(1);
+    
+    sc = (struct ciss_softc *)dev->si_drv1;
+    
+    sc->ciss_flags &= ~CISS_FLAG_CONTROL_OPEN;
+    return (0);
+}
+
+/********************************************************************************
+ * Handle adapter-specific control operations.
+ *
+ * Note that the API here is compatible with the Linux driver, in order to
+ * simplify the porting of Compaq's userland tools.
+ */
+static int
+ciss_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
+{
+    struct ciss_softc		*sc;
+    int				error;
+
+    debug_called(1);
+
+    sc = (struct ciss_softc *)dev->si_drv1;
+    error = 0;
+
+    switch(cmd) {
+    case CCISS_GETPCIINFO:
+    {
+	cciss_pci_info_struct	*pis = (cciss_pci_info_struct *)addr;
+
+	pis->bus = pci_get_bus(sc->ciss_dev);
+	pis->dev_fn = pci_get_slot(sc->ciss_dev);
+	pis->board_id = pci_get_devid(sc->ciss_dev);
+
+	break;
+    }
+    
+    case CCISS_GETINTINFO:
+    {
+	cciss_coalint_struct	*cis = (cciss_coalint_struct *)addr;
+
+	cis->delay = sc->ciss_cfg->interrupt_coalesce_delay;
+	cis->count = sc->ciss_cfg->interrupt_coalesce_count;
+
+	break;
+    }
+
+    case CCISS_SETINTINFO:
+    {
+	cciss_coalint_struct	*cis = (cciss_coalint_struct *)addr;
+
+	if ((cis->delay == 0) && (cis->count == 0)) {
+	    error = EINVAL;
+	    break;
+	}
+
+	/*
+	 * XXX apparently this is only safe if the controller is idle,
+	 *     we should suspend it before doing this.
+	 */
+	sc->ciss_cfg->interrupt_coalesce_delay = cis->delay;
+	sc->ciss_cfg->interrupt_coalesce_count = cis->count;
+
+	if (ciss_update_config(sc))
+	    error = EIO;
+
+	/* XXX resume the controller here */
+	break;
+    }
+
+    case CCISS_GETNODENAME:
+	bcopy(sc->ciss_cfg->server_name, (NodeName_type *)addr,
+	      sizeof(NodeName_type));
+	break;
+
+    case CCISS_SETNODENAME:
+	bcopy((NodeName_type *)addr, sc->ciss_cfg->server_name,
+	      sizeof(NodeName_type));
+	if (ciss_update_config(sc))
+	    error = EIO;
+	break;
+	
+    case CCISS_GETHEARTBEAT:
+	*(Heartbeat_type *)addr = sc->ciss_cfg->heartbeat;
+	break;
+
+    case CCISS_GETBUSTYPES:
+	*(BusTypes_type *)addr = sc->ciss_cfg->bus_types;
+	break;
+
+    case CCISS_GETFIRMVER:
+	bcopy(sc->ciss_id->running_firmware_revision, (FirmwareVer_type *)addr,
+	      sizeof(FirmwareVer_type));
+	break;
+
+    case CCISS_GETDRIVERVER:
+	*(DriverVer_type *)addr = CISS_DRIVER_VERSION;
+	break;
+
+    case CCISS_REVALIDVOLS:
+	/*
+	 * This is a bit ugly; to do it "right" we really need
+	 * to find any disks that have changed, kick CAM off them,
+	 * then rescan only these disks.  It'd be nice if they
+	 * a) told us which disk(s) they were going to play with,
+	 * and b) which ones had arrived. 8(
+	 */
+	break;
+
+    case CCISS_PASSTHRU:
+	error = ciss_user_command(sc, (IOCTL_Command_struct *)addr);
+	break;
+
+    default:
+	debug(0, "unknown ioctl 0x%lx", cmd);
+
+	debug(1, "CCISS_GETPCIINFO:   0x%lx", CCISS_GETPCIINFO);
+	debug(1, "CCISS_GETINTINFO:   0x%lx", CCISS_GETINTINFO);
+	debug(1, "CCISS_SETINTINFO:   0x%lx", CCISS_SETINTINFO);
+	debug(1, "CCISS_GETNODENAME:  0x%lx", CCISS_GETNODENAME);
+	debug(1, "CCISS_SETNODENAME:  0x%lx", CCISS_SETNODENAME);
+	debug(1, "CCISS_GETHEARTBEAT: 0x%lx", CCISS_GETHEARTBEAT);
+	debug(1, "CCISS_GETBUSTYPES:  0x%lx", CCISS_GETBUSTYPES);
+	debug(1, "CCISS_GETFIRMVER:   0x%lx", CCISS_GETFIRMVER);
+	debug(1, "CCISS_GETDRIVERVER: 0x%lx", CCISS_GETDRIVERVER);
+	debug(1, "CCISS_REVALIDVOLS:  0x%lx", CCISS_REVALIDVOLS);
+	debug(1, "CCISS_PASSTHRU:     0x%lx", CCISS_PASSTHRU);
+
+	error = ENOIOCTL;
+	break;
+    }
+
+    return(error);
+}
diff --git a/sys/dev/ciss/cissio.h b/sys/dev/ciss/cissio.h
new file mode 100644
index 0000000..b4cce85
--- /dev/null
+++ b/sys/dev/ciss/cissio.h
@@ -0,0 +1,203 @@
+/*-
+ * Copyright (c) 2001 Michael Smith
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD$
+ */
+
+/*
+ * Driver ioctl interface.
+ *
+ * Note that this interface is API-compatible with the Linux implementation
+ * except as noted, and thus this header bears a striking resemblance to 
+ * the Linux driver's cciss_ioctl.h.
+ *
+ */
+
+#include <sys/ioccom.h>
+
+#pragma pack(1)
+
+typedef struct
+{
+    u_int8_t	bus;
+    u_int8_t	dev_fn;
+    u_int32_t	board_id;
+} cciss_pci_info_struct; 
+
+typedef struct
+{
+    u_int32_t	delay;
+    u_int32_t	count;
+} cciss_coalint_struct;
+
+typedef char		NodeName_type[16];
+typedef u_int32_t	Heartbeat_type;
+
+#define CISS_PARSCSIU2	0x0001
+#define CISS_PARCSCIU3	0x0002
+#define CISS_FIBRE1G	0x0100
+#define CISS_FIBRE2G	0x0200
+typedef u_int32_t	BusTypes_type;
+
+typedef char		FirmwareVer_type[4];
+typedef u_int32_t	DriverVer_type;
+
+/* passthrough command definitions */
+#define SENSEINFOBYTES          32
+#define CISS_MAX_LUN		16	
+#define LEVEL2LUN		1
+#define LEVEL3LUN		0
+
+/* command status value */
+#define CMD_SUCCESS		0x0000
+#define CMD_TARGET_STATUS	0x0001
+#define CMD_DATA_UNDERRUN	0x0002
+#define CMD_DATA_OVERRUN	0x0003
+#define CMD_INVALID		0x0004
+#define CMD_PROTOCOL_ERR	0x0005
+#define CMD_HARDWARE_ERR	0x0006
+#define CMD_CONNECTION_LOST	0x0007
+#define CMD_ABORTED		0x0008
+#define CMD_ABORT_FAILED	0x0009
+#define CMD_UNSOLICITED_ABORT	0x000A
+#define CMD_TIMEOUT		0x000B
+#define CMD_UNABORTABLE		0x000C
+
+/* transfer direction */
+#define XFER_NONE		0x00
+#define XFER_WRITE		0x01
+#define XFER_READ		0x02
+#define XFER_RSVD		0x03
+
+/* task attribute */
+#define ATTR_UNTAGGED		0x00
+#define ATTR_SIMPLE		0x04
+#define ATTR_HEADOFQUEUE	0x05
+#define ATTR_ORDERED		0x06
+#define ATTR_ACA		0x07
+
+/* CDB type */
+#define TYPE_CMD		0x00
+#define TYPE_MSG		0x01
+
+/* command list structure */
+typedef union {
+    struct {
+	u_int8_t	Dev;
+	u_int8_t	Bus:6;
+	u_int8_t	Mode:2;
+    } PeripDev __attribute__ ((__packed__));
+    struct {
+	u_int8_t	DevLSB;
+	u_int8_t	DevMSB:6;
+	u_int8_t	Mode:2;
+    } LogDev __attribute__ ((__packed__));
+    struct {
+	u_int8_t	Dev:5;
+	u_int8_t	Bus:3;
+	u_int8_t	Targ:6;
+	u_int8_t	Mode:2;
+    } LogUnit __attribute__ ((__packed__));
+} SCSI3Addr_struct;
+
+typedef struct {
+    u_int32_t		TargetId:24;
+    u_int32_t		Bus:6;
+    u_int32_t		Mode:2;
+    SCSI3Addr_struct	Target[2];
+} PhysDevAddr_struct __attribute__ ((__packed__));
+  
+typedef struct {
+    u_int32_t		VolId:30;
+    u_int32_t		Mode:2;
+    u_int8_t		reserved[4];
+} LogDevAddr_struct __attribute__ ((__packed__));
+
+typedef union {
+    u_int8_t		LunAddrBytes[8];
+    SCSI3Addr_struct	SCSI3Lun[4];
+    PhysDevAddr_struct	PhysDev;
+    LogDevAddr_struct	LogDev;
+} LUNAddr_struct __attribute__ ((__packed__));
+
+typedef struct {
+    u_int8_t	CDBLen;
+    struct {
+	u_int8_t	Type:3;
+	u_int8_t	Attribute:3;
+	u_int8_t	Direction:2;
+    } Type __attribute__ ((__packed__));
+    u_int16_t	Timeout;
+    u_int8_t	CDB[16];
+} RequestBlock_struct __attribute__ ((__packed__));
+
+typedef union {
+    struct {
+	u_int8_t	Reserved[3];
+	u_int8_t	Type;
+	u_int32_t	ErrorInfo;
+    } Common_Info __attribute__ ((__packed__));
+    struct {
+	u_int8_t	Reserved[2];
+	u_int8_t	offense_size;
+	u_int8_t	offense_num;
+	u_int32_t	offense_value;
+    } Invalid_Cmd __attribute__ ((__packed__));
+} MoreErrInfo_struct __attribute__ ((__packed__));
+
+typedef struct {
+    u_int8_t		ScsiStatus;
+    u_int8_t		SenseLen;
+    u_int16_t		CommandStatus;
+    u_int32_t		ResidualCnt;
+    MoreErrInfo_struct	MoreErrInfo;
+    u_int8_t		SenseInfo[SENSEINFOBYTES];
+} ErrorInfo_struct __attribute__ ((__packed__));
+
+typedef struct {
+    LUNAddr_struct	LUN_info;	/* 8 */
+    RequestBlock_struct	Request;	/* 20 */
+    ErrorInfo_struct	error_info;	/* 48 */
+    u_int16_t		buf_size;	/* 2 */
+    u_int8_t		*buf;		/* 4 */
+} IOCTL_Command_struct __attribute__ ((__packed__));
+
+/*
+ * Note that we'd normally pass the struct in directly, but
+ * this code is trying to be compatible with other drivers.
+ */
+#define CCISS_GETPCIINFO	_IOR ('C', 200, cciss_pci_info_struct)
+#define CCISS_GETINTINFO	_IOR ('C', 201, cciss_coalint_struct)
+#define CCISS_SETINTINFO	_IOW ('C', 202, cciss_coalint_struct)
+#define CCISS_GETNODENAME	_IOR ('C', 203, NodeName_type)
+#define CCISS_SETNODENAME	_IOW ('C', 204, NodeName_type)
+#define CCISS_GETHEARTBEAT	_IOR ('C', 205, Heartbeat_type)
+#define CCISS_GETBUSTYPES	_IOR ('C', 206, BusTypes_type)
+#define CCISS_GETFIRMVER	_IOR ('C', 207, FirmwareVer_type)
+#define CCISS_GETDRIVERVER	_IOR ('C', 208, DriverVer_type)
+#define CCISS_REVALIDVOLS	_IO  ('C', 209)
+#define CCISS_PASSTHRU		_IOWR ('C', 210, IOCTL_Command_struct)
+
+#pragma pack()
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
new file mode 100644
index 0000000..d9a4419
--- /dev/null
+++ b/sys/dev/ciss/cissreg.h
@@ -0,0 +1,670 @@
+/*-
+ * Copyright (c) 2001 Michael Smith
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD$
+ */
+
+/*
+ * Structure and I/O definitions for the Command Interface for SCSI-3 Support.
+ *
+ * Data in command CDBs are in big-endian format.  All other data is little-endian.
+ * This header only supports little-endian hosts at this time.
+ */
+
+union ciss_device_address 
+{
+    struct 				/* MODE_PERIPHERAL and MODE_MASK_PERIPHERAL */
+    {
+	u_int32_t	target:24;	/* SCSI target */
+	u_int32_t	bus:6;		/* SCSI bus */
+	u_int32_t	mode:2;		/* CISS_HDR_ADDRESS_MODE_* */
+	u_int32_t	extra_address;	/* SCSI-3 level-2 and level-3 address bytes */
+    } physical;
+    struct 				/* MODE_LOGICAL */
+    {
+	u_int32_t	lun:30;		/* logical device ID */
+	u_int32_t	mode:2;		/* CISS_HDR_ADDRESS_MODE_LOGICAL */
+	u_int32_t	:32;		/* reserved */
+    } logical;
+    struct
+    {
+	u_int32_t	:30;
+	u_int32_t	mode:2;
+	u_int32_t	:32;
+    } mode;
+};
+#define CISS_HDR_ADDRESS_MODE_PERIPHERAL	0x0
+#define CISS_HDR_ADDRESS_MODE_LOGICAL		0x1
+#define CISS_HDR_ADDRESS_MODE_MASK_PERIPHERAL	0x3
+    
+struct ciss_header 
+{
+    u_int8_t	:8;			/* reserved */
+    u_int8_t	sg_in_list;		/* SG's in the command structure */
+    u_int16_t	sg_total;		/* total count of SGs for this command */
+    u_int32_t	host_tag;		/* host identifier, bits 0&1 must be clear */
+#define CISS_HDR_HOST_TAG_ERROR	(1<<1)
+    u_int32_t	host_tag_zeroes;	/* tag is 64 bits, but interface only supports 32 */
+    union ciss_device_address address;
+} __attribute__ ((packed));
+
+struct ciss_cdb
+{
+    u_int8_t	cdb_length;		/* valid CDB bytes */
+    u_int8_t	type:3;
+#define CISS_CDB_TYPE_COMMAND			0
+#define CISS_CDB_TYPE_MESSAGE			1
+    u_int8_t	attribute:3;
+#define CISS_CDB_ATTRIBUTE_UNTAGGED		0
+#define CISS_CDB_ATTRIBUTE_SIMPLE		4
+#define CISS_CDB_ATTRIBUTE_HEAD_OF_QUEUE	5
+#define CISS_CDB_ATTRIBUTE_ORDERED		6
+#define CISS_CDB_ATTRIBUTE_AUTO_CONTINGENT	7
+    u_int8_t	direction:2;
+#define CISS_CDB_DIRECTION_NONE			0
+#define CISS_CDB_DIRECTION_READ			1
+#define CISS_CDB_DIRECTION_WRITE		2
+    u_int16_t	timeout;		/* seconds */
+#define CISS_CDB_BUFFER_SIZE	16
+    u_int8_t	cdb[CISS_CDB_BUFFER_SIZE];
+} __attribute__ ((packed));
+
+struct ciss_error_info_pointer
+{
+    u_int64_t	error_info_address;	/* points to ciss_error_info structure */
+    u_int32_t	error_info_length;
+} __attribute__ ((packed));
+
+struct ciss_error_info
+{
+    u_int8_t	scsi_status;
+#define CISS_SCSI_STATUS_GOOD			0x00	/* these are scsi-standard values */
+#define CISS_SCSI_STATUS_CHECK_CONDITION	0x02
+#define CISS_SCSI_STATUS_CONDITION_MET		0x04
+#define CISS_SCSI_STATUS_BUSY			0x08
+#define CISS_SCSI_STATUS_INDETERMINATE		0x10
+#define CISS_SCSI_STATUS_INDETERMINATE_CM	0x14
+#define CISS_SCSI_STATUS_RESERVATION_CONFLICT	0x18
+#define CISS_SCSI_STATUS_COMMAND_TERMINATED	0x22
+#define CISS_SCSI_STATUS_QUEUE_FULL		0x28
+#define CISS_SCSI_STATUS_ACA_ACTIVE		0x30
+    u_int8_t	sense_length;
+    u_int16_t	command_status;
+#define CISS_CMD_STATUS_SUCCESS			0
+#define CISS_CMD_STATUS_TARGET_STATUS		1
+#define CISS_CMD_STATUS_DATA_UNDERRUN		2
+#define CISS_CMD_STATUS_DATA_OVERRUN		3
+#define CISS_CMD_STATUS_INVALID_COMMAND		4
+#define CISS_CMD_STATUS_PROTOCOL_ERROR		5
+#define CISS_CMD_STATUS_HARDWARE_ERROR		6
+#define CISS_CMD_STATUS_CONNECTION_LOST		7
+#define CISS_CMD_STATUS_ABORTED			8
+#define CISS_CMD_STATUS_ABORT_FAILED		9
+#define CISS_CMD_STATUS_UNSOLICITED_ABORT	10
+#define CISS_CMD_STATUS_TIMEOUT			11
+#define CISS_CMD_STATUS_UNABORTABLE		12
+    u_int32_t	residual_count;
+    union {
+	struct {
+	    u_int8_t	res1[3];
+	    u_int8_t	type;
+	    u_int32_t	error_info;
+	} common_info __attribute__ ((packed));
+	struct {
+	    u_int8_t	res1[2];
+	    u_int8_t	offense_size;
+	    u_int8_t	offense_offset;
+	    u_int32_t	offense_value;
+	} invalid_command __attribute__ ((packed));
+    } additional_error_info;
+    u_int8_t	sense_info[0];
+} __attribute__ ((packed));
+
+struct ciss_sg_entry
+{
+    u_int64_t	address;
+#define CISS_SG_ADDRESS_BITBUCKET	(~(u_int64_t)0)
+    u_int32_t	length;
+    u_int32_t	:31;
+    u_int32_t	extension:1;		/* address points to another s/g chain */
+} __attribute__ ((packed));
+
+struct ciss_command
+{
+    struct ciss_header			header;
+    struct ciss_cdb			cdb;
+    struct ciss_error_info_pointer	error_info;
+    struct ciss_sg_entry		sg[0];
+} __attribute__ ((packed));
+
+#define CISS_OPCODE_REPORT_LOGICAL_LUNS		0xc2
+#define CISS_OPCODE_REPORT_PHYSICAL_LUNS	0xc3
+
+struct ciss_lun_report 
+{
+    u_int32_t	list_size;		/* big-endian */
+    u_int32_t	:32;
+    union ciss_device_address lun[0];
+} __attribute__ ((packed));
+
+struct ciss_report_cdb 
+{
+    u_int8_t	opcode;
+    u_int8_t	reserved[5];
+    u_int32_t	length;			/* big-endian */
+    u_int8_t	:8;
+    u_int8_t	control;
+} __attribute__ ((packed));
+
+/*
+ * Note that it's not clear whether we have to set the detail field to
+ * the tag of the command to be aborted, or the tag field in the command itself;
+ * documentation conflicts on this.
+ */
+#define CISS_OPCODE_MESSAGE_ABORT		0x00
+#define CISS_MESSAGE_ABORT_TASK			0x00
+#define CISS_MESSAGE_ABORT_TASK_SET		0x01	
+#define CISS_MESSAGE_ABORT_CLEAR_ACA		0x02
+#define CISS_MESSAGE_ABORT_CLEAR_TASK_SET	0x03
+
+#define CISS_OPCODE_MESSAGE_RESET		0x01
+#define CISS_MESSAGE_RESET_CONTROLLER		0x00
+#define CISS_MESSAGE_RESET_BUS			0x01
+#define CISS_MESSAGE_RESET_TARGET		0x03
+#define CISS_MESSAGE_RESET_LOGICAL_UNIT		0x04
+
+#define CISS_OPCODE_MESSAGE_SCAN		0x02
+#define CISS_MESSAGE_SCAN_CONTROLLER		0x00
+#define CISS_MESSAGE_SCAN_BUS			0x01
+#define CISS_MESSAGE_SCAN_TARGET		0x03
+#define CISS_MESSAGE_SCAN_LOGICAL_UNIT		0x04
+
+#define CISS_OPCODE_MESSAGE_NOP			0x03
+
+struct ciss_message_cdb 
+{
+    u_int8_t	opcode;
+    u_int8_t	type;
+    u_int16_t	:16;
+    u_int32_t	abort_tag;					/* XXX endianness? */
+    u_int8_t	reserved[8];
+} __attribute__ ((packed));
+
+/*
+ * CISS vendor-specific commands/messages.
+ *
+ * Note that while messages and vendor-specific commands are
+ * differentiated, they are handled in basically the same way and can
+ * be considered to be basically the same thing, as long as the cdb
+ * type field is set correctly.
+ */
+#define CISS_OPCODE_READ		0xc0
+#define CISS_OPCODE_WRITE		0xc1
+#define CISS_COMMAND_NOTIFY_ON_EVENT	0xd0
+#define CISS_COMMAND_ABORT_NOTIFY	0xd1
+
+struct ciss_notify_cdb 
+{
+    u_int8_t	opcode;
+    u_int8_t	command;
+    u_int8_t	res1[2];
+    u_int16_t	timeout;		/* seconds, little-endian */
+    u_int8_t	res2;			/* reserved */
+    u_int8_t	synchronous:1;		/* return immediately */
+    u_int8_t	ordered:1;		/* return events in recorded order */
+    u_int8_t	seek_to_oldest:1;	/* reset read counter to oldest event */
+    u_int8_t	new_only:1;		/* ignore any queued events */
+    u_int8_t	:4;
+    u_int32_t	length;			/* must be 512, little-endian */
+#define CISS_NOTIFY_DATA_SIZE	512
+    u_int8_t	control;
+} __attribute__ ((packed));
+
+#define CISS_NOTIFY_NOTIFIER		0
+#define CISS_NOTIFY_NOTIFIER_STATUS		0
+#define CISS_NOTIFY_NOTIFIER_PROTOCOL		1
+
+#define CISS_NOTIFY_HOTPLUG		1
+#define CISS_NOTIFY_HOTPLUG_PHYSICAL		0
+#define CISS_NOTIFY_HOTPLUG_POWERSUPPLY		1
+#define CISS_NOTIFY_HOTPLUG_FAN			2
+#define CISS_NOTIFY_HOTPLUG_POWER		3
+#define CISS_NOTIFY_HOTPLUG_REDUNDANT		4
+
+#define CISS_NOTIFY_HARDWARE		2
+#define CISS_NOTIFY_HARDWARE_CABLES		0
+#define CISS_NOTIFY_HARDWARE_MEMORY		1
+#define CISS_NOTIFY_HARDWARE_FAN		2
+#define CISS_NOTIFY_HARDWARE_VRM		3
+
+#define CISS_NOTIFY_ENVIRONMENT		3
+#define CISS_NOTIFY_ENVIRONMENT_TEMPERATURE	0
+#define CISS_NOTIFY_ENVIRONMENT_POWERSUPPLY	1
+#define CISS_NOTIFY_ENVIRONMENT_CHASSIS		2
+#define CISS_NOTIFY_ENVIRONMENT_POWER		3
+
+#define CISS_NOTIFY_PHYSICAL		4
+#define CISS_NOTIFY_PHYSICAL_STATE		0
+
+#define CISS_NOTIFY_LOGICAL		5
+#define CISS_NOTIFY_LOGICAL_STATUS		0
+#define CISS_NOTIFY_LOGICAL_ERROR		1
+#define CISS_NOTIFY_LOGICAL_SURFACE		2
+
+#define CISS_NOTIFY_REDUNDANT		6
+#define CISS_NOTIFY_REDUNDANT_STATUS		0
+
+#define CISS_NOTIFY_CISS		8
+#define CISS_NOTIFY_CISS_REDUNDANT_CHANGE	0
+#define CISS_NOTIFY_CISS_PATH_STATUS		1
+#define CISS_NOTIFY_CISS_HARDWARE_ERROR		2
+#define CISS_NOTIFY_CISS_LOGICAL		3
+
+struct ciss_notify_drive
+{
+    u_int16_t	physical_drive_number;
+    u_int8_t	configured_drive_flag;
+    u_int8_t	spare_drive_flag;
+    u_int8_t	big_physical_drive_number;
+    u_int8_t	enclosure_bay_number;
+} __attribute__ ((packed));
+
+struct ciss_notify_locator
+{
+    u_int16_t	port;
+    u_int16_t	id;
+    u_int16_t	box;
+} __attribute__ ((packed));
+
+struct ciss_notify_redundant_controller
+{
+    u_int16_t	slot;
+} __attribute__ ((packed));
+
+struct ciss_notify_logical_status
+{
+    u_int16_t	logical_drive;
+    u_int8_t	previous_state;
+    u_int8_t	new_state;
+    u_int8_t	spare_state;
+} __attribute__ ((packed));
+ 
+struct ciss_notify_rebuild_aborted
+{
+    u_int16_t	logical_drive;
+    u_int8_t	replacement_drive;
+    u_int8_t	error_drive;
+    u_int8_t	big_replacement_drive;
+    u_int8_t	big_error_drive;
+} __attribute__ ((packed));
+
+struct ciss_notify_io_error 
+{
+    u_int16_t	logical_drive;
+    u_int32_t	lba;
+    u_int16_t	block_count;
+    u_int8_t	command;
+    u_int8_t	failure_bus;
+    u_int8_t	failure_drive;
+    u_int64_t	big_lba;
+} __attribute__ ((packed));
+
+struct ciss_notify_consistency_completed
+{
+    u_int16_t	logical_drive;
+} __attribute__ ((packed));
+
+struct ciss_notify 
+{
+    u_int32_t	timestamp;		/* seconds since controller power-on */
+    u_int16_t	class;
+    u_int16_t	subclass;
+    u_int16_t	detail;
+    union 
+    {
+	struct ciss_notify_drive		drive;
+	struct ciss_notify_locator		location;
+	struct ciss_notify_redundant_controller	redundant_controller;
+	struct ciss_notify_logical_status	logical_status;
+	struct ciss_notify_rebuild_aborted	rebuild_aborted;
+	struct ciss_notify_io_error		io_error;
+	struct ciss_notify_consistency_completed consistency_completed;
+	u_int8_t	data[64];
+    } data;
+    char	message[80];
+    u_int32_t	tag;
+    u_int16_t	date;
+    u_int16_t	year;
+    u_int32_t	time;
+    u_int16_t	pre_power_up_time;
+    union ciss_device_address	device;
+    /* XXX pads to 512 bytes */
+} __attribute__ ((packed));
+
+/*
+ * CISS config table, which describes the controller's 
+ * supported interface(s) and capabilities.
+ *
+ * This is mapped directly via PCI.
+ */
+struct ciss_config_table 
+{
+    char	signature[4];		/* "CISS" */
+    u_int32_t	valence;
+#define CISS_MIN_VALENCE	1	/* only value currently supported */
+#define CISS_MAX_VALENCE	1
+    u_int32_t	supported_methods;
+#define CISS_TRANSPORT_METHOD_READY	(1<<0)
+#define CISS_TRANSPORT_METHOD_SIMPLE	(1<<1)    
+    u_int32_t	active_method;
+    u_int32_t	requested_method;
+    u_int32_t	command_physlimit;
+    u_int32_t	interrupt_coalesce_delay;
+    u_int32_t	interrupt_coalesce_count;
+    u_int32_t	max_outstanding_commands;
+    u_int32_t	bus_types;
+#define CISS_TRANSPORT_BUS_TYPE_ULTRA2	(1<<0)
+#define CISS_TRANSPORT_BUS_TYPE_ULTRA3	(1<<1)
+#define CISS_TRANSPORT_BUS_TYPE_FIBRE1	(1<<8)
+#define CISS_TRANSPORT_BUS_TYPE_FIBRE2	(1<<9)
+    u_int32_t	host_driver;
+#define CISS_DRIVER_SUPPORT_UNIT_ATTENTION	(1<<0)
+#define CISS_DRIVER_QUICK_INIT			(1<<1)
+#define CISS_DRIVER_INTERRUPT_ON_LOCKUP		(1<<2)
+#define CISS_DRIVER_SUPPORT_MIXED_Q_TAGS	(1<<3)
+#define CISS_DRIVER_HOST_IS_ALPHA		(1<<4)
+    char	server_name[16];
+    u_int32_t	heartbeat;
+} __attribute__ ((packed));
+
+/*
+ * In a flagrant violation of what CISS seems to be meant to be about,
+ * Compaq recycle a goodly portion of their previous generation's
+ * command set (and all the legacy baggage related to a design
+ * originally aimed at narrow SCSI) through the Array Controller Read
+ * and Array Controller Write interface.
+ *
+ * Command ID values here can be looked up for in the
+ * publically-available documentation for the older controllers; note
+ * that the command layout is necessarily different to fit within the
+ * CDB.
+ */
+#define CISS_ARRAY_CONTROLLER_READ	0x26
+#define CISS_ARRAY_CONTROLLER_WRITE	0x27
+
+#define CISS_BMIC_ID_LDRIVE		0x10
+#define CISS_BMIC_ID_CTLR		0x11
+#define CISS_BMIC_ID_LSTATUS		0x12
+#define CISS_BMIC_ID_PDRIVE		0x15
+#define CISS_BMIC_BLINK_PDRIVE		0x16
+#define CISS_BMIC_SENSE_BLINK_PDRIVE	0x17
+#define CISS_BMIC_FLUSH_CACHE		0xc2
+#define CISS_BMIC_ACCEPT_MEDIA		0xe0
+
+/*
+ * When numbering drives, the original design assumed that
+ * drives 0-7 are on the first SCSI bus, 8-15 on the second,
+ * and so forth.  In order to handle modern SCSI configurations,
+ * the MSB is set in the drive ID field, in which case the
+ * modulus changes from 8 to the number of supported drives
+ * per SCSI bus (as obtained from the ID_CTLR command).
+ * This feature is referred to as BIG_MAP support, and we assume
+ * that all CISS controllers support it.
+ */
+
+#define CISS_BIG_MAP_ID(sc, bus, target)		\
+	(0x80 | 					\
+	 ((sc)->ciss_id->drives_per_scsi_bus * (bus)) |	\
+	 (target))
+
+#define CISS_BIG_MAP_BUS(sc, id)			\
+	(((id) & 0x80) ? (((id) & ~0x80) / (sc)->ciss_id->drives_per_scsi_bus) : -1)
+
+#define CISS_BIG_MAP_TARGET(sc, id)			\
+	(((id) & 0x80) ? (((id) & ~0x80) % (sc)->ciss_id->drives_per_scsi_bus) : -1)
+
+#define CISS_BIG_MAP_ENTRIES	128	/* number of entries in a BIG_MAP */
+
+/*
+ * BMIC CDB
+ *
+ * Note that the phys_drive/res1 field is nominally the 32-bit
+ * "block number" field, but the only BMIC command(s) of interest
+ * implemented overload the MSB (note big-endian format here) 
+ * to be the physical drive ID, so we define accordingly.
+ */
+struct ciss_bmic_cdb {
+    u_int8_t	opcode;
+    u_int8_t	log_drive;
+    u_int8_t	phys_drive;
+    u_int8_t	res1[3];
+    u_int8_t	bmic_opcode;
+    u_int16_t	size;			/* big-endian */
+    u_int8_t	res2;
+} __attribute__ ((packed));
+
+/*
+ * BMIC command command/return structures.
+ */
+
+/* CISS_BMIC_ID_LDRIVE */
+struct ciss_bmic_id_ldrive {
+    u_int16_t	block_size;
+    u_int32_t	blocks_available;
+    u_int8_t	drive_parameter_table[16];	/* XXX define */
+    u_int8_t	fault_tolerance;
+#define CISS_LDRIVE_RAID0	0
+#define CISS_LDRIVE_RAID4	1
+#define CISS_LDRIVE_RAID1	2
+#define CISS_LDRIVE_RAID5	3
+    u_int8_t	res1[2];
+#if 0	/* only for identify logical drive extended (0x18) */
+    u_int32_t	logical_drive_identifier;
+    char	logical_drive_label[64];
+#endif
+} __attribute__ ((packed));
+
+/* CISS_BMIC_ID_LSTATUS */
+struct ciss_bmic_id_lstatus {
+    u_int8_t	status;
+#define CISS_LSTATUS_OK				0
+#define CISS_LSTATUS_FAILED			1
+#define CISS_LSTATUS_NOT_CONFIGURED		2
+#define CISS_LSTATUS_INTERIM_RECOVERY		3
+#define CISS_LSTATUS_READY_RECOVERY		4
+#define CISS_LSTATUS_RECOVERING			5
+#define CISS_LSTATUS_WRONG_PDRIVE		6
+#define CISS_LSTATUS_MISSING_PDRIVE		7
+#define CISS_LSTATUS_EXPANDING			10
+#define CISS_LSTATUS_BECOMING_READY		11
+#define CISS_LSTATUS_QUEUED_FOR_EXPANSION	12
+    u_int32_t	deprecated_drive_failure_map;
+    u_int8_t	res1[416];
+    u_int32_t	blocks_to_recover;
+    u_int8_t	deprecated_drive_rebuilding;
+    u_int16_t	deprecated_remap_count[32];
+    u_int32_t	deprecated_replacement_map;
+    u_int32_t	deprecated_active_spare_map;
+    u_int8_t	spare_configured:1;
+    u_int8_t	spare_rebuilding:1;
+    u_int8_t	spare_rebuilt:1;
+    u_int8_t	spare_failed:1;
+    u_int8_t	spare_switched:1;
+    u_int8_t	spare_available:1;
+    u_int8_t	res2:2;
+    u_int8_t	deprecated_spare_to_replace_map[32];
+    u_int32_t	deprecated_replaced_marked_ok_map;
+    u_int8_t	media_exchanged;
+    u_int8_t	cache_failure;
+    u_int8_t	expand_failure;
+    u_int8_t	rebuild_read_failure:1;
+    u_int8_t	rebuild_write_failure:1;
+    u_int8_t	res3:6;
+    u_int8_t	drive_failure_map[CISS_BIG_MAP_ENTRIES / 8];
+    u_int16_t	remap_count[CISS_BIG_MAP_ENTRIES];
+    u_int8_t	replacement_map[CISS_BIG_MAP_ENTRIES / 8];
+    u_int8_t	active_spare_map[CISS_BIG_MAP_ENTRIES / 8];
+    u_int8_t	spare_to_replace_map[CISS_BIG_MAP_ENTRIES];
+    u_int8_t	replaced_marked_ok_map[CISS_BIG_MAP_ENTRIES / 8];
+    u_int8_t	drive_rebuilding;
+} __attribute__ ((packed));
+
+/* CISS_BMIC_ID_CTLR */
+struct ciss_bmic_id_table {
+    u_int8_t	configured_logical_drives;
+    u_int32_t	config_signature;
+    char	running_firmware_revision[4];
+    char	stored_firmware_revision[4];
+    u_int8_t	hardware_revision;
+    u_int8_t	res1[4];
+    u_int32_t	deprecated_drive_present_map;
+    u_int32_t	deprecated_external_drive_present_map;
+    u_int32_t	board_id;
+    u_int8_t	res2;
+    u_int32_t	deprecated_non_disk_map;
+    u_int8_t	res3[5];
+    char	marketting_revision;
+    u_int8_t	res4:3;
+    u_int8_t	more_than_seven_supported:1;
+    u_int8_t	res5:3;
+    u_int8_t	big_map_supported:1;		/* must be set! */
+    u_int8_t	res6[2];
+    u_int8_t	scsi_bus_count;
+    u_int32_t	res7;
+    u_int32_t	controller_clock;
+    u_int8_t	drives_per_scsi_bus;
+    u_int8_t	big_drive_present_map[CISS_BIG_MAP_ENTRIES / 8];
+    u_int8_t	big_external_drive_present_map[CISS_BIG_MAP_ENTRIES / 8];
+    u_int8_t	big_non_disk_map[CISS_BIG_MAP_ENTRIES / 8];
+} __attribute__ ((packed));
+
+/* CISS_BMIC_ID_PDRIVE */
+struct ciss_bmic_id_pdrive {
+    u_int8_t	scsi_bus;
+    u_int8_t	scsi_id;
+    u_int16_t	block_size;
+    u_int32_t	total_blocks;
+    u_int32_t	reserved_blocks;
+    char	model[40];
+    char	serial[40];
+    char	revision[8];
+    u_int8_t	inquiry_bits;
+    u_int8_t	res1[2];
+    u_int8_t	drive_present:1;
+    u_int8_t	non_disk:1;
+    u_int8_t	wide:1;
+    u_int8_t	synchronous:1;
+    u_int8_t	narrow:1;
+    u_int8_t	wide_downgraded_to_narrow:1;
+    u_int8_t	ultra:1;
+    u_int8_t	ultra2:1;
+    u_int8_t	SMART:1;
+    u_int8_t	SMART_errors_recorded:1;
+    u_int8_t	SMART_errors_enabled:1;
+    u_int8_t	SMART_errors_detected:1;
+    u_int8_t	external:1;
+    u_int8_t	configured:1;
+    u_int8_t	configured_spare:1;
+    u_int8_t	cache_saved_enabled:1;
+    u_int8_t	res2;
+    u_int8_t	res3:6;
+    u_int8_t	cache_currently_enabled:1;
+    u_int8_t	cache_safe:1;
+    u_int8_t	res4[5];
+    char	connector[2];
+    u_int8_t	res5;
+    u_int8_t	bay;
+} __attribute__ ((packed));
+
+/* CISS_BMIC_BLINK_PDRIVE */
+/* CISS_BMIC_SENSE_BLINK_PDRIVE */
+struct ciss_bmic_blink_pdrive {
+    u_int32_t	blink_duration;		/* 10ths of a second */
+    u_int32_t	duration_elapsed;	/* only for sense command  */
+    u_int8_t	blinktab[256];
+#define CISS_BMIC_BLINK_ALL	1
+#define CISS_BMIC_BLINK_TIMED	2
+    u_int8_t	res2[248];
+} __attribute__ ((packed));
+
+/* CISS_BMIC_FLUSH_CACHE */
+struct ciss_bmic_flush_cache {
+    u_int16_t	flag;
+#define CISS_BMIC_FLUSH_AND_ENABLE	0
+#define CISS_BMIC_FLUSH_AND_DISABLE	1
+    u_int8_t	res1[510];
+} __attribute__ ((packed));
+
+#ifdef _KERNEL
+/*
+ * CISS "simple" transport layer.
+ *
+ * Note that there are two slightly different versions of this interface
+ * with different interrupt mask bits.  There's nothing like consistency...
+ */
+#define CISS_TL_SIMPLE_BAR_REGS	0x10	/* BAR pointing to register space */
+#define CISS_TL_SIMPLE_BAR_CFG	0x14	/* BAR pointing to space containing config table */
+
+#define CISS_TL_SIMPLE_IDBR	0x20	/* inbound doorbell register */
+#define CISS_TL_SIMPLE_IDBR_CFG_TABLE	(1<<0)	/* notify controller of config table update */
+
+#define CISS_TL_SIMPLE_ISR	0x30	/* interrupt status register */
+#define CISS_TL_SIMPLE_IMR	0x34	/* interrupt mask register */
+#define CISS_TL_SIMPLE_INTR_OPQ_SA5	(1<<3)	/* OPQ not empty interrupt, SA5 boards */
+#define CISS_TL_SIMPLE_INTR_OPQ_SA5B	(1<<2)	/* OPQ not empty interrupt, SA5B boards */
+
+#define CISS_TL_SIMPLE_IPQ	0x40	/* inbound post queue */
+#define CISS_TL_SIMPLE_OPQ	0x44	/* outbound post queue */
+#define CISS_TL_SIMPLE_OPQ_EMPTY	(~(u_int32_t)0)
+
+#define CISS_TL_SIMPLE_CFG_BAR	0xb4	/* should be 0x14 */
+#define CISS_TL_SIMPLE_CFG_OFF	0xb8	/* offset in BAR at which config table is located */
+
+/*
+ * Register access primitives.
+ */
+#define CISS_TL_SIMPLE_READ(sc, ofs) \
+	bus_space_read_4(sc->ciss_regs_btag, sc->ciss_regs_bhandle, ofs)
+#define CISS_TL_SIMPLE_WRITE(sc, ofs, val) \
+	bus_space_write_4(sc->ciss_regs_btag, sc->ciss_regs_bhandle, ofs, val)
+
+#define CISS_TL_SIMPLE_POST_CMD(sc, phys)	CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IPQ, phys)
+#define CISS_TL_SIMPLE_FETCH_CMD(sc)		CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_OPQ)
+
+/*
+ * XXX documentation conflicts with the Linux driver as to whether setting or clearing
+ *     bits masks interrupts
+ */
+#define CISS_TL_SIMPLE_DISABLE_INTERRUPTS(sc) \
+	CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \
+			     CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) | (sc)->ciss_interrupt_mask)
+#define CISS_TL_SIMPLE_ENABLE_INTERRUPTS(sc) \
+	CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \
+			     CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) & ~(sc)->ciss_interrupt_mask)
+
+#define CISS_TL_SIMPLE_OPQ_INTERRUPT(sc) \
+	(CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_ISR) & (sc)->ciss_interrupt_mask)
+
+#endif /* _KERNEL */
diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h
new file mode 100644
index 0000000..937409a
--- /dev/null
+++ b/sys/dev/ciss/cissvar.h
@@ -0,0 +1,375 @@
+/*-
+ * Copyright (c) 2001 Michael Smith
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD$
+ */
+
+/*
+ * CISS adapter driver datastructures
+ */
+
+/************************************************************************
+ * Tunable parameters
+ */
+
+/*
+ * There is no guaranteed upper bound on the number of concurrent
+ * commands an adapter may claim to support.  Cap it at a reasonable
+ * value.
+ */
+#define CISS_MAX_REQUESTS	256
+
+/*
+ * Maximum number of logical drives we support.
+ */
+#define CISS_MAX_LOGICAL	15
+
+/*
+ * Interrupt reduction can be controlled by tuning the interrupt
+ * coalesce delay and count paramters.  The delay (in microseconds)
+ * defers delivery of interrupts to increase the chance of there being
+ * more than one completed command ready when the interrupt is
+ * delivered.  The count expedites the delivery of the interrupt when
+ * the given number of commands are ready.
+ *
+ * If the delay is set to 0, interrupts are delivered immediately.
+ */
+#define CISS_INTERRUPT_COALESCE_DELAY	1000
+#define CISS_INTERRUPT_COALESCE_COUNT	16
+
+/*
+ * Heartbeat routine timeout in seconds.  Note that since event
+ * handling is performed on a callback basis, we don't need this to
+ * run very often.
+ */
+#define CISS_HEARTBEAT_RATE		10
+
+/*
+ * Maximum number of events we will queue for a monitoring utility.
+ */
+#define CISS_MAX_EVENTS		32
+
+/************************************************************************
+ * Command queue statistics
+ */
+
+#define CISSQ_FREE	0
+#define CISSQ_BUSY	1
+#define CISSQ_COMPLETE	2
+#define CISSQ_COUNT	3
+
+struct ciss_qstat 
+{
+    u_int32_t	q_length;
+    u_int32_t	q_max;
+};
+
+/************************************************************************
+ * Driver version.  Only really significant to the ACU interface.
+ */
+#define CISS_DRIVER_VERSION	20011009
+
+/************************************************************************
+ * Driver data structures
+ */
+
+/*
+ * Each command issued to the adapter is managed by a request
+ * structure.
+ */
+struct ciss_request
+{
+    TAILQ_ENTRY(ciss_request)	cr_link;
+    int				cr_onq;		/* which queue we are on */
+
+    struct ciss_softc		*cr_sc;		/* controller softc */
+    void			*cr_data;	/* data buffer */
+    u_int32_t			cr_length;	/* data length */
+    bus_dmamap_t		cr_datamap;	/* DMA map for data */
+    int				cr_tag;
+    int				cr_flags;
+#define CISS_REQ_MAPPED		(1<<0)		/* data mapped */
+#define CISS_REQ_SLEEP		(1<<1)		/* submitter sleeping */
+#define CISS_REQ_POLL		(1<<2)		/* submitter polling */
+#define CISS_REQ_DATAOUT	(1<<3)		/* data host->adapter */
+#define CISS_REQ_DATAIN		(1<<4)		/* data adapter->host */
+    
+    void			(* cr_complete)(struct ciss_request *);
+    void			*cr_private;
+};
+
+/*
+ * The adapter command structure is defined with a zero-length
+ * scatter/gather list size.  In practise, we want space for a
+ * scatter-gather list, and we also want to avoid having commands
+ * cross page boundaries.
+ *
+ * Note that 512 bytes yields 28 scatter/gather entries, or the
+ * ability to map (26 * PAGE_SIZE) + 2 bytes of data.  On x86, this is
+ * 104kB.  256 bytes would only yield 12 entries, giving a mere 40kB,
+ * too small.
+ */
+
+#define CISS_COMMAND_ALLOC_SIZE		512	/* XXX tune to get sensible s/g list length */
+#define CISS_COMMAND_SG_LENGTH	((CISS_COMMAND_ALLOC_SIZE - sizeof(struct ciss_command)) \
+				 / sizeof(struct ciss_sg_entry))
+
+/*
+ * Per-logical-drive data.
+ */
+struct ciss_ldrive 
+{
+    union ciss_device_address	cl_address;
+    
+    int				cl_status;
+#define CISS_LD_NONEXISTENT	0
+#define CISS_LD_ONLINE		1
+#define CISS_LD_OFFLINE		2
+
+    struct ciss_bmic_id_ldrive	*cl_ldrive;
+    struct ciss_bmic_id_lstatus	*cl_lstatus;
+
+    char			cl_name[16];		/* device name */
+};
+
+/*
+ * Per-adapter data
+ */
+struct ciss_softc 
+{
+    /* bus connections */
+    device_t			ciss_dev;		/* bus attachment */
+    dev_t			ciss_dev_t;		/* control device */
+
+    struct resource		*ciss_regs_resource;	/* register interface window */
+    int				ciss_regs_rid;		/* resource ID */
+    bus_space_handle_t		ciss_regs_bhandle;	/* bus space handle */
+    bus_space_tag_t		ciss_regs_btag;		/* bus space tag */
+
+    struct resource		*ciss_cfg_resource;	/* config struct interface window */
+    int				ciss_cfg_rid;		/* resource ID */
+    struct ciss_config_table	*ciss_cfg;		/* config table in adapter memory */
+    struct ciss_bmic_id_table	*ciss_id;		/* ID table in host memory */
+    u_int32_t			ciss_heartbeat;		/* last heartbeat value */
+    int				ciss_heart_attack;	/* number of times we have seen this value */
+
+    struct resource		*ciss_irq_resource;	/* interrupt */
+    int				ciss_irq_rid;		/* resource ID */
+    void			*ciss_intr;		/* interrupt handle */
+
+    bus_dma_tag_t		ciss_parent_dmat;	/* parent DMA tag */
+    bus_dma_tag_t		ciss_buffer_dmat;	/* data buffer/command DMA tag */
+
+    u_int32_t			ciss_interrupt_mask;	/* controller interrupt mask bits */
+
+    int				ciss_max_requests;
+    struct ciss_request		ciss_request[CISS_MAX_REQUESTS];	/* requests */
+    void			*ciss_command;		/* command structures */
+    bus_dma_tag_t		ciss_command_dmat;	/* command DMA tag */
+    bus_dmamap_t		ciss_command_map;	/* command DMA map */
+    u_int32_t			ciss_command_phys;	/* command array base address */
+    TAILQ_HEAD(,ciss_request)	ciss_free;		/* requests available for reuse */
+    TAILQ_HEAD(,ciss_request)	ciss_busy;		/* requests in the adapter */
+    TAILQ_HEAD(,ciss_request)	ciss_complete;		/* requests which have been returned by the adapter */
+
+    struct callout_handle	ciss_periodic;		/* periodic event handling */
+    struct ciss_request		*ciss_periodic_notify;	/* notify callback request */
+
+    struct ciss_notify		ciss_notify[CISS_MAX_EVENTS];
+    int				ciss_notify_head;	/* saved-event ringbuffer */
+    int				ciss_notify_tail;
+
+    struct ciss_ldrive		ciss_logical[CISS_MAX_LOGICAL];
+
+    struct cam_devq		*ciss_cam_devq;
+    struct cam_sim		*ciss_cam_sim;
+    struct cam_path		*ciss_cam_path;
+
+    int				ciss_flags;
+#define CISS_FLAG_NOTIFY_OK	(1<<0)		/* notify command running OK */
+#define CISS_FLAG_CONTROL_OPEN	(1<<1)		/* control device is open */
+#define CISS_FLAG_ABORTING	(1<<2)		/* driver is going away */
+#define CISS_FLAG_RUNNING	(1<<3)		/* driver is running (interrupts usable) */
+
+#define CISS_FLAG_FAKE_SYNCH	(1<<16)		/* needs SYNCHRONISE_CACHE faked */
+#define CISS_FLAG_BMIC_ABORT	(1<<17)		/* use BMIC command to abort Notify on Event */
+
+    struct ciss_qstat		ciss_qstat[CISSQ_COUNT];	/* queue statistics */
+};
+
+/*
+ * Given a request tag, find the corresponding command in virtual or
+ * physical space.
+ *
+ * The arithmetic here is due to the allocation of ciss_command structures
+ * inside CISS_COMMAND_ALLOC_SIZE blocks.  See the comment at the definition
+ * of CISS_COMMAND_ALLOC_SIZE above.
+ */
+#define CISS_FIND_COMMAND(cr)							\
+	(struct ciss_command *)((u_int8_t *)(cr)->cr_sc->ciss_command +		\
+				((cr)->cr_tag * CISS_COMMAND_ALLOC_SIZE))
+#define CISS_FIND_COMMANDPHYS(cr)	((cr)->cr_sc->ciss_command_phys + \
+					 ((cr)->cr_tag * CISS_COMMAND_ALLOC_SIZE))
+
+/************************************************************************
+ * Debugging/diagnostic output.
+ */
+
+/*
+ * Debugging levels:
+ *  0 - quiet, only emit warnings
+ *  1 - talkative, log major events, but nothing on the I/O path
+ *  2 - noisy, log events on the I/O path
+ *  3 - extremely noisy, log items in loops
+ */
+#ifdef CISS_DEBUG
+# define debug(level, fmt, args...)							\
+	do {										\
+	    if (level <= CISS_DEBUG) printf("%s: " fmt "\n", __FUNCTION__ , ##args);	\
+	} while(0)
+# define debug_called(level)						\
+	do {								\
+	    if (level <= CISS_DEBUG) printf(__FUNCTION__ ": called\n");	\
+	} while(0)
+# define debug_struct(s)		printf("  SIZE %s: %d\n", #s, sizeof(struct s))
+# define debug_union(s)			printf("  SIZE %s: %d\n", #s, sizeof(union s))
+# define debug_type(s)			printf("  SIZE %s: %d\n", #s, sizeof(s))
+# define debug_field(s, f)		printf("  OFFSET %s.%s: %d\n", #s, #f, ((int)&(((struct s *)0)->f)))
+# define debug_const(c)			printf("  CONST %s %d/0x%x\n", #c, c, c);
+#else
+# define debug(level, fmt, args...)
+# define debug_called(level)
+# define debug_struct(s)
+# define debug_union(s)
+# define debug_type(s)
+# define debug_field(s, f)
+# define debug_const(c)
+#endif
+
+#define ciss_printf(sc, fmt, args...)	device_printf(sc->ciss_dev, fmt , ##args)
+
+/************************************************************************
+ * Queue primitives
+ */
+
+#define CISSQ_ADD(sc, qname)					\
+	do {							\
+	    struct ciss_qstat *qs = &(sc)->ciss_qstat[qname];	\
+								\
+	    qs->q_length++;					\
+	    if (qs->q_length > qs->q_max)			\
+		qs->q_max = qs->q_length;			\
+	} while(0)
+
+#define CISSQ_REMOVE(sc, qname)    (sc)->ciss_qstat[qname].q_length--
+#define CISSQ_INIT(sc, qname)			\
+	do {					\
+	    sc->ciss_qstat[qname].q_length = 0;	\
+	    sc->ciss_qstat[qname].q_max = 0;	\
+	} while(0)
+
+
+#define CISSQ_REQUEST_QUEUE(name, index)				\
+static __inline void							\
+ciss_initq_ ## name (struct ciss_softc *sc)				\
+{									\
+    TAILQ_INIT(&sc->ciss_ ## name);					\
+    CISSQ_INIT(sc, index);						\
+}									\
+static __inline void							\
+ciss_enqueue_ ## name (struct ciss_request *cr)				\
+{									\
+    int		s;							\
+									\
+    s = splcam();							\
+    TAILQ_INSERT_TAIL(&cr->cr_sc->ciss_ ## name, cr, cr_link);		\
+    CISSQ_ADD(cr->cr_sc, index);					\
+    cr->cr_onq = index;							\
+    splx(s);								\
+}									\
+static __inline void							\
+ciss_requeue_ ## name (struct ciss_request *cr)				\
+{									\
+    int		s;							\
+									\
+    s = splcam();							\
+    TAILQ_INSERT_HEAD(&cr->cr_sc->ciss_ ## name, cr, cr_link);		\
+    CISSQ_ADD(cr->cr_sc, index);					\
+    cr->cr_onq = index;							\
+    splx(s);								\
+}									\
+static __inline struct ciss_request *					\
+ciss_dequeue_ ## name (struct ciss_softc *sc)				\
+{									\
+    struct ciss_request	*cr;						\
+    int			s;						\
+									\
+    s = splcam();							\
+    if ((cr = TAILQ_FIRST(&sc->ciss_ ## name)) != NULL) {		\
+	TAILQ_REMOVE(&sc->ciss_ ## name, cr, cr_link);			\
+	CISSQ_REMOVE(sc, index);					\
+	cr->cr_onq = -1;						\
+    }									\
+    splx(s);								\
+    return(cr);								\
+}									\
+static __inline int							\
+ciss_remove_ ## name (struct ciss_request *cr)				\
+{									\
+    int			s, error;					\
+									\
+    s = splcam();							\
+    if (cr->cr_onq != index) {						\
+	printf("request on queue %d (expected %d)\n", cr->cr_onq, index);\
+	error = 1;							\
+    } else {								\
+	TAILQ_REMOVE(&cr->cr_sc->ciss_ ## name, cr, cr_link);		\
+	CISSQ_REMOVE(cr->cr_sc, index);					\
+	cr->cr_onq = -1;						\
+	error = 0;							\
+    }									\
+    splx(s);								\
+    return(error);							\
+}									\
+struct hack
+
+CISSQ_REQUEST_QUEUE(free, CISSQ_FREE);
+CISSQ_REQUEST_QUEUE(busy, CISSQ_BUSY);
+CISSQ_REQUEST_QUEUE(complete, CISSQ_COMPLETE);
+
+/********************************************************************************
+ * space-fill a character string
+ */
+static __inline void
+padstr(char *targ, const char *src, int len)
+{
+    while (len-- > 0) {
+	if (*src != 0) {
+	    *targ++ = *src++;
+	} else {
+	    *targ++ = ' ';
+	}
+    }
+}
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 3a436c0..1c19957 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1509,6 +1509,13 @@ options 	DPT_RESET_HBA
 options 	DPT_ALLOW_MEMIO
 
 #
+# Compaq "CISS" RAID controllers (SmartRAID 5* series)
+# These controllers have a SCSI-like interface, and require the
+# CAM infrastructure.
+#
+device		ciss
+
+#
 # Mylex AcceleRAID and eXtremeRAID controllers with v6 and later
 # firmware.  These controllers have a SCSI-like interface, and require
 # the CAM infrastructure.
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 184e3c7..fff8d11 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -121,6 +121,7 @@ SUBDIR+=aac \
 	atspeaker \
 	bktr \
 	coff \
+	ciss \
 	el \
 	fe \
 	fpu \
diff --git a/sys/modules/ciss/Makefile b/sys/modules/ciss/Makefile
new file mode 100644
index 0000000..d82c59a
--- /dev/null
+++ b/sys/modules/ciss/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+KMOD		=  ciss
+.PATH:		${.CURDIR}/../../dev/${KMOD}
+SRCS		=  ciss.c
+SRCS		+= opt_scsi.h opt_cam.h
+SRCS		+= device_if.h bus_if.h pci_if.h
+
+CFLAGS		+=-DCISS_DEBUG=0
+
+.include <bsd.kmod.mk>