Module Name:    src
Committed By:   palle
Date:           Fri Aug 19 19:02:07 UTC 2016

Modified Files:
        src/sys/arch/sparc64/conf: GENERIC files.sparc64
        src/sys/arch/sparc64/doc: TODO
        src/sys/arch/sparc64/sparc64: autoconf.c
Added Files:
        src/sys/arch/sparc64/dev: ldc.c ldcvar.h vdsk.c

Log Message:
sun4v: vdsk and ldc drivers - from OpenBSD, but heavily adapted to NetBSD 
scsipi - access to a virtual disk served from a ldom primary domain now works


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/dev/ldc.c \
    src/sys/arch/sparc64/dev/ldcvar.h src/sys/arch/sparc64/dev/vdsk.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc64/doc/TODO
cvs rdiff -u -r1.207 -r1.208 src/sys/arch/sparc64/sparc64/autoconf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.191 src/sys/arch/sparc64/conf/GENERIC:1.192
--- src/sys/arch/sparc64/conf/GENERIC:1.191	Wed Jun 22 20:12:59 2016
+++ src/sys/arch/sparc64/conf/GENERIC	Fri Aug 19 19:02:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.191 2016/06/22 20:12:59 palle Exp $
+# $NetBSD: GENERIC,v 1.192 2016/08/19 19:02:07 palle Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.191 $"
+#ident		"GENERIC-$Revision: 1.192 $"
 
 maxusers	64
 
@@ -277,6 +277,7 @@ timer*	at mainbus0				# sun4c
 
 # Virtual devices for sun4v systems.
 vrtc0	at vbus?
+vdsk*	at cbus?
 
 #### Serial port configuration
 

Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.151 src/sys/arch/sparc64/conf/files.sparc64:1.152
--- src/sys/arch/sparc64/conf/files.sparc64:1.151	Wed Jun 22 20:12:59 2016
+++ src/sys/arch/sparc64/conf/files.sparc64	Fri Aug 19 19:02:07 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sparc64,v 1.151 2016/06/22 20:12:59 palle Exp $
+#	$NetBSD: files.sparc64,v 1.152 2016/08/19 19:02:07 palle Exp $
 
 # @(#)files.sparc64	8.1 (Berkeley) 7/19/93
 # sparc64-specific configuration info
@@ -325,3 +325,11 @@ file  dev/ofw/ofw_subr.c
 device	vrtc
 attach	vrtc at vbus
 file	arch/sparc64/dev/vrtc.c			vrtc
+
+define	ldc
+file	arch/sparc64/dev/ldc.c			ldc
+
+# Virtual disk
+device	vdsk: ldc, scsi
+attach	vdsk at cbus
+file	arch/sparc64/dev/vdsk.c			vdsk

Index: src/sys/arch/sparc64/doc/TODO
diff -u src/sys/arch/sparc64/doc/TODO:1.19 src/sys/arch/sparc64/doc/TODO:1.20
--- src/sys/arch/sparc64/doc/TODO:1.19	Fri Jun 17 21:52:27 2016
+++ src/sys/arch/sparc64/doc/TODO	Fri Aug 19 19:02:07 2016
@@ -1,4 +1,4 @@
- /* $NetBSD: TODO,v 1.19 2016/06/17 21:52:27 palle Exp $ */
+ /* $NetBSD: TODO,v 1.20 2016/08/19 19:02:07 palle Exp $ */
 
 Things to be done:
 
@@ -28,5 +28,6 @@ sun4v:
 - interrups not handled properly (com at ebus only...)
 - mpt(4) complains: mpt0: Phy 0: Link Status Unknown
 - locore.s: TRAP_SETUP() - sun4u specific ASI_DMMU
-- man pages for drivers imported from OpenBSD lke vpci, vbus etc.
+- man pages for drivers imported from OpenBSD lke vpci, vbus, cbus, vdsk, ldc etc.
+- vdsk and ldc drivers: code maked with OPENBSD_BUSDMA - make the bus_dma stuff work properly
 

Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.207 src/sys/arch/sparc64/sparc64/autoconf.c:1.208
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.207	Wed Dec 16 08:01:19 2015
+++ src/sys/arch/sparc64/sparc64/autoconf.c	Fri Aug 19 19:02:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.207 2015/12/16 08:01:19 jdc Exp $ */
+/*	$NetBSD: autoconf.c,v 1.208 2016/08/19 19:02:07 palle Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.207 2015/12/16 08:01:19 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.208 2016/08/19 19:02:07 palle Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -93,6 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
 #include <machine/bootinfo.h>
 #include <sparc64/sparc64/cache.h>
 #include <sparc64/sparc64/timerreg.h>
+#include <sparc64/dev/cbusvar.h>
 
 #include <dev/ata/atavar.h>
 #include <dev/pci/pcivar.h>
@@ -980,6 +981,11 @@ device_register(device_t dev, void *aux)
 		dev_path_drive_match(dev, ofnode, adev->adev_channel*2+
 		    adev->adev_drv_data->drive, 0, 0);
 		return;
+	} else if (device_is_a(dev, "vdsk")) {
+		struct cbus_attach_args *ca = aux;
+		ofnode = ca->ca_node;
+		/* Ensure that the devices ofnode is stored for later use */
+		device_setofnode(dev, ofnode);
 	}
 
 	if (busdev == NULL)
@@ -1317,6 +1323,49 @@ device_register_post_config(device_t dev
 			}
 		}
 	}
+
+	if (CPU_ISSUN4V) {
+
+	  /*
+	   * Special sun4v handling in case the kernel is running in a 
+	   * secondary logical domain
+	   *
+	   * The bootpath looks something like this:
+	   *   /virtual-devices@100/channel-devices@200/disk@1:a
+	   *
+	   * The device hierarchy constructed during autoconfiguration is:
+	   *   mainbus/vbus/vdsk/scsibus/sd
+	   *
+	   * The logic to figure out the boot device is to look at the
+	   * grandparent to the 'sd' device and if this is a 'vdsk' device
+	   * and the ofnode matches the bootpaths ofnode then we have located
+	   * the boot device.
+	   */
+
+	  int ofnode;
+
+	  /* Cache the vdsk ofnode for later use later/below with sd device */  
+	  if (device_is_a(dev, "vdsk")) {
+	    ofnode = device_ofnode(dev);
+	    device_setofnode(dev, ofnode);
+	  }
+
+	  /* Examine if this is a sd device */  
+	  if (device_is_a(dev, "sd")) {
+	    device_t parent = device_parent(dev);
+	    device_t parent_parent = device_parent(parent);
+	    if (device_is_a(parent_parent, "vdsk")) {
+	      ofnode = device_ofnode(parent_parent);
+	      if (ofnode == ofbootpackage) {
+		booted_device = dev;
+		DPRINTF(ACDB_BOOTDEV, ("booted_device: %s\n", 
+				       device_xname(dev)));
+		return;
+	      }
+	    }
+	  }
+	}
+
 }
 
 static void

Added files:

Index: src/sys/arch/sparc64/dev/ldc.c
diff -u /dev/null src/sys/arch/sparc64/dev/ldc.c:1.1
--- /dev/null	Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/ldc.c	Fri Aug 19 19:02:07 2016
@@ -0,0 +1,679 @@
+/*	$NetBSD: ldc.c,v 1.1 2016/08/19 19:02:07 palle Exp $	*/
+/*	$OpenBSD: ldc.c,v 1.12 2015/03/21 18:02:58 kettenis Exp $	*/
+/*
+ * Copyright (c) 2009 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/kmem.h>
+#include <sys/malloc.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+
+#include <sys/bus.h>
+#include <machine/hypervisor.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <sparc64/dev/ldcvar.h>
+
+#ifdef LDC_DEBUG
+#define DPRINTF(x)	printf x
+#else
+#define DPRINTF(x)
+#endif
+
+void	ldc_rx_ctrl_vers(struct ldc_conn *, struct ldc_pkt *);
+void	ldc_rx_ctrl_rtr(struct ldc_conn *, struct ldc_pkt *);
+void	ldc_rx_ctrl_rts(struct ldc_conn *, struct ldc_pkt *);
+void	ldc_rx_ctrl_rdx(struct ldc_conn *, struct ldc_pkt *);
+
+void	ldc_send_ack(struct ldc_conn *);
+void	ldc_send_rtr(struct ldc_conn *);
+void	ldc_send_rts(struct ldc_conn *);
+void	ldc_send_rdx(struct ldc_conn *);
+
+void
+ldc_rx_ctrl(struct ldc_conn *lc, struct ldc_pkt *lp)
+{
+	switch (lp->ctrl) {
+	case LDC_VERS:
+		ldc_rx_ctrl_vers(lc, lp);
+		break;
+
+	case LDC_RTS:
+		ldc_rx_ctrl_rts(lc, lp);
+		break;
+
+	case LDC_RTR:
+		ldc_rx_ctrl_rtr(lc, lp);
+		break;
+
+	case LDC_RDX:
+		ldc_rx_ctrl_rdx(lc, lp);
+		break;
+
+	default:
+		DPRINTF(("CTRL/0x%02x/0x%02x\n", lp->stype, lp->ctrl));
+		ldc_reset(lc);
+		break;
+	}
+}
+
+void
+ldc_rx_ctrl_vers(struct ldc_conn *lc, struct ldc_pkt *lp)
+{
+	switch (lp->stype) {
+	case LDC_INFO:
+		DPRINTF(("CTRL/INFO/VERS\n"));
+		if (lp->major == LDC_VERSION_MAJOR &&
+		    lp->minor == LDC_VERSION_MINOR)
+			ldc_send_ack(lc);
+		else {
+			/* XXX do nothing for now. */
+		}
+		break;
+
+	case LDC_ACK:
+		if (lc->lc_state != LDC_SND_VERS) {
+			DPRINTF(("Spurious CTRL/ACK/VERS: state %d\n",
+			    lc->lc_state));
+			ldc_reset(lc);
+			return;
+		}
+		DPRINTF(("CTRL/ACK/VERS\n"));
+		ldc_send_rts(lc);
+		break;
+
+	case LDC_NACK:
+		DPRINTF(("CTRL/NACK/VERS\n"));
+		ldc_reset(lc);
+		break;
+
+	default:
+		DPRINTF(("CTRL/0x%02x/VERS\n", lp->stype));
+		ldc_reset(lc);
+		break;
+	}
+}
+
+void
+ldc_rx_ctrl_rts(struct ldc_conn *lc, struct ldc_pkt *lp)
+{
+	switch (lp->stype) {
+	case LDC_INFO:
+		if (lc->lc_state != LDC_RCV_VERS) {
+			DPRINTF(("Spurious CTRL/INFO/RTS: state %d\n",
+			    lc->lc_state));
+			ldc_reset(lc);
+			return;
+		}
+		DPRINTF(("CTRL/INFO/RTS\n"));
+		ldc_send_rtr(lc);
+		break;
+
+	case LDC_ACK:
+		DPRINTF(("CTRL/ACK/RTS\n"));
+		ldc_reset(lc);
+		break;
+
+	case LDC_NACK:
+		DPRINTF(("CTRL/NACK/RTS\n"));
+		ldc_reset(lc);
+		break;
+
+	default:
+		DPRINTF(("CTRL/0x%02x/RTS\n", lp->stype));
+		ldc_reset(lc);
+		break;
+	}
+}
+
+void
+ldc_rx_ctrl_rtr(struct ldc_conn *lc, struct ldc_pkt *lp)
+{
+	switch (lp->stype) {
+	case LDC_INFO:
+		if (lc->lc_state != LDC_SND_RTS) {
+			DPRINTF(("Spurious CTRL/INFO/RTR: state %d\n",
+			    lc->lc_state));
+			ldc_reset(lc);
+			return;
+		}
+		DPRINTF(("CTRL/INFO/RTR\n"));
+		ldc_send_rdx(lc);
+		lc->lc_start(lc);
+		break;
+
+	case LDC_ACK:
+		DPRINTF(("CTRL/ACK/RTR\n"));
+		ldc_reset(lc);
+		break;
+
+	case LDC_NACK:
+		DPRINTF(("CTRL/NACK/RTR\n"));
+		ldc_reset(lc);
+		break;
+
+	default:
+		DPRINTF(("CTRL/0x%02x/RTR\n", lp->stype));
+		ldc_reset(lc);
+		break;
+	}
+}
+
+void
+ldc_rx_ctrl_rdx(struct ldc_conn *lc, struct ldc_pkt *lp)
+{
+	switch (lp->stype) {
+	case LDC_INFO:
+		if (lc->lc_state != LDC_SND_RTR) {
+			DPRINTF(("Spurious CTRL/INFO/RTR: state %d\n",
+			    lc->lc_state));
+			ldc_reset(lc);
+			return;
+		}
+		DPRINTF(("CTRL/INFO/RDX\n"));
+		lc->lc_start(lc);
+		break;
+
+	case LDC_ACK:
+		DPRINTF(("CTRL/ACK/RDX\n"));
+		ldc_reset(lc);
+		break;
+
+	case LDC_NACK:
+		DPRINTF(("CTRL/NACK/RDX\n"));
+		ldc_reset(lc);
+		break;
+
+	default:
+		DPRINTF(("CTRL/0x%02x/RDX\n", lp->stype));
+		ldc_reset(lc);
+		break;
+	}
+}
+
+void
+ldc_rx_data(struct ldc_conn *lc, struct ldc_pkt *lp)
+{
+	size_t len;
+
+	if (lp->stype != LDC_INFO) {
+		DPRINTF(("DATA/0x%02x\n", lp->stype));
+		ldc_reset(lc);
+		return;
+	}
+
+	if (lc->lc_state != LDC_SND_RTR &&
+	    lc->lc_state != LDC_SND_RDX) {
+		DPRINTF(("Spurious DATA/INFO: state %d\n", lc->lc_state));
+		ldc_reset(lc);
+		return;
+	}
+
+	if (lp->env & LDC_FRAG_START) {
+		lc->lc_len = (lp->env & LDC_LEN_MASK) + 8;
+		KASSERT(lc->lc_len <= sizeof(lc->lc_msg));
+		memcpy((uint8_t *)lc->lc_msg, lp, lc->lc_len);
+	} else {
+		len = (lp->env & LDC_LEN_MASK);
+		if (lc->lc_len + len > sizeof(lc->lc_msg)) {
+			DPRINTF(("Buffer overrun\n"));
+			ldc_reset(lc);
+			return;
+		}
+		memcpy(((uint8_t *)lc->lc_msg) + lc->lc_len, &lp->major, len);
+		lc->lc_len += len;
+	}
+
+	if (lp->env & LDC_FRAG_STOP)
+		lc->lc_rx_data(lc, (struct ldc_pkt *)lc->lc_msg);
+}
+
+void
+ldc_send_vers(struct ldc_conn *lc)
+{
+	struct ldc_pkt *lp;
+	uint64_t tx_head, tx_tail, tx_state;
+	int err;
+
+	mutex_enter(&lc->lc_txq->lq_mtx);
+	err = hv_ldc_tx_get_state(lc->lc_id, &tx_head, &tx_tail, &tx_state);
+	if (err != H_EOK || tx_state != LDC_CHANNEL_UP) {
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	bzero(lp, sizeof(struct ldc_pkt));
+	lp->type = LDC_CTRL;
+	lp->stype = LDC_INFO;
+	lp->ctrl = LDC_VERS;
+	lp->major = 1;
+	lp->minor = 0;
+
+	tx_tail += sizeof(*lp);
+	tx_tail &= ((lc->lc_txq->lq_nentries * sizeof(*lp)) - 1);
+	err = hv_ldc_tx_set_qtail(lc->lc_id, tx_tail);
+	if (err != H_EOK) {
+		printf("%s: hv_ldc_tx_set_qtail: %d\n", __func__, err);
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lc->lc_state = LDC_SND_VERS;
+	mutex_exit(&lc->lc_txq->lq_mtx);
+}
+
+void
+ldc_send_ack(struct ldc_conn *lc)
+{
+	struct ldc_pkt *lp;
+	uint64_t tx_head, tx_tail, tx_state;
+	int err;
+
+	mutex_enter(&lc->lc_txq->lq_mtx);
+	err = hv_ldc_tx_get_state(lc->lc_id, &tx_head, &tx_tail, &tx_state);
+	if (err != H_EOK || tx_state != LDC_CHANNEL_UP) {
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	bzero(lp, sizeof(struct ldc_pkt));
+	lp->type = LDC_CTRL;
+	lp->stype = LDC_ACK;
+	lp->ctrl = LDC_VERS;
+	lp->major = 1;
+	lp->minor = 0;
+
+	tx_tail += sizeof(*lp);
+	tx_tail &= ((lc->lc_txq->lq_nentries * sizeof(*lp)) - 1);
+	err = hv_ldc_tx_set_qtail(lc->lc_id, tx_tail);
+	if (err != H_EOK) {
+		printf("%s: hv_ldc_tx_set_qtail: %d\n", __func__, err);
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lc->lc_state = LDC_RCV_VERS;
+	mutex_exit(&lc->lc_txq->lq_mtx);
+}
+
+void
+ldc_send_rts(struct ldc_conn *lc)
+{
+	struct ldc_pkt *lp;
+	uint64_t tx_head, tx_tail, tx_state;
+	int err;
+
+	mutex_enter(&lc->lc_txq->lq_mtx);
+	err = hv_ldc_tx_get_state(lc->lc_id, &tx_head, &tx_tail, &tx_state);
+	if (err != H_EOK || tx_state != LDC_CHANNEL_UP) {
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	bzero(lp, sizeof(struct ldc_pkt));
+	lp->type = LDC_CTRL;
+	lp->stype = LDC_INFO;
+	lp->ctrl = LDC_RTS;
+	lp->env = LDC_MODE_UNRELIABLE;
+	lp->seqid = lc->lc_tx_seqid++;
+
+	tx_tail += sizeof(*lp);
+	tx_tail &= ((lc->lc_txq->lq_nentries * sizeof(*lp)) - 1);
+	err = hv_ldc_tx_set_qtail(lc->lc_id, tx_tail);
+	if (err != H_EOK) {
+		printf("%s: hv_ldc_tx_set_qtail: %d\n", __func__, err);
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lc->lc_state = LDC_SND_RTS;
+	mutex_exit(&lc->lc_txq->lq_mtx);
+}
+
+void
+ldc_send_rtr(struct ldc_conn *lc)
+{
+	struct ldc_pkt *lp;
+	uint64_t tx_head, tx_tail, tx_state;
+	int err;
+
+	mutex_enter(&lc->lc_txq->lq_mtx);
+	err = hv_ldc_tx_get_state(lc->lc_id, &tx_head, &tx_tail, &tx_state);
+	if (err != H_EOK || tx_state != LDC_CHANNEL_UP) {
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	bzero(lp, sizeof(struct ldc_pkt));
+	lp->type = LDC_CTRL;
+	lp->stype = LDC_INFO;
+	lp->ctrl = LDC_RTR;
+	lp->env = LDC_MODE_UNRELIABLE;
+	lp->seqid = lc->lc_tx_seqid++;
+
+	tx_tail += sizeof(*lp);
+	tx_tail &= ((lc->lc_txq->lq_nentries * sizeof(*lp)) - 1);
+	err = hv_ldc_tx_set_qtail(lc->lc_id, tx_tail);
+	if (err != H_EOK) {
+		printf("%s: hv_ldc_tx_set_qtail: %d\n", __func__, err);
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lc->lc_state = LDC_SND_RTR;
+	mutex_exit(&lc->lc_txq->lq_mtx);
+}
+
+void
+ldc_send_rdx(struct ldc_conn *lc)
+{
+	struct ldc_pkt *lp;
+	uint64_t tx_head, tx_tail, tx_state;
+	int err;
+
+	mutex_enter(&lc->lc_txq->lq_mtx);
+	err = hv_ldc_tx_get_state(lc->lc_id, &tx_head, &tx_tail, &tx_state);
+	if (err != H_EOK || tx_state != LDC_CHANNEL_UP) {
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	bzero(lp, sizeof(struct ldc_pkt));
+	lp->type = LDC_CTRL;
+	lp->stype = LDC_INFO;
+	lp->ctrl = LDC_RDX;
+	lp->env = LDC_MODE_UNRELIABLE;
+	lp->seqid = lc->lc_tx_seqid++;
+
+	tx_tail += sizeof(*lp);
+	tx_tail &= ((lc->lc_txq->lq_nentries * sizeof(*lp)) - 1);
+	err = hv_ldc_tx_set_qtail(lc->lc_id, tx_tail);
+	if (err != H_EOK) {
+		printf("%s: hv_ldc_tx_set_qtail: %d\n", __func__, err);
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return;
+	}
+
+	lc->lc_state = LDC_SND_RDX;
+	mutex_exit(&lc->lc_txq->lq_mtx);
+}
+
+int
+ldc_send_unreliable(struct ldc_conn *lc, void *msg, size_t len)
+{
+	struct ldc_pkt *lp;
+	uint64_t tx_head, tx_tail, tx_state;
+	uint64_t tx_avail;
+	uint8_t *p = msg;
+	int err;
+
+	mutex_enter(&lc->lc_txq->lq_mtx);
+	err = hv_ldc_tx_get_state(lc->lc_id, &tx_head, &tx_tail, &tx_state);
+	if (err != H_EOK || tx_state != LDC_CHANNEL_UP) {
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return (EIO);
+	}
+
+	tx_avail = (tx_head - tx_tail) / sizeof(*lp) +
+	    lc->lc_txq->lq_nentries - 1;
+	tx_avail %= lc->lc_txq->lq_nentries;
+	if (len > tx_avail * LDC_PKT_PAYLOAD) {
+		mutex_exit(&lc->lc_txq->lq_mtx);
+		return (EWOULDBLOCK);
+	}
+
+	while (len > 0) {
+		lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+		bzero(lp, sizeof(struct ldc_pkt));
+		lp->type = LDC_DATA;
+		lp->stype = LDC_INFO;
+		lp->env = min(len, LDC_PKT_PAYLOAD);
+		if (p == msg)
+			lp->env |= LDC_FRAG_START;
+		if (len <= LDC_PKT_PAYLOAD)
+			lp->env |= LDC_FRAG_STOP;
+		lp->seqid = lc->lc_tx_seqid++;
+		bcopy(p, &lp->major, min(len, LDC_PKT_PAYLOAD));
+
+		tx_tail += sizeof(*lp);
+		tx_tail &= ((lc->lc_txq->lq_nentries * sizeof(*lp)) - 1);
+		err = hv_ldc_tx_set_qtail(lc->lc_id, tx_tail);
+		if (err != H_EOK) {
+			printf("%s: hv_ldc_tx_set_qtail: %d\n", __func__, err);
+			mutex_exit(&lc->lc_txq->lq_mtx);
+			return (EIO);
+		}
+		p += min(len, LDC_PKT_PAYLOAD);
+		len -= min(len, LDC_PKT_PAYLOAD);
+	}
+
+	mutex_exit(&lc->lc_txq->lq_mtx);
+	return (0);
+}
+
+void
+ldc_reset(struct ldc_conn *lc)
+{
+	int err;
+	vaddr_t va;
+	paddr_t pa;
+
+	DPRINTF(("Resetting connection\n"));
+
+	mutex_enter(&lc->lc_txq->lq_mtx);
+
+#if OPENBSD_BUSDMA
+	err = hv_ldc_tx_qconf(lc->lc_id,
+	    lc->lc_txq->lq_map->dm_segs[0].ds_addr, lc->lc_txq->lq_nentries);
+#else
+        va = lc->lc_txq->lq_va;
+	pa = 0;
+	if (pmap_extract(pmap_kernel(), va, &pa) == FALSE)
+	  panic("pmap_extract failed %lx\n", va);
+	err = hv_ldc_tx_qconf(lc->lc_id, pa, lc->lc_txq->lq_nentries);
+#endif
+	if (err != H_EOK)
+		printf("%s: hv_ldc_tx_qconf %d\n", __func__, err);
+
+#if OPENBSD_BUSDMA
+	err = hv_ldc_rx_qconf(lc->lc_id,
+	    lc->lc_rxq->lq_map->dm_segs[0].ds_addr, lc->lc_rxq->lq_nentries);
+#else
+        va = lc->lc_rxq->lq_va;
+	pa = 0;
+	if (pmap_extract(pmap_kernel(), va, &pa) == FALSE)
+	  panic("pmap_extract failed %lx\n", va);
+	err = hv_ldc_tx_qconf(lc->lc_id, pa, lc->lc_rxq->lq_nentries);
+#endif
+	if (err != H_EOK)
+		printf("%s: hv_ldc_rx_qconf %d\n", __func__, err);
+
+	lc->lc_tx_seqid = 0;
+	lc->lc_state = 0;
+	lc->lc_tx_state = lc->lc_rx_state = LDC_CHANNEL_DOWN;
+	mutex_exit(&lc->lc_txq->lq_mtx);
+
+	lc->lc_reset(lc);
+}
+#if OPENBSD_BUSDMA
+struct ldc_queue *
+ldc_queue_alloc(bus_dma_tag_t t, int nentries)
+#else
+struct ldc_queue *
+ldc_queue_alloc(int nentries)
+#endif
+{
+	struct ldc_queue *lq;
+	bus_size_t size;
+	vaddr_t va = 0;
+#if OPENBSD_BUSDMA
+	int nsegs;
+#endif
+
+	lq = kmem_zalloc(sizeof(struct ldc_queue), KM_NOSLEEP);
+	if (lq == NULL)
+		return NULL;
+
+	mutex_init(&lq->lq_mtx, MUTEX_DEFAULT, IPL_TTY);
+
+	size = roundup(nentries * sizeof(struct ldc_pkt), PAGE_SIZE);
+#if OPENBSD_BUSDMA
+	if (bus_dmamap_create(t, size, 1, size, 0,
+	    BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &lq->lq_map) != 0)
+		return (NULL);
+
+	if (bus_dmamem_alloc(t, size, PAGE_SIZE, 0, &lq->lq_seg, 1,
+	    &nsegs, BUS_DMA_NOWAIT) != 0)
+		goto destroy;
+
+	if (bus_dmamem_map(t, &lq->lq_seg, 1, size, (void *)&va,
+	    BUS_DMA_NOWAIT) != 0)
+		goto free;
+
+	 if (bus_dmamap_load(t, lq->lq_map, (void*)va, size, NULL,
+	    BUS_DMA_NOWAIT) != 0)
+		goto unmap;
+#else
+	 va = (vaddr_t)kmem_zalloc(size, KM_NOSLEEP);
+#endif
+	lq->lq_va = (vaddr_t)va;
+	lq->lq_nentries = nentries;
+	return (lq);
+#if OPENBSD_BUSDMA
+unmap:
+	bus_dmamem_unmap(t, (void*)va, size);
+free:
+	bus_dmamem_free(t, &lq->lq_seg, 1);
+destroy:
+	bus_dmamap_destroy(t, lq->lq_map);
+#endif
+	return (NULL);
+}
+
+void
+#if OPENBSD_BUSDMA
+ldc_queue_free(bus_dma_tag_t t, struct ldc_queue *lq)
+#else
+ldc_queue_free(struct ldc_queue *lq)
+#endif
+{
+	bus_size_t size;
+
+	size = roundup(lq->lq_nentries * sizeof(struct ldc_pkt), PAGE_SIZE);
+
+#if OPENBSD_BUSDMA
+	bus_dmamap_unload(t, lq->lq_map);
+	bus_dmamem_unmap(t, &lq->lq_va, size);
+	bus_dmamem_free(t, &lq->lq_seg, 1);
+	bus_dmamap_destroy(t, lq->lq_map);
+#else
+	kmem_free((void *)lq->lq_va, size);
+#endif
+	kmem_free(lq, size);
+}
+
+#if OPENBSD_BUSDMA
+struct ldc_map *
+ldc_map_alloc(bus_dma_tag_t t, int nentries)
+#else
+struct ldc_map *
+ldc_map_alloc(int nentries)
+#endif
+{
+	struct ldc_map *lm;
+	bus_size_t size;
+	vaddr_t va = 0;
+
+#if OPENBSD_BUSDMA
+	int nsegs;
+#endif
+	lm = kmem_zalloc(sizeof(struct ldc_map), KM_NOSLEEP);
+	if (lm == NULL)
+		return NULL;
+
+	size = roundup(nentries * sizeof(struct ldc_map_slot), PAGE_SIZE);
+
+#if OPENBSD_BUSDMA
+	if (bus_dmamap_create(t, size, 1, size, 0,
+			      BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &lm->lm_map) != 0) {
+		DPRINTF(("ldc_map_alloc() - bus_dmamap_create() failed\n"));
+		return (NULL);
+	}
+
+	if (bus_dmamem_alloc(t, size, PAGE_SIZE, 0, &lm->lm_seg, 1,
+			     &nsegs, BUS_DMA_NOWAIT) != 0) {
+		DPRINTF(("ldc_map_alloc() - bus_dmamem_alloc() failed\n"));
+		goto destroy;
+	}
+
+	if (bus_dmamem_map(t, &lm->lm_seg, 1, size, (void *)&va,
+			   BUS_DMA_NOWAIT) != 0) {
+		DPRINTF(("ldc_map_alloc() - bus_dmamem_map() failed\n"));
+		goto free;
+	}
+	if (bus_dmamap_load(t, lm->lm_map, (void*)va, size, NULL,
+			    BUS_DMA_NOWAIT) != 0) {
+		DPRINTF(("ldc_map_alloc() - bus_dmamap_load() failed\n"));
+		goto unmap;
+	}
+#else
+	va = (vaddr_t)kmem_zalloc(size, KM_NOSLEEP);
+#endif
+	lm->lm_slot = (struct ldc_map_slot *)va;
+	lm->lm_nentries = nentries;
+	bzero(lm->lm_slot, nentries * sizeof(struct ldc_map_slot));
+	return (lm);
+
+#if OPENBSD_BUSDMA
+unmap:
+	bus_dmamem_unmap(t, (void*)va, size);
+free:
+	bus_dmamem_free(t, &lm->lm_seg, 1);
+destroy:
+	bus_dmamap_destroy(t, lm->lm_map);
+#endif
+	return (NULL);
+}
+
+#if OPENBSD_BUSDMA
+void
+ldc_map_free(bus_dma_tag_t t, struct ldc_map *lm)
+#else
+void
+ldc_map_free(struct ldc_map *lm)
+#endif
+{
+	bus_size_t size;
+
+	size = lm->lm_nentries * sizeof(struct ldc_map_slot);
+	size = roundup(size, PAGE_SIZE);
+
+#if OPENBSD_BUSDMA
+	bus_dmamap_unload(t, lm->lm_map);
+	bus_dmamem_unmap(t, lm->lm_slot, size);
+	bus_dmamem_free(t, &lm->lm_seg, 1);
+	bus_dmamap_destroy(t, lm->lm_map);
+#else
+	kmem_free(lm->lm_slot, size);
+#endif
+	kmem_free(lm, size);
+}
Index: src/sys/arch/sparc64/dev/ldcvar.h
diff -u /dev/null src/sys/arch/sparc64/dev/ldcvar.h:1.1
--- /dev/null	Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/ldcvar.h	Fri Aug 19 19:02:07 2016
@@ -0,0 +1,169 @@
+/*	$NetBSD: ldcvar.h,v 1.1 2016/08/19 19:02:07 palle Exp $	*/
+/*	$OpenBSD: ldcvar.h,v 1.6 2014/09/29 17:43:29 kettenis Exp $	*/
+/*
+ * Copyright (c) 2009 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * LDC queues.
+ */
+
+#include <sys/mutex.h>
+
+struct ldc_queue {
+	kmutex_t	lq_mtx;
+#if OPENBSD_BUSDMA
+	bus_dmamap_t	lq_map;
+	bus_dma_segment_t lq_seg;
+#endif
+	vaddr_t		lq_va;
+	int		lq_nentries;
+};
+
+#if OPENBSD_BUSDMA
+struct ldc_queue *ldc_queue_alloc(bus_dma_tag_t, int);
+void	ldc_queue_free(bus_dma_tag_t, struct ldc_queue *);
+#else
+struct ldc_queue *ldc_queue_alloc(int);
+void	ldc_queue_free(struct ldc_queue *);
+#endif
+
+/*
+ * LDC virtual link layer protocol.
+ */
+
+#define LDC_VERSION_MAJOR	1
+#define LDC_VERSION_MINOR	0
+
+#define LDC_PKT_PAYLOAD		56
+
+struct ldc_pkt {
+	uint8_t		type;
+	uint8_t		stype;
+	uint8_t		ctrl;
+	uint8_t		env;
+	uint32_t	seqid;
+
+	uint16_t	major;
+	uint16_t	minor;
+	uint32_t	_reserved[13];
+};
+
+/* Packet types. */
+#define LDC_CTRL	0x01
+#define LDC_DATA	0x02
+#define LDC_ERR		0x10
+
+/* Packet subtypes. */
+#define LDC_INFO	0x01
+#define LDC_ACK		0x02
+#define LDC_NACK	0x04
+
+/* Control info values. */
+#define LDC_VERS	0x01
+#define LDC_RTS		0x02
+#define LDC_RTR		0x03
+#define LDC_RDX		0x04
+
+/* Packet envelope. */
+#define LDC_MODE_RAW		0x00
+#define LDC_MODE_UNRELIABLE	0x01
+#define LDC_MODE_RELIABLE	0x03
+
+#define LDC_LEN_MASK	0x3f
+#define LDC_FRAG_MASK	0xc0
+#define LDC_FRAG_START	0x40
+#define LDC_FRAG_STOP	0x80
+
+/*
+ * XXX Get rid of the +8 once we no longer need to store the header of
+ * the first packet.
+ */
+#define LDC_MSG_MAX	(128 + 8)
+
+struct ldc_conn {
+	uint64_t	lc_id;
+
+	struct ldc_queue *lc_txq;
+	struct ldc_queue *lc_rxq;
+	uint64_t	lc_tx_state;
+	uint64_t	lc_rx_state;
+
+	uint32_t	lc_tx_seqid;
+	uint8_t		lc_state;
+#define LDC_SND_VERS	1
+#define LDC_RCV_VERS	2
+#define LDC_SND_RTS	3
+#define LDC_SND_RTR	4
+#define LDC_SND_RDX	5
+
+	uint64_t	lc_msg[LDC_MSG_MAX / 8];
+	size_t		lc_len;
+
+	void		*lc_sc;
+	void		(*lc_reset)(struct ldc_conn *);
+	void		(*lc_start)(struct ldc_conn *);
+	void		(*lc_rx_data)(struct ldc_conn *, struct ldc_pkt *);
+};
+
+void	ldc_rx_ctrl(struct ldc_conn *, struct ldc_pkt *);
+void	ldc_rx_data(struct ldc_conn *, struct ldc_pkt *);
+
+void	ldc_send_vers(struct ldc_conn *);
+int	ldc_send_unreliable(struct ldc_conn *, void *, size_t);
+
+void	ldc_reset(struct ldc_conn *);
+
+/*
+ * LDC map tables.
+ */
+
+struct ldc_map_slot {
+	uint64_t	entry;
+	uint64_t	cookie;
+};
+
+#define LDC_MTE_R	0x0000000000000010ULL
+#define LDC_MTE_W	0x0000000000000020ULL
+#define LDC_MTE_X	0x0000000000000040ULL
+#define LDC_MTE_IOR	0x0000000000000080ULL
+#define LDC_MTE_IOW	0x0000000000000100ULL
+#define LDC_MTE_CPR	0x0000000000000200ULL
+#define LDC_MTE_CPW	0x0000000000000400ULL
+#define LDC_MTE_RA_MASK	0x007fffffffffe000ULL
+
+struct ldc_map {
+#if OPENBSD_BUSDMA
+	bus_dmamap_t		lm_map;
+	bus_dma_segment_t	lm_seg;
+#endif
+	struct ldc_map_slot	*lm_slot;
+	int			lm_nentries;
+	int			lm_next;
+	int			lm_count;
+};
+
+#if OPENBSD_BUSDMA
+struct ldc_map *ldc_map_alloc(bus_dma_tag_t, int);
+void	ldc_map_free(bus_dma_tag_t, struct ldc_map *);
+#else
+struct ldc_map *ldc_map_alloc(int);
+void	ldc_map_free(struct ldc_map *);
+#endif
+
+struct ldc_cookie {
+	uint64_t	addr;
+	uint64_t	size;
+};
Index: src/sys/arch/sparc64/dev/vdsk.c
diff -u /dev/null src/sys/arch/sparc64/dev/vdsk.c:1.1
--- /dev/null	Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/vdsk.c	Fri Aug 19 19:02:07 2016
@@ -0,0 +1,1381 @@
+/*	$NetBSD: vdsk.c,v 1.1 2016/08/19 19:02:07 palle Exp $	*/
+/*	$OpenBSD: vdsk.c,v 1.46 2015/01/25 21:42:13 kettenis Exp $	*/
+/*
+ * Copyright (c) 2009, 2011 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/kmem.h>
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+
+#include <machine/autoconf.h>
+#include <machine/hypervisor.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <dev/scsipi/scsi_all.h>
+#include <dev/scsipi/scsipi_disk.h>
+#include <dev/scsipi/scsipi_cd.h>
+#include <dev/scsipi/scsiconf.h>
+
+#include <dev/scsipi/scsi_disk.h>
+#include <dev/scsipi/scsipi_all.h>
+#include <dev/scsipi/scsiconf.h>
+#include <dev/scsipi/scsi_message.h>
+
+#include <sparc64/dev/cbusvar.h>
+#include <sparc64/dev/ldcvar.h>
+#include <sparc64/dev/viovar.h>
+
+#ifdef VDSK_DEBUG
+#define DPRINTF(x)	printf x
+#else
+#define DPRINTF(x)
+#endif
+
+#define VDSK_TX_ENTRIES		32
+#define VDSK_RX_ENTRIES		32
+
+struct vd_attr_info {
+	struct vio_msg_tag	tag;
+	uint8_t			xfer_mode;
+	uint8_t			vd_type;
+	uint8_t			vd_mtype;
+	uint8_t			_reserved1;
+	uint32_t		vdisk_block_size;
+	uint64_t		operations;
+	uint64_t		vdisk_size;
+	uint64_t		max_xfer_sz;
+	uint64_t		_reserved2[2];
+};
+
+#define VD_DISK_TYPE_SLICE	0x01
+#define VD_DISK_TYPE_DISK	0x02
+
+#define VD_MEDIA_TYPE_FIXED	0x01
+#define VD_MEDIA_TYPE_CD	0x02
+#define VD_MEDIA_TYPE_DVD	0x03
+
+/* vDisk version 1.0. */
+#define VD_OP_BREAD		0x01
+#define VD_OP_BWRITE		0x02
+#define VD_OP_FLUSH		0x03
+#define VD_OP_GET_WCE		0x04
+#define VD_OP_SET_WCE		0x05
+#define VD_OP_GET_VTOC		0x06
+#define VD_OP_SET_VTOC		0x07
+#define VD_OP_GET_DISKGEOM	0x08
+#define VD_OP_SET_DISKGEOM	0x09
+#define VD_OP_GET_DEVID		0x0b
+#define VD_OP_GET_EFI		0x0c
+#define VD_OP_SET_EFI		0x0d
+
+/* vDisk version 1.1 */
+#define VD_OP_SCSICMD		0x0a
+#define VD_OP_RESET		0x0e
+#define VD_OP_GET_ACCESS	0x0f
+#define VD_OP_SET_ACCESS	0x10
+#define VD_OP_GET_CAPACITY	0x11
+
+struct vd_desc {
+	struct vio_dring_hdr	hdr;
+	uint64_t		req_id;
+	uint8_t			operation;
+	uint8_t			slice;
+	uint16_t		_reserved1;
+	uint32_t		status;
+	uint64_t		offset;
+	uint64_t		size;
+	uint32_t		ncookies;
+	uint32_t		_reserved2;
+	struct ldc_cookie	cookie[MAXPHYS / PAGE_SIZE];
+};
+
+#define VD_SLICE_NONE		0xff
+
+struct vdsk_dring {
+	bus_dmamap_t		vd_map;
+	bus_dma_segment_t	vd_seg;
+	struct vd_desc		*vd_desc;
+	int			vd_nentries;
+};
+
+#if OPENBSD_BUSDMA
+struct vdsk_dring *vdsk_dring_alloc(bus_dma_tag_t, int);
+void	vdsk_dring_free(bus_dma_tag_t, struct vdsk_dring *);
+#else
+struct vdsk_dring *vdsk_dring_alloc(int);
+void	vdsk_dring_free(struct vdsk_dring *);
+#endif
+
+/*
+ * We support vDisk 1.0 and 1.1.
+ */
+#define VDSK_MAJOR	1
+#define VDSK_MINOR	1
+
+struct vdsk_soft_desc {
+	int		vsd_map_idx[MAXPHYS / PAGE_SIZE];
+	struct scsipi_xfer *vsd_xs;
+	int		vsd_ncookies;
+};
+
+struct vdsk_softc {
+	device_t sc_dv;
+
+	struct scsipi_adapter sc_adapter;
+	struct scsipi_channel sc_channel;
+  
+	bus_space_tag_t	sc_bustag;
+	bus_dma_tag_t	sc_dmatag;
+
+	void		*sc_tx_ih;
+	void		*sc_rx_ih;
+
+	struct ldc_conn	sc_lc;
+
+	uint16_t	sc_vio_state;
+#define VIO_SND_VER_INFO	0x0001
+#define VIO_ACK_VER_INFO	0x0002
+#define VIO_SND_ATTR_INFO	0x0004
+#define VIO_ACK_ATTR_INFO	0x0008
+#define VIO_SND_DRING_REG	0x0010
+#define VIO_ACK_DRING_REG	0x0020
+#define VIO_SND_RDX		0x0040
+#define VIO_ACK_RDX		0x0080
+#define VIO_ESTABLISHED		0x00ff
+
+	uint16_t	sc_major;
+	uint16_t	sc_minor;
+
+	uint32_t	sc_local_sid;
+	uint64_t	sc_dring_ident;
+	uint64_t	sc_seq_no;
+
+	int		sc_tx_cnt;
+	int		sc_tx_prod;
+	int		sc_tx_cons;
+
+	struct ldc_map	*sc_lm;
+	struct vdsk_dring *sc_vd;
+	struct vdsk_soft_desc *sc_vsd;
+
+	uint32_t	sc_vdisk_block_size;
+	uint64_t	sc_vdisk_size;
+	uint8_t		sc_vd_mtype;
+};
+
+int	vdsk_match(device_t, cfdata_t, void *);
+void	vdsk_attach(device_t, device_t, void *);
+void	vdsk_scsipi_request(struct scsipi_channel *, scsipi_adapter_req_t,
+			     void *);
+
+CFATTACH_DECL_NEW(vdsk, sizeof(struct vdsk_softc),
+		  vdsk_match, vdsk_attach, NULL, NULL);
+
+int	vdsk_tx_intr(void *);
+int	vdsk_rx_intr(void *);
+
+void	vdsk_rx_data(struct ldc_conn *, struct ldc_pkt *);
+void	vdsk_rx_vio_ctrl(struct vdsk_softc *, struct vio_msg *);
+void	vdsk_rx_vio_ver_info(struct vdsk_softc *, struct vio_msg_tag *);
+void	vdsk_rx_vio_attr_info(struct vdsk_softc *, struct vio_msg_tag *);
+void	vdsk_rx_vio_dring_reg(struct vdsk_softc *, struct vio_msg_tag *);
+void	vdsk_rx_vio_rdx(struct vdsk_softc *sc, struct vio_msg_tag *);
+void	vdsk_rx_vio_data(struct vdsk_softc *sc, struct vio_msg *);
+void	vdsk_rx_vio_dring_data(struct vdsk_softc *sc, struct vio_msg_tag *);
+
+void	vdsk_ldc_reset(struct ldc_conn *);
+void	vdsk_ldc_start(struct ldc_conn *);
+
+void	vdsk_sendmsg(struct vdsk_softc *, void *, size_t);
+void	vdsk_send_ver_info(struct vdsk_softc *, uint16_t, uint16_t);
+void	vdsk_send_attr_info(struct vdsk_softc *);
+void	vdsk_send_dring_reg(struct vdsk_softc *);
+void	vdsk_send_rdx(struct vdsk_softc *);
+
+void	*vdsk_io_get(void *);
+void	vdsk_io_put(void *, void *);
+
+void	vdsk_scsi_cmd(struct vdsk_softc *sc, struct scsipi_xfer *);
+int	vdsk_submit_cmd(struct vdsk_softc *sc, struct scsipi_xfer *);
+void	vdsk_complete_cmd(struct vdsk_softc *sc, struct scsipi_xfer *, int);
+void	vdsk_scsi_inq(struct vdsk_softc *sc, struct scsipi_xfer *);
+void	vdsk_scsi_inquiry(struct vdsk_softc *sc, struct scsipi_xfer *);
+void	vdsk_scsi_capacity(struct vdsk_softc *sc, struct scsipi_xfer *);
+void	vdsk_scsi_capacity16(struct vdsk_softc *sc, struct scsipi_xfer *);
+void	vdsk_scsi_done(struct scsipi_xfer *, int);
+
+int
+vdsk_match(device_t parent, cfdata_t match, void *aux)
+{
+	struct cbus_attach_args *ca = aux;
+
+	if (strcmp(ca->ca_name, "disk") == 0)
+		return (1);
+
+	return (0);
+}
+
+void
+vdsk_attach(device_t parent, device_t self, void *aux)
+{
+	struct vdsk_softc *sc = device_private(self);
+	struct cbus_attach_args *ca = aux;
+	struct ldc_conn *lc;
+	int err, s;
+	int timeout;
+        vaddr_t va;
+        paddr_t pa;
+
+	sc->sc_bustag = ca->ca_bustag;
+	sc->sc_dmatag = ca->ca_dmatag;
+
+	printf(": ivec 0x%llx, 0x%llx", 
+	       (long long unsigned int)ca->ca_tx_ino,
+	       (long long unsigned int)ca->ca_rx_ino);
+
+	/*
+	 * Un-configure queues before registering interrupt handlers,
+	 * such that we dont get any stale LDC packets or events.
+	 */
+	hv_ldc_tx_qconf(ca->ca_id, 0, 0);
+	hv_ldc_rx_qconf(ca->ca_id, 0, 0);
+
+	sc->sc_tx_ih = bus_intr_establish(ca->ca_bustag, ca->ca_tx_ino,
+	    IPL_BIO, vdsk_tx_intr, sc);
+	sc->sc_rx_ih = bus_intr_establish(ca->ca_bustag, ca->ca_rx_ino,
+	    IPL_BIO, vdsk_rx_intr, sc);
+	if (sc->sc_tx_ih == NULL || sc->sc_rx_ih == NULL) {
+		printf(", can't establish interrupt\n");
+		return;
+	}
+
+	lc = &sc->sc_lc;
+	lc->lc_id = ca->ca_id;
+	lc->lc_sc = sc;
+	lc->lc_reset = vdsk_ldc_reset;
+	lc->lc_start = vdsk_ldc_start;
+	lc->lc_rx_data = vdsk_rx_data;
+
+#if OPENBSD_BUSDMA
+	lc->lc_txq = ldc_queue_alloc(sc->sc_dmatag, VDSK_TX_ENTRIES);
+#else
+	lc->lc_txq = ldc_queue_alloc(VDSK_TX_ENTRIES);
+#endif
+	if (lc->lc_txq == NULL) {
+		printf(", can't allocate tx queue\n");
+		return;
+	}
+#if OPENBSD_BUSDMA
+	lc->lc_rxq = ldc_queue_alloc(sc->sc_dmatag, VDSK_RX_ENTRIES);
+#else
+	lc->lc_rxq = ldc_queue_alloc(VDSK_RX_ENTRIES);
+#endif
+	if (lc->lc_rxq == NULL) {
+		printf(", can't allocate rx queue\n");
+		goto free_txqueue;
+	}
+
+#if OPENBSD_BUSDMA
+	sc->sc_lm = ldc_map_alloc(sc->sc_dmatag, 2048);
+#else
+	sc->sc_lm = ldc_map_alloc(2048);
+#endif
+	if (sc->sc_lm == NULL) {
+		printf(", can't allocate LDC mapping table\n");
+		goto free_rxqueue;
+	}
+
+#if OPENBSD_BUSDMA
+	err = hv_ldc_set_map_table(lc->lc_id,
+	    sc->sc_lm->lm_map->dm_segs[0].ds_addr, sc->sc_lm->lm_nentries);
+#else
+        va = (vaddr_t)sc->sc_lm->lm_slot;
+        pa = 0;
+	if (pmap_extract(pmap_kernel(), va, &pa) == FALSE)
+	  panic("pmap_extract failed %lx\n", va);
+	err = hv_ldc_set_map_table(lc->lc_id, pa, 2048);
+#endif
+	if (err != H_EOK) {
+		printf("hv_ldc_set_map_table %d\n", err);
+		goto free_map;
+	}
+#if OPENBSD_BUSDMA
+	sc->sc_vd = vdsk_dring_alloc(sc->sc_dmatag, 32);
+#else
+	sc->sc_vd = vdsk_dring_alloc(32);
+#endif
+	if (sc->sc_vd == NULL) {
+		printf(", can't allocate dring\n");
+		goto free_map;
+	}
+	sc->sc_vsd = kmem_zalloc(32 * sizeof(*sc->sc_vsd), KM_NOSLEEP);
+	if (sc->sc_vsd == NULL) {
+		printf(", can't allocate software ring\n");
+		goto free_dring;
+	}
+
+#if OPENBSD_BUSDMA
+	sc->sc_lm->lm_slot[0].entry = sc->sc_vd->vd_map->dm_segs[0].ds_addr;
+#else
+        va = (vaddr_t)sc->sc_vd->vd_desc;
+        pa = 0;
+	if (pmap_extract(pmap_kernel(), va, &pa) == FALSE)
+	  panic("pmap_extract failed %lx\n", va);
+
+	sc->sc_lm->lm_slot[0].entry = pa;
+#endif
+	sc->sc_lm->lm_slot[0].entry &= LDC_MTE_RA_MASK;
+	sc->sc_lm->lm_slot[0].entry |= LDC_MTE_CPR | LDC_MTE_CPW;
+	sc->sc_lm->lm_slot[0].entry |= LDC_MTE_R | LDC_MTE_W;
+	sc->sc_lm->lm_next = 1;
+	sc->sc_lm->lm_count = 1;
+	va = lc->lc_txq->lq_va;
+	pa = 0;
+	if (pmap_extract(pmap_kernel(), va, &pa) == FALSE)
+		panic("pmap_extract failed %lx\n", va);
+#if OPENBSD_BUSDMA
+	err = hv_ldc_tx_qconf(lc->lc_id, 
+	    lc->lc_txq->lq_map->dm_segs[0].ds_addr, lc->lc_txq->lq_nentries);
+#else
+        err = hv_ldc_tx_qconf(lc->lc_id, pa, lc->lc_txq->lq_nentries);
+#endif
+	if (err != H_EOK)
+		printf("hv_ldc_tx_qconf %d\n", err);
+	va = (vaddr_t)lc->lc_rxq->lq_va;
+	pa = 0;
+	if (pmap_extract(pmap_kernel(), va, &pa) == FALSE)
+	  panic("pmap_extract failed %lx\n", va);
+#if OPENBSD_BUSDMA
+	err = hv_ldc_rx_qconf(lc->lc_id,
+	    lc->lc_rxq->lq_map->dm_segs[0].ds_addr, lc->lc_rxq->lq_nentries);
+#else
+        err = hv_ldc_rx_qconf(lc->lc_id, pa, lc->lc_rxq->lq_nentries);
+#endif
+	if (err != H_EOK)
+		printf("hv_ldc_rx_qconf %d\n", err);
+
+	cbus_intr_setenabled(sc->sc_bustag, ca->ca_tx_ino, INTR_ENABLED);
+	cbus_intr_setenabled(sc->sc_bustag, ca->ca_rx_ino, INTR_ENABLED);
+
+	ldc_send_vers(lc);
+
+	printf("\n");
+
+	/*
+	 * Interrupts aren't enabled during autoconf, so poll for VIO
+	 * peer-to-peer hanshake completion.
+	 */
+	s = splbio();
+	timeout = 10 * 1000;
+	do {
+		if (vdsk_rx_intr(sc) && sc->sc_vio_state == VIO_ESTABLISHED)
+			break;
+
+		delay(1000);
+	} while(--timeout > 0);
+	splx(s);
+
+	if (sc->sc_vio_state != VIO_ESTABLISHED) {
+	  printf("vio not establshed: %d\n", sc->sc_vio_state);
+	  return;
+	}
+
+	sc->sc_dv = self;
+
+	sc->sc_adapter.adapt_dev = sc->sc_dv;
+	sc->sc_adapter.adapt_nchannels = 1;
+	sc->sc_adapter.adapt_openings = sc->sc_vd->vd_nentries - 1;
+	sc->sc_adapter.adapt_max_periph = sc->sc_vd->vd_nentries - 1;
+
+	sc->sc_adapter.adapt_minphys = minphys;
+	sc->sc_adapter.adapt_request = vdsk_scsipi_request;
+
+	sc->sc_channel.chan_adapter = &sc->sc_adapter;
+	sc->sc_channel.chan_bustype = &scsi_bustype;
+	sc->sc_channel.chan_channel = 0;
+	sc->sc_channel.chan_ntargets = 2; /* XXX why not 1? */
+	sc->sc_channel.chan_nluns = 1; /* XXX slices should be presented as luns? */
+	sc->sc_channel.chan_id = 0;
+	sc->sc_channel.chan_flags = SCSIPI_CHAN_NOSETTLE;
+
+	config_found(self, &sc->sc_channel, scsiprint);
+
+	return;
+
+free_dring:
+#if OPENBSD_BUSDMA
+	vdsk_dring_free(sc->sc_dmatag, sc->sc_vd);
+#else
+	vdsk_dring_free(sc->sc_vd);
+#endif
+free_map:
+	hv_ldc_set_map_table(lc->lc_id, 0, 0);
+#if OPENBSD_BUSDMA
+	ldc_map_free(sc->sc_dmatag, sc->sc_lm);
+#else
+	ldc_map_free(sc->sc_lm);
+#endif
+free_rxqueue:
+#if OPENBSD_BUSDMA
+	ldc_queue_free(sc->sc_dmatag, lc->lc_rxq);
+#else
+	ldc_queue_free(lc->lc_rxq);
+#endif
+free_txqueue:
+#if OPENBSD_BUSDMA
+	ldc_queue_free(sc->sc_dmatag, lc->lc_txq);
+#else
+	ldc_queue_free(lc->lc_txq);
+#endif
+}
+
+void
+vdsk_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req,
+		     void *arg)
+{
+
+	struct vdsk_softc *sc;
+	struct scsipi_xfer *xs;
+
+	sc = device_private(chan->chan_adapter->adapt_dev);
+
+	xs = arg;
+
+	switch (req) {
+		case ADAPTER_REQ_RUN_XFER:
+			vdsk_scsi_cmd(sc, xs);
+			break;  
+		case ADAPTER_REQ_GROW_RESOURCES:
+		case ADAPTER_REQ_SET_XFER_MODE: 
+			/* Ignored */  
+			break;
+		default:
+			panic("req unhandled: %x", req);
+	}
+
+}
+
+int
+vdsk_tx_intr(void *arg)
+{
+	panic("%s: not verified yet", __FUNCTION__);
+
+	struct vdsk_softc *sc = arg;
+	struct ldc_conn *lc = &sc->sc_lc;
+	uint64_t tx_head, tx_tail, tx_state;
+
+	hv_ldc_tx_get_state(lc->lc_id, &tx_head, &tx_tail, &tx_state);
+	if (tx_state != lc->lc_tx_state) {
+		switch (tx_state) {
+		case LDC_CHANNEL_DOWN:
+			DPRINTF(("Tx link down\n"));
+			break;
+		case LDC_CHANNEL_UP:
+			DPRINTF(("Tx link up\n"));
+			break;
+		case LDC_CHANNEL_RESET:
+			DPRINTF(("Tx link reset\n"));
+			break;
+		}
+		lc->lc_tx_state = tx_state;
+	}
+
+	return (1);
+}
+
+int
+vdsk_rx_intr(void *arg)
+{
+	struct vdsk_softc *sc = arg;
+	struct ldc_conn *lc = &sc->sc_lc;
+	uint64_t rx_head, rx_tail, rx_state;
+	struct ldc_pkt *lp;
+	int err;
+
+	err = hv_ldc_rx_get_state(lc->lc_id, &rx_head, &rx_tail, &rx_state);
+	if (err == H_EINVAL) {
+		printf("hv_ldc_rx_get_state H_EINVAL\n");
+		return (0);
+	}
+	if (err != H_EOK) {
+		printf("hv_ldc_rx_get_state %d\n", err);
+		return (0);
+	}
+
+	if (rx_state != lc->lc_rx_state) {
+		sc->sc_vio_state = 0;
+		lc->lc_tx_seqid = 0;
+		lc->lc_state = 0;
+		switch (rx_state) {
+		case LDC_CHANNEL_DOWN:
+			DPRINTF(("Rx link down\n"));
+			break;
+		case LDC_CHANNEL_UP:
+			DPRINTF(("Rx link up\n"));
+			ldc_send_vers(lc);
+			break;
+		case LDC_CHANNEL_RESET:
+			DPRINTF(("Rx link reset\n"));
+			break;
+		}
+		lc->lc_rx_state = rx_state;
+		hv_ldc_rx_set_qhead(lc->lc_id, rx_tail);
+		return (1);
+	}
+
+	if (rx_head == rx_tail)
+		return (0);
+
+	lp = (struct ldc_pkt *)(lc->lc_rxq->lq_va + rx_head);
+	switch (lp->type) {
+		case LDC_CTRL:
+			ldc_rx_ctrl(lc, lp);
+			break;
+
+		case LDC_DATA:
+			ldc_rx_data(lc, lp);
+			break;
+
+		default:
+			DPRINTF(("%0x02/%0x02/%0x02\n", lp->type, lp->stype,
+			    lp->ctrl));
+			ldc_reset(lc);
+			break;
+	}
+
+	if (lc->lc_state == 0)
+		return (1);
+
+	rx_head += sizeof(*lp);
+	rx_head &= ((lc->lc_rxq->lq_nentries * sizeof(*lp)) - 1);
+	err = hv_ldc_rx_set_qhead(lc->lc_id, rx_head);
+	if (err != H_EOK)
+		printf("%s: hv_ldc_rx_set_qhead %d\n", __func__, err);
+
+	return (1);
+}
+
+void
+vdsk_rx_data(struct ldc_conn *lc, struct ldc_pkt *lp)
+{
+	struct vio_msg *vm = (struct vio_msg *)lp;
+
+	switch (vm->type) {
+		case VIO_TYPE_CTRL:
+			if ((lp->env & LDC_FRAG_START) == 0 &&
+			    (lp->env & LDC_FRAG_STOP) == 0)
+				return;
+			vdsk_rx_vio_ctrl(lc->lc_sc, vm);
+			break;
+
+	case VIO_TYPE_DATA:
+			if((lp->env & LDC_FRAG_START) == 0)
+				return;
+			vdsk_rx_vio_data(lc->lc_sc, vm);
+			break;
+
+		default:
+			DPRINTF(("Unhandled packet type 0x%02x\n", vm->type));
+			ldc_reset(lc);
+			break;
+	}
+}
+
+void
+vdsk_rx_vio_ctrl(struct vdsk_softc *sc, struct vio_msg *vm)
+{
+	struct vio_msg_tag *tag = (struct vio_msg_tag *)&vm->type;
+
+	switch (tag->stype_env) {
+		case VIO_VER_INFO:
+			vdsk_rx_vio_ver_info(sc, tag);
+			break;
+		case VIO_ATTR_INFO:
+			vdsk_rx_vio_attr_info(sc, tag);
+			break;
+		case VIO_DRING_REG:
+			vdsk_rx_vio_dring_reg(sc, tag);
+			break;
+		case VIO_RDX:
+			vdsk_rx_vio_rdx(sc, tag);
+			break;
+		default:
+			DPRINTF(("CTRL/0x%02x/0x%04x\n", tag->stype, tag->stype_env));
+			break;
+	}
+}
+
+void
+vdsk_rx_vio_ver_info(struct vdsk_softc *sc, struct vio_msg_tag *tag)
+{
+	struct vio_ver_info *vi = (struct vio_ver_info *)tag;
+
+	switch (vi->tag.stype) {
+		case VIO_SUBTYPE_INFO:
+			DPRINTF(("CTRL/INFO/VER_INFO\n"));
+			break;
+
+		case VIO_SUBTYPE_ACK:
+			DPRINTF(("CTRL/ACK/VER_INFO\n"));
+			if (!ISSET(sc->sc_vio_state, VIO_SND_VER_INFO)) {
+				ldc_reset(&sc->sc_lc);
+				break;
+			}
+			sc->sc_major = vi->major;
+			sc->sc_minor = vi->minor;
+			sc->sc_vio_state |= VIO_ACK_VER_INFO;
+			break;
+
+		default:
+			DPRINTF(("CTRL/0x%02x/VER_INFO\n", vi->tag.stype));
+			break;
+	}
+
+	if (ISSET(sc->sc_vio_state, VIO_ACK_VER_INFO))
+		vdsk_send_attr_info(sc);
+}
+
+void
+vdsk_rx_vio_attr_info(struct vdsk_softc *sc, struct vio_msg_tag *tag)
+{
+	struct vd_attr_info *ai = (struct vd_attr_info *)tag;
+
+	switch (ai->tag.stype) {
+		case VIO_SUBTYPE_INFO:
+			DPRINTF(("CTRL/INFO/ATTR_INFO\n"));
+			break;
+
+		case VIO_SUBTYPE_ACK:
+			DPRINTF(("CTRL/ACK/ATTR_INFO\n"));
+			if (!ISSET(sc->sc_vio_state, VIO_SND_ATTR_INFO)) {
+				ldc_reset(&sc->sc_lc);
+				break;
+			}
+
+			sc->sc_vdisk_block_size = ai->vdisk_block_size;
+			sc->sc_vdisk_size = ai->vdisk_size;
+			if (sc->sc_major > 1 || sc->sc_minor >= 1)
+				sc->sc_vd_mtype = ai->vd_mtype;
+			else
+				sc->sc_vd_mtype = VD_MEDIA_TYPE_FIXED;
+
+			sc->sc_vio_state |= VIO_ACK_ATTR_INFO;
+			break;
+
+		default:
+			DPRINTF(("CTRL/0x%02x/ATTR_INFO\n", ai->tag.stype));
+			break;
+	}
+
+	if (ISSET(sc->sc_vio_state, VIO_ACK_ATTR_INFO))
+		vdsk_send_dring_reg(sc);
+
+}
+
+void
+vdsk_rx_vio_dring_reg(struct vdsk_softc *sc, struct vio_msg_tag *tag)
+{
+	struct vio_dring_reg *dr = (struct vio_dring_reg *)tag;
+
+	switch (dr->tag.stype) {
+		case VIO_SUBTYPE_INFO:
+			DPRINTF(("CTRL/INFO/DRING_REG\n"));
+			break;
+
+		case VIO_SUBTYPE_ACK:
+			DPRINTF(("CTRL/ACK/DRING_REG\n"));
+			if (!ISSET(sc->sc_vio_state, VIO_SND_DRING_REG)) {
+				ldc_reset(&sc->sc_lc);
+				break;
+			}
+
+			sc->sc_dring_ident = dr->dring_ident;
+			sc->sc_seq_no = 1;
+
+			sc->sc_vio_state |= VIO_ACK_DRING_REG;
+			break;
+
+		default:
+			DPRINTF(("CTRL/0x%02x/DRING_REG\n", dr->tag.stype));
+			break;
+	}
+
+	if (ISSET(sc->sc_vio_state, VIO_ACK_DRING_REG))
+		vdsk_send_rdx(sc);
+}
+
+void
+vdsk_rx_vio_rdx(struct vdsk_softc *sc, struct vio_msg_tag *tag)
+{
+	switch(tag->stype) {
+		case VIO_SUBTYPE_INFO:
+			DPRINTF(("CTRL/INFO/RDX\n"));
+			break;
+
+		case VIO_SUBTYPE_ACK:
+		{
+			int prod;
+
+			DPRINTF(("CTRL/ACK/RDX\n"));
+			if (!ISSET(sc->sc_vio_state, VIO_SND_RDX)) {
+				ldc_reset(&sc->sc_lc);
+				break;
+			}
+			sc->sc_vio_state |= VIO_ACK_RDX;
+
+			/*
+			 * If this ACK is the result of a reconnect, we may
+			 * have pending I/O that we need to resubmit.  We need
+			 * to rebuild the ring descriptors though since the
+			 * vDisk server on the other side may have touched
+			 * them already.  So we just clean up the ring and the
+			 * LDC map and resubmit the SCSI commands based on our
+			 * soft descriptors.
+			 */
+			prod = sc->sc_tx_prod;
+			sc->sc_tx_prod = sc->sc_tx_cons;
+			sc->sc_tx_cnt = 0;
+			sc->sc_lm->lm_next = 1;
+			sc->sc_lm->lm_count = 1;
+			while (sc->sc_tx_prod != prod)
+			  vdsk_submit_cmd(sc, sc->sc_vsd[sc->sc_tx_prod].vsd_xs);
+			break;
+	}
+
+		default:
+			DPRINTF(("CTRL/0x%02x/RDX (VIO)\n", tag->stype));
+			break;
+	}
+}
+
+void
+vdsk_rx_vio_data(struct vdsk_softc *sc, struct vio_msg *vm)
+{
+	struct vio_msg_tag *tag = (struct vio_msg_tag *)&vm->type;
+
+	if (sc->sc_vio_state != VIO_ESTABLISHED) {
+		DPRINTF(("Spurious DATA/0x%02x/0x%04x\n", tag->stype,
+		    tag->stype_env));
+		return;
+	}
+
+	switch(tag->stype_env) {
+		case VIO_DRING_DATA:
+			vdsk_rx_vio_dring_data(sc, tag);
+			break;
+
+		default:
+			DPRINTF(("DATA/0x%02x/0x%04x\n", tag->stype, tag->stype_env));
+			break;
+	}
+}
+
+void
+vdsk_rx_vio_dring_data(struct vdsk_softc *sc, struct vio_msg_tag *tag)
+{
+	switch(tag->stype) {
+		case VIO_SUBTYPE_INFO:
+			DPRINTF(("DATA/INFO/DRING_DATA\n"));
+			break;
+
+		case VIO_SUBTYPE_ACK:
+		{
+			struct scsipi_xfer *xs;
+			int cons;
+
+			cons = sc->sc_tx_cons;
+			while (sc->sc_vd->vd_desc[cons].hdr.dstate == VIO_DESC_DONE) {
+				xs = sc->sc_vsd[cons].vsd_xs;
+				if (ISSET(xs->xs_control, XS_CTL_POLL) == 0)
+					vdsk_complete_cmd(sc, xs, cons);
+				cons++;
+				cons &= (sc->sc_vd->vd_nentries - 1);
+			}
+			sc->sc_tx_cons = cons;
+			break;
+	}
+
+		case VIO_SUBTYPE_NACK:
+			DPRINTF(("DATA/NACK/DRING_DATA\n"));
+			break;
+
+		default:
+			DPRINTF(("DATA/0x%02x/DRING_DATA\n", tag->stype));
+			break;
+	}
+}
+
+void
+vdsk_ldc_reset(struct ldc_conn *lc)
+{
+
+	struct vdsk_softc *sc = lc->lc_sc;
+
+	sc->sc_vio_state = 0;
+}
+
+void
+vdsk_ldc_start(struct ldc_conn *lc)
+{
+
+	struct vdsk_softc *sc = lc->lc_sc;
+
+	vdsk_send_ver_info(sc, VDSK_MAJOR, VDSK_MINOR);
+}
+
+void
+vdsk_sendmsg(struct vdsk_softc *sc, void *msg, size_t len)
+{
+
+	struct ldc_conn *lc = &sc->sc_lc;
+	int err;
+
+	err = ldc_send_unreliable(lc, msg, len);
+	if (err)
+		printf("%s: ldc_send_unreliable: %d\n", __func__, err);
+}
+
+void
+vdsk_send_ver_info(struct vdsk_softc *sc, uint16_t major, uint16_t minor)
+{
+
+	struct vio_ver_info vi;
+
+	/* Allocate new session ID. */
+	sc->sc_local_sid = gettick();
+
+	bzero(&vi, sizeof(vi));
+	vi.tag.type = VIO_TYPE_CTRL;
+	vi.tag.stype = VIO_SUBTYPE_INFO;
+	vi.tag.stype_env = VIO_VER_INFO;
+	vi.tag.sid = sc->sc_local_sid;
+	vi.major = major;
+	vi.minor = minor;
+	vi.dev_class = VDEV_DISK;
+	vdsk_sendmsg(sc, &vi, sizeof(vi));
+
+	sc->sc_vio_state |= VIO_SND_VER_INFO;
+}
+
+void
+vdsk_send_attr_info(struct vdsk_softc *sc)
+{
+	struct vd_attr_info ai;
+
+	bzero(&ai, sizeof(ai));
+	ai.tag.type = VIO_TYPE_CTRL;
+	ai.tag.stype = VIO_SUBTYPE_INFO;
+	ai.tag.stype_env = VIO_ATTR_INFO;
+	ai.tag.sid = sc->sc_local_sid;
+	ai.xfer_mode = VIO_DRING_MODE;
+	ai.vdisk_block_size = DEV_BSIZE;
+	ai.max_xfer_sz = MAXPHYS / DEV_BSIZE;
+	vdsk_sendmsg(sc, &ai, sizeof(ai));
+
+	sc->sc_vio_state |= VIO_SND_ATTR_INFO;
+}
+
+void
+vdsk_send_dring_reg(struct vdsk_softc *sc)
+{
+	struct vio_dring_reg dr;
+
+	bzero(&dr, sizeof(dr));
+	dr.tag.type = VIO_TYPE_CTRL;
+	dr.tag.stype = VIO_SUBTYPE_INFO;
+	dr.tag.stype_env = VIO_DRING_REG;
+	dr.tag.sid = sc->sc_local_sid;
+	dr.dring_ident = 0;
+	dr.num_descriptors = sc->sc_vd->vd_nentries;
+	dr.descriptor_size = sizeof(struct vd_desc);
+	dr.options = VIO_TX_RING | VIO_RX_RING;
+	dr.ncookies = 1;
+	dr.cookie[0].addr = 0;
+	dr.cookie[0].size = PAGE_SIZE;
+	vdsk_sendmsg(sc, &dr, sizeof(dr));
+
+	sc->sc_vio_state |= VIO_SND_DRING_REG;
+};
+
+void
+vdsk_send_rdx(struct vdsk_softc *sc)
+{
+	struct vio_rdx rdx;
+
+	bzero(&rdx, sizeof(rdx));
+	rdx.tag.type = VIO_TYPE_CTRL;
+	rdx.tag.stype = VIO_SUBTYPE_INFO;
+	rdx.tag.stype_env = VIO_RDX;
+	rdx.tag.sid = sc->sc_local_sid;
+	vdsk_sendmsg(sc, &rdx, sizeof(rdx));
+
+	sc->sc_vio_state |= VIO_SND_RDX;
+}
+
+#if OPENBSD_BUSDMA
+struct vdsk_dring *
+vdsk_dring_alloc(bus_dma_tag_t t, int nentries)
+#else
+struct vdsk_dring *
+vdsk_dring_alloc(int nentries)
+#endif
+{
+
+	struct vdsk_dring *vd;
+	bus_size_t size;
+	vaddr_t va;
+#if OPENBSD_BUSDMA
+	int nsegs;
+#endif
+	int i;
+
+	vd = kmem_zalloc(sizeof(struct vdsk_dring), KM_NOSLEEP);
+	if (vd == NULL)
+		return NULL;
+
+	size = roundup(nentries * sizeof(struct vd_desc), PAGE_SIZE);
+
+#if OPENBSD_BUSDMA
+	if (bus_dmamap_create(t, size, 1, size, 0,
+	    BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &vd->vd_map) != 0)
+		return (NULL);
+
+	if (bus_dmamem_alloc(t, size, PAGE_SIZE, 0, &vd->vd_seg, 1,
+	    &nsegs, BUS_DMA_NOWAIT) != 0)
+		goto destroy;
+
+	if (bus_dmamem_map(t, &vd->vd_seg, 1, size, (void*)&va,
+	    BUS_DMA_NOWAIT) != 0)
+		goto free;
+
+	if (bus_dmamap_load(t, vd->vd_map, (void*)va, size, NULL,
+	    BUS_DMA_NOWAIT) != 0)
+		goto unmap;
+#else
+	va = (vaddr_t)kmem_zalloc(size, KM_NOSLEEP);
+#endif
+	vd->vd_desc = (struct vd_desc *)va;
+	vd->vd_nentries = nentries;
+	bzero(vd->vd_desc, nentries * sizeof(struct vd_desc));
+	for (i = 0; i < vd->vd_nentries; i++)
+		vd->vd_desc[i].hdr.dstate = VIO_DESC_FREE;
+	return (vd);
+
+#if OPENBSD_BUSDMA
+unmap:
+	bus_dmamem_unmap(t, (void*)va, size);
+free:
+	bus_dmamem_free(t, &vd->vd_seg, 1);
+destroy:
+	bus_dmamap_destroy(t, vd->vd_map);
+#endif
+	return (NULL);
+}
+
+#if OPENBSD_BUSDMA
+void
+vdsk_dring_free(bus_dma_tag_t t, struct vdsk_dring *vd)
+#else
+void
+vdsk_dring_free(struct vdsk_dring *vd)
+#endif
+{
+
+	bus_size_t size;
+
+	size = vd->vd_nentries * sizeof(struct vd_desc);
+	size = roundup(size, PAGE_SIZE);
+
+#if OPENBSD_BUSDMA
+	bus_dmamap_unload(t, vd->vd_map);
+
+	bus_dmamem_unmap(t, (caddr_t)vd->vd_desc, size);
+	bus_dmamem_free(t, &vd->vd_seg, 1);
+	bus_dmamap_destroy(t, vd->vd_map);
+#else
+	kmem_free(vd->vd_desc, size);
+#endif
+	kmem_free(vd, size);
+}
+
+void *
+vdsk_io_get(void *xsc)
+{
+
+	panic("%s: not verified yet", __FUNCTION__);
+
+	struct vdsk_softc *sc = xsc;
+	void *rv = sc; /* just has to be !NULL */
+	int s;
+
+	s = splbio();
+	if (sc->sc_vio_state != VIO_ESTABLISHED ||
+	    sc->sc_tx_cnt >= sc->sc_vd->vd_nentries)
+		rv = NULL;
+	else
+		sc->sc_tx_cnt++;
+	splx(s);
+
+	return (rv);
+}
+
+void
+vdsk_io_put(void *xsc, void *io)
+{
+
+	panic("%s: not verified yet", __FUNCTION__);
+
+	struct vdsk_softc *sc = xsc;
+	int s;
+
+#ifdef DIAGNOSTIC
+	if (sc != io)
+		panic("vsdk_io_put: unexpected io");
+#endif
+
+	s = splbio();
+	sc->sc_tx_cnt--;
+	splx(s);
+}
+
+void
+vdsk_scsi_cmd(struct vdsk_softc *sc, struct scsipi_xfer *xs)
+{
+	int timeout, s;
+	int desc;
+
+	DPRINTF(("vdsk_scsi_cmd() opcode %x\n", xs->cmd->opcode));
+
+	switch (xs->cmd->opcode) {
+
+		case SCSI_READ_6_COMMAND:
+		case READ_10:
+		case READ_12:
+		case READ_16:
+		case SCSI_WRITE_6_COMMAND:
+		case WRITE_10:
+		case WRITE_12:
+		case WRITE_16:
+		case SCSI_SYNCHRONIZE_CACHE_10:
+			break;
+
+		case INQUIRY:
+			vdsk_scsi_inq(sc, xs);
+			return;
+
+		case READ_CAPACITY_10:
+			vdsk_scsi_capacity(sc, xs);
+			return;
+
+		case READ_CAPACITY_16:
+			vdsk_scsi_capacity16(sc, xs);
+			return;
+
+		case SCSI_TEST_UNIT_READY:
+		case START_STOP:
+		case SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL:
+		case SCSI_MODE_SENSE_6:
+			vdsk_scsi_done(xs, XS_NOERROR);
+			return;
+
+		case SCSI_MODE_SENSE_10:
+		case READ_TOC:
+			vdsk_scsi_done(xs, XS_DRIVER_STUFFUP);
+			return;
+
+		default:
+			panic("%s unhandled cmd 0x%02x\n", 
+			      __func__, xs->cmd->opcode);
+	}
+
+	s = splbio();
+	desc = vdsk_submit_cmd(sc, xs);
+
+	if (!ISSET(xs->xs_control, XS_CTL_POLL)) {
+		splx(s);
+		return;
+	}
+	timeout = 1000;
+	do {
+		if (sc->sc_vd->vd_desc[desc].hdr.dstate == VIO_DESC_DONE)
+			break;
+
+		delay(1000);
+	} while(--timeout > 0);
+	if (sc->sc_vd->vd_desc[desc].hdr.dstate == VIO_DESC_DONE) {
+		vdsk_complete_cmd(sc, xs, desc);
+	} else {
+		ldc_reset(&sc->sc_lc);
+		vdsk_scsi_done(xs, XS_TIMEOUT);
+	}
+	splx(s);
+}
+
+int
+vdsk_submit_cmd(struct vdsk_softc *sc, struct scsipi_xfer *xs)
+{
+	struct ldc_map *map = sc->sc_lm;
+	struct vio_dring_msg dm;
+	struct scsi_rw_6 *rw6;
+	struct scsipi_rw_10 *rw10;
+	struct scsipi_rw_12 *rw12;
+	struct scsipi_rw_16 *rw16;
+	u_int64_t lba = 0;
+	uint8_t operation;
+	vaddr_t va;
+	paddr_t pa;
+	psize_t nbytes;
+	int len, ncookies;
+	int desc;
+
+	switch (xs->cmd->opcode) {
+
+		case SCSI_READ_6_COMMAND:
+		case READ_10:
+		case READ_12:
+		case READ_16:
+			operation = VD_OP_BREAD;
+			break;
+
+		case SCSI_WRITE_6_COMMAND:
+		case WRITE_10:
+		case WRITE_12:
+		case WRITE_16:
+			operation = VD_OP_BWRITE;
+			break;
+
+		case SCSI_SYNCHRONIZE_CACHE_10:
+			operation = VD_OP_FLUSH;
+			break;
+
+		default:
+			panic("%s  unhandled cmd opcode 0x%x", 
+			      __func__, xs->cmd->opcode);
+	}
+
+	/*
+	 * READ/WRITE/SYNCHRONIZE commands. SYNCHRONIZE CACHE has same
+	 * layout as 10-byte READ/WRITE commands.
+	 */
+	if (xs->cmdlen == 6) {
+		rw6 = (struct scsi_rw_6 *)xs->cmd;
+		lba = _3btol(rw6->addr) & (SRW_TOPADDR << 16 | 0xffff);
+	} else if (xs->cmdlen == 10) {
+		rw10 = (struct scsipi_rw_10 *)xs->cmd;
+		lba = _4btol(rw10->addr);
+	} else if (xs->cmdlen == 12) {
+		rw12 = (struct scsipi_rw_12 *)xs->cmd;
+		lba = _4btol(rw12->addr);
+	} else if (xs->cmdlen == 16) {
+		rw16 = (struct scsipi_rw_16 *)xs->cmd;
+		lba = _8btol(rw16->addr);
+	}
+
+	DPRINTF(("lba = %lu\n", lba));
+
+	desc = sc->sc_tx_prod;
+	ncookies = 0;
+	len = xs->datalen;
+	va = (vaddr_t)xs->data;
+	while (len > 0) {
+	  DPRINTF(("len = %u\n", len));
+		KASSERT(ncookies < MAXPHYS / PAGE_SIZE);
+		pa = 0;
+		pmap_extract(pmap_kernel(), va, &pa);
+		while (map->lm_slot[map->lm_next].entry != 0) {
+			map->lm_next++;
+			map->lm_next &= (map->lm_nentries - 1);
+		}
+		map->lm_slot[map->lm_next].entry = (pa & LDC_MTE_RA_MASK);
+		map->lm_slot[map->lm_next].entry |= LDC_MTE_CPR | LDC_MTE_CPW;
+		map->lm_slot[map->lm_next].entry |= LDC_MTE_IOR | LDC_MTE_IOW;
+		map->lm_slot[map->lm_next].entry |= LDC_MTE_R | LDC_MTE_W;
+		map->lm_count++;
+
+		nbytes = MIN(len, PAGE_SIZE - (pa & PAGE_MASK));
+
+		sc->sc_vd->vd_desc[desc].cookie[ncookies].addr =
+		    map->lm_next << PAGE_SHIFT | (pa & PAGE_MASK);
+		sc->sc_vd->vd_desc[desc].cookie[ncookies].size = nbytes;
+
+		sc->sc_vsd[desc].vsd_map_idx[ncookies] = map->lm_next;
+		va += nbytes;
+		len -= nbytes;
+		ncookies++;
+	}
+	if (ISSET(xs->xs_control, XS_CTL_POLL) == 0)
+		sc->sc_vd->vd_desc[desc].hdr.ack = 1;
+	else
+		sc->sc_vd->vd_desc[desc].hdr.ack = 0;
+	sc->sc_vd->vd_desc[desc].operation = operation;
+	sc->sc_vd->vd_desc[desc].slice = VD_SLICE_NONE;
+	sc->sc_vd->vd_desc[desc].status = 0xffffffff;
+	sc->sc_vd->vd_desc[desc].offset = lba;
+	sc->sc_vd->vd_desc[desc].size = xs->datalen;
+	sc->sc_vd->vd_desc[desc].ncookies = ncookies;
+
+	membar_Sync();
+
+	sc->sc_vd->vd_desc[desc].hdr.dstate = VIO_DESC_READY;
+
+	sc->sc_vsd[desc].vsd_xs = xs;
+	sc->sc_vsd[desc].vsd_ncookies = ncookies;
+
+	sc->sc_tx_prod++;
+	sc->sc_tx_prod &= (sc->sc_vd->vd_nentries - 1);
+
+	bzero(&dm, sizeof(dm));
+	dm.tag.type = VIO_TYPE_DATA;
+	dm.tag.stype = VIO_SUBTYPE_INFO;
+	dm.tag.stype_env = VIO_DRING_DATA;
+	dm.tag.sid = sc->sc_local_sid;
+	dm.seq_no = sc->sc_seq_no++;
+	dm.dring_ident = sc->sc_dring_ident;
+	dm.start_idx = dm.end_idx = desc;
+	vdsk_sendmsg(sc, &dm, sizeof(dm));
+
+	return desc;
+}
+
+void
+vdsk_complete_cmd(struct vdsk_softc *sc, struct scsipi_xfer *xs, int desc)
+{
+	struct ldc_map *map = sc->sc_lm;
+	int cookie, idx;
+	int error;
+
+	cookie = 0;
+	while (cookie < sc->sc_vsd[desc].vsd_ncookies) {
+		idx = sc->sc_vsd[desc].vsd_map_idx[cookie++];
+		map->lm_slot[idx].entry = 0;
+		map->lm_count--;
+	}
+
+	error = XS_NOERROR;
+	if (sc->sc_vd->vd_desc[desc].status != 0)
+		error = XS_DRIVER_STUFFUP;
+	xs->resid = xs->datalen -
+		sc->sc_vd->vd_desc[desc].size;
+
+	/* 
+	 * scsi_done() called by vdsk_scsi_done() requires 
+	 * the kernel to be locked
+	 */
+	KERNEL_LOCK(1, curlwp);
+	vdsk_scsi_done(xs, error);
+	KERNEL_UNLOCK_ONE(curlwp);
+
+	sc->sc_vd->vd_desc[desc].hdr.dstate = VIO_DESC_FREE;
+
+}
+
+void
+vdsk_scsi_inq(struct vdsk_softc *sc, struct scsipi_xfer *xs)
+{
+
+	vdsk_scsi_inquiry(sc, xs);
+}
+
+void
+vdsk_scsi_inquiry(struct vdsk_softc *sc, struct scsipi_xfer *xs)
+{
+
+	struct scsipi_inquiry_data inq;
+	char buf[5];
+
+	bzero(&inq, sizeof(inq));
+
+	switch (sc->sc_vd_mtype) {
+		case VD_MEDIA_TYPE_CD:
+		case VD_MEDIA_TYPE_DVD:
+			inq.device = T_CDROM;
+			break;
+
+		case VD_MEDIA_TYPE_FIXED:
+		default:
+			inq.device = T_DIRECT;
+			break;
+	}
+
+	inq.version = 0x05; /* SPC-3 */
+	inq.response_format = 2;
+	inq.additional_length = 32;
+	inq.flags3 |= SID_CmdQue;
+	bcopy("SUN     ", inq.vendor, sizeof(inq.vendor));
+	bcopy("Virtual Disk    ", inq.product, sizeof(inq.product));
+	snprintf(buf, sizeof(buf), "%u.%u ", sc->sc_major, sc->sc_minor);
+	bcopy(buf, inq.revision, sizeof(inq.revision));
+
+	bcopy(&inq, xs->data, MIN(sizeof(inq), xs->datalen));
+
+	vdsk_scsi_done(xs, XS_NOERROR);
+}
+
+void
+vdsk_scsi_capacity(struct vdsk_softc *sc, struct scsipi_xfer *xs)
+{
+
+	struct scsipi_read_capacity_10_data rcd;
+	uint64_t capacity;
+
+	bzero(&rcd, sizeof(rcd));
+
+	capacity = sc->sc_vdisk_size - 1;
+	if (capacity > 0xffffffff)
+		capacity = 0xffffffff;
+
+	_lto4b(capacity, rcd.addr);
+	_lto4b(sc->sc_vdisk_block_size, rcd.length);
+
+	DPRINTF(("%s() capacity %lu  block size %u\n",
+		 __FUNCTION__, capacity, sc->sc_vdisk_block_size));
+
+	bcopy(&rcd, xs->data, MIN(sizeof(rcd), xs->datalen));
+
+	vdsk_scsi_done(xs, XS_NOERROR);
+}
+
+void
+vdsk_scsi_capacity16(struct vdsk_softc *sc, struct scsipi_xfer *xs)
+{
+
+	struct scsipi_read_capacity_16_data rcd;
+
+	bzero(&rcd, sizeof(rcd));
+
+	_lto8b(sc->sc_vdisk_size - 1, rcd.addr);
+	_lto4b(sc->sc_vdisk_block_size, rcd.length);
+
+	DPRINTF(("%s() capacity %lu  block size %u\n",
+		 __FUNCTION__, capacity, sc->sc_vdisk_block_size));
+
+	bcopy(&rcd, xs->data, MIN(sizeof(rcd), xs->datalen));
+
+	vdsk_scsi_done(xs, XS_NOERROR);
+}
+
+void
+vdsk_scsi_done(struct scsipi_xfer *xs, int error)
+{
+
+	xs->error = error;
+
+	scsipi_done(xs);
+}
+

Reply via email to