mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

- Initialize qcb flags in ida_construct_qcb() with respect to DMA direction.

Browse Source 
- Print operation type, if known in hard/soft error message in ida_done().
- NULL qcb struct bio pointer in ida_done().
This commit is contained in:
Matthew N. Dodd 2004-01-12 12:31:03 +00:00
parent 79ae25f61f
commit 68d2672d3b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=124423
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/ida/ida.c
View File

@ -393,7 +393,7 @@ ida_construct_qcb(struct ida_softc *ida)
bioq_remove(&ida->bio_queue, bp); bioq_remove(&ida->bio_queue, bp);
qcb->buf = bp; qcb->buf = bp;
qcb->flags = 0; qcb->flags = bp->bio_cmd == BIO_READ ? DMA_DATA_IN : DMA_DATA_OUT;
hwqcb = qcb->hwqcb; hwqcb = qcb->hwqcb;
bzero(hwqcb, sizeof(struct ida_hdr) + sizeof(struct ida_req)); bzero(hwqcb, sizeof(struct ida_hdr) + sizeof(struct ida_req));
@ -512,11 +512,22 @@ ida_done(struct ida_softc *ida, struct ida_qcb *qcb)
bus_dmamap_unload(ida->buffer_dmat, qcb->dmamap); bus_dmamap_unload(ida->buffer_dmat, qcb->dmamap);
} }
if (qcb->hwqcb->req.error & SOFT_ERROR) if (qcb->hwqcb->req.error & SOFT_ERROR) {
device_printf(ida->dev, "soft error\n"); if (qcb->buf)
device_printf(ida->dev, "soft %s error\n",
qcb->buf->bio_cmd == BIO_READ ?
"read" : "write");
else
device_printf(ida->dev, "soft error\n");
}
if (qcb->hwqcb->req.error & HARD_ERROR) { if (qcb->hwqcb->req.error & HARD_ERROR) {
error = 1; error = 1;
device_printf(ida->dev, "hard error\n"); if (qcb->buf)
device_printf(ida->dev, "hard %s error\n",
qcb->buf->bio_cmd == BIO_READ ?
"read" : "write");
else
device_printf(ida->dev, "hard error\n");
} }
if (qcb->hwqcb->req.error & CMD_REJECTED) { if (qcb->hwqcb->req.error & CMD_REJECTED) {
error = 1; error = 1;
@ -533,6 +544,7 @@ ida_done(struct ida_softc *ida, struct ida_qcb *qcb)
} }
qcb->state = QCB_FREE; qcb->state = QCB_FREE;
qcb->buf = NULL;
SLIST_INSERT_HEAD(&ida->free_qcbs, qcb, link.sle); SLIST_INSERT_HEAD(&ida->free_qcbs, qcb, link.sle);
ida_construct_qcb(ida); ida_construct_qcb(ida);
} }