summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/cam/ctl/scsi_ctl.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 7e56249..5eeac4b 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -1229,6 +1229,20 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
* datamove done routine.
*/
if ((io->io_hdr.flags & CTL_FLAG_DMA_INPROG) == 0) {
+ /*
+ * If we asked to send sense data but it wasn't sent,
+ * queue the I/O back to CTL for later REQUEST SENSE.
+ */
+ if ((done_ccb->ccb_h.flags & CAM_SEND_SENSE) != 0 &&
+ (done_ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP &&
+ (done_ccb->ccb_h.status & CAM_SENT_SENSE) == 0 &&
+ (io = ctl_alloc_io_nowait(bus_softc->port.ctl_pool_ref)) != NULL) {
+ PRIV_INFO(io) = PRIV_INFO(
+ (union ctl_io *)atio->ccb_h.io_ptr);
+ ctl_queue_sense(atio->ccb_h.io_ptr);
+ atio->ccb_h.io_ptr = io;
+ }
+
/* Abort ATIO if CTIO sending status has failed. */
if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) !=
CAM_REQ_CMP) {
OpenPOWER on IntegriCloud