Author: mav
Date: Sun Mar 12 06:18:41 2017
New Revision: 315138
URL: https://svnweb.freebsd.org/changeset/base/315138
Log:
MFC r314307: Add support for SIMs without autosense.
If we asked to send sense data by setting CAM_SEND_SENSE, but SIM didn't
confirm transmission by setting CAM_SENT_SENSE, assume it was not sent.
Queue the I/O back to CTL for later REQUEST SENSE with ctl_queue_sense().
This is needed for error reporting on SPI HBAs like ahc(4)/ahd(4).
Modified:
stable/10/sys/cam/ctl/scsi_ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/scsi_ctl.c Sun Mar 12 06:18:08 2017
(r315137)
+++ stable/10/sys/cam/ctl/scsi_ctl.c Sun Mar 12 06:18:41 2017
(r315138)
@@ -1229,6 +1229,20 @@ ctlfedone(struct cam_periph *periph, uni
* 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) {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
