Module Name: src Committed By: jdolecek Date: Tue Oct 4 18:23:24 UTC 2016
Modified Files: src/sys/dev/pci: vioscsi.c Log Message: react on ADAPTER_REQ_SET_XFER_MODE so that we set tagged queuing pass tag type and set id To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/vioscsi.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/dev/pci/vioscsi.c diff -u src/sys/dev/pci/vioscsi.c:1.7 src/sys/dev/pci/vioscsi.c:1.8 --- src/sys/dev/pci/vioscsi.c:1.7 Tue Oct 4 18:20:49 2016 +++ src/sys/dev/pci/vioscsi.c Tue Oct 4 18:23:24 2016 @@ -1,4 +1,4 @@ -/* $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 $ */ /* @@ -18,7 +18,7 @@ */ #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> @@ -219,7 +219,19 @@ vioscsi_scsipi_request(struct scsipi_cha 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; } @@ -260,6 +272,29 @@ vioscsi_scsipi_request(struct scsipi_cha 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)));