diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-01-16 17:50:56 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-01-16 17:50:56 +0000 |
| commit | cc3079b33ae68e34db6f44dad43811e0cee531e9 (patch) | |
| tree | e0e419c49d72425afe96ee988dbb349617e70950 /sys/arch/sparc64/dev | |
| parent | 5f4209f4dc2ab2872c12036f4f7c789d5eeea49c (diff) | |
Make transfers bigger than PAGE_SIZE work.
Diffstat (limited to 'sys/arch/sparc64/dev')
| -rw-r--r-- | sys/arch/sparc64/dev/vdsk.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c index ac26ec845fd..73cb229acf0 100644 --- a/sys/arch/sparc64/dev/vdsk.c +++ b/sys/arch/sparc64/dev/vdsk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vdsk.c,v 1.3 2009/01/16 16:59:58 kettenis Exp $ */ +/* $OpenBSD: vdsk.c,v 1.4 2009/01/16 17:50:55 kettenis Exp $ */ /* * Copyright (c) 2009 Mark Kettenis * @@ -634,6 +634,8 @@ vdsk_rx_vio_data(struct vdsk_softc *sc, struct vio_msg *vm) void vdsk_rx_vio_dring_data(struct vdsk_softc *sc, struct vio_msg_tag *tag) { + struct vio_dring_msg *dm = (struct vio_dring_msg *)tag; + switch(tag->stype) { case VIO_SUBTYPE_INFO: DPRINTF(("DATA/INFO/DRING_DATA\n")); @@ -677,9 +679,16 @@ vdsk_rx_vio_dring_data(struct vdsk_softc *sc, struct vio_msg_tag *tag) case VIO_SUBTYPE_NACK: DPRINTF(("DATA/NACK/DRING_DATA\n")); - printf("state 0x%02x\n", sc->sc_vd->vd_desc[0].hdr.dstate); - printf("status 0x%04x\n", sc->sc_vd->vd_desc[0].status); - printf("size 0x%04x\n", sc->sc_vd->vd_desc[0].size); + { + uint64_t *msg = (uint64_t *)tag; + int i, idx; + for (i = 0; i < 7; i++) + printf("word %d: %llx\n", i + 1, msg[i]); + idx = dm->start_idx; + printf("state 0x%02x\n", sc->sc_vd->vd_desc[idx].hdr.dstate); + printf("status 0x%04x\n", sc->sc_vd->vd_desc[idx].status); + printf("size 0x%04x\n", sc->sc_vd->vd_desc[idx].size); + } break; default: @@ -948,6 +957,7 @@ vdsk_scsi_cmd(struct scsi_xfer *xs) sc->sc_vsd[desc].vsd_map_idx[ncookies] = map->lm_next; va += PAGE_SIZE; len -= PAGE_SIZE; + ncookies++; } sc->sc_vd->vd_desc[desc].hdr.ack = 1; @@ -956,7 +966,7 @@ vdsk_scsi_cmd(struct scsi_xfer *xs) 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 = 1; + sc->sc_vd->vd_desc[desc].ncookies = ncookies; membar(Sync); sc->sc_vd->vd_desc[desc].hdr.dstate = VIO_DESC_READY; |