 @@ -1,34 +1,34 @@
-/*	$NetBSD: vioscsi.c,v 1.7 2016/10/04 18:20:49 jdolecek Exp $	*/
+/*	$NetBSD: vioscsi.c,v 1.8 2016/10/04 18:23:24 jdolecek Exp $	*/
 /*	$OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Google Inc.
+ *
  * 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.7 2016/10/04 18:20:49 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.8 2016/10/04 18:23:24 jdolecek Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/buf.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/vioscsireg.h>
 #include <dev/pci/virtiovar.h>
 @@ -209,27 +209,39 @@ vioscsi_scsipi_request(struct scsipi_cha
+{
 	struct vioscsi_softc *sc =
 	    device_private(chan->chan_adapter->adapt_dev);
 	struct virtio_softc *vsc = device_private(device_parent(sc->sc_dev));
 	struct scsipi_xfer *xs;
 	struct scsipi_periph *periph;
 	struct vioscsi_req *vr;
 	struct virtio_scsi_req_hdr *req;
 	struct virtqueue *vq = &sc->sc_vqs[2];
 	int slot, error;
 	DPRINTF(("%s: enter\n", __func__));
-	if (request != ADAPTER_REQ_RUN_XFER) {
+	switch (request) {
 	case ADAPTER_REQ_RUN_XFER:
 		break;
 	case ADAPTER_REQ_SET_XFER_MODE:
+	{
 		struct scsipi_xfer_mode *xm = arg;
 		xm->xm_mode = PERIPH_CAP_TQING;
 		xm->xm_period = 0;
 		xm->xm_offset = 0;
 		scsipi_async_event(chan, ASYNC_EVENT_XFER_MODE, xm);
 		return;
+	}
 	default:
 		DPRINTF(("%s: unhandled %d\n", __func__, request));
 		return;
+	}
 	xs = arg;
 	periph = xs->xs_periph;
 	vr = vioscsi_req_get(sc);
 	/*
 	 * This can happen when we run out of queue slots.
 	 */
 	if (vr == NULL) {
 		xs->error = XS_RESOURCE_SHORTAGE;
 @@ -250,26 +262,49 @@ vioscsi_scsipi_request(struct scsipi_cha
 	if (periph->periph_target >= 256 || periph->periph_lun >= 16384) {
 		DPRINTF(("%s: bad target %u or lun %u\n", __func__,
 		    periph->periph_target, periph->periph_lun));
 		goto stuffup;
+	}
 	req->lun[0] = 1;
 	req->lun[1] = periph->periph_target - 1;
 	req->lun[2] = 0x40 | (periph->periph_lun >> 8);
 	req->lun[3] = periph->periph_lun;
 	memset(req->lun + 4, 0, 4);
 	DPRINTF(("%s: command for %u:%u at slot %d\n", __func__,
 	    periph->periph_target - 1, periph->periph_lun, slot));
 	/* tag */
 	switch (XS_CTL_TAGTYPE(xs)) {
 	case XS_CTL_HEAD_TAG:
 		req->task_attr = VIRTIO_SCSI_S_HEAD;
 		break;
 #if 0	/* XXX */
 	case XS_CTL_ACA_TAG:
 		req->task_attr = VIRTIO_SCSI_S_ACA;
 		break;
 #endif
 	case XS_CTL_ORDERED_TAG:
 		req->task_attr = VIRTIO_SCSI_S_ORDERED;
 		break;
 	case XS_CTL_SIMPLE_TAG:
 	default:
 		req->task_attr = VIRTIO_SCSI_S_SIMPLE;
 		break;
+	}
 	req->id = (intptr_t)vr;
 	if ((size_t)xs->cmdlen > sizeof(req->cdb)) {
 		DPRINTF(("%s: bad cmdlen %zu > %zu\n", __func__,
 		    (size_t)xs->cmdlen, sizeof(req->cdb)));
 		goto stuffup;
+	}
 	memset(req->cdb, 0, sizeof(req->cdb));
 	memcpy(req->cdb, xs->cmd, xs->cmdlen);
 	error = bus_dmamap_load(vsc->sc_dmat, vr->vr_data,
 	    xs->data, xs->datalen, NULL, XS2DMA(xs));
 	switch (error) {
 	case 0: