Author: mav
Date: Mon Mar 6 06:30:55 2017
New Revision: 314747
URL: https://svnweb.freebsd.org/changeset/base/314747
Log:
MFC r314208: Respecting r314204 tighten ATIO cleanup requirements.
Every ATIO must complete with either successfully sent status or XPT_ABORT.
Modified:
stable/10/sys/dev/isp/isp_freebsd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/10/sys/dev/isp/isp_freebsd.c Mon Mar 6 06:30:27 2017
(r314746)
+++ stable/10/sys/dev/isp/isp_freebsd.c Mon Mar 6 06:30:55 2017
(r314747)
@@ -2289,6 +2289,8 @@ isp_handle_platform_ctio(ispsoftc_t *isp
return;
}
if (ct->ct_nphdl == CT_HBA_RESET) {
+ sentstatus = (ccb->ccb_h.flags & CAM_SEND_STATUS) &&
+ (atp->sendst == 0);
failure = CAM_UNREC_HBA_ERROR;
} else {
sentstatus = ct->ct_flags & CT7_SENDSTATUS;
@@ -2311,6 +2313,8 @@ isp_handle_platform_ctio(ispsoftc_t *isp
return;
}
if (ct->ct_status == CT_HBA_RESET) {
+ sentstatus = (ccb->ccb_h.flags & CAM_SEND_STATUS) &&
+ (atp->sendst == 0);
failure = CAM_UNREC_HBA_ERROR;
} else {
sentstatus = ct->ct_flags & CT2_SENDSTATUS;
@@ -2356,9 +2360,10 @@ isp_handle_platform_ctio(ispsoftc_t *isp
}
/*
- * If we sent status or error happened, we are done with this ATIO.
+ * We are done with this ATIO if we successfully sent status.
+ * In all other cases expect either another CTIO or XPT_ABORT.
*/
- if (sentstatus || !ok)
+ if (ok && sentstatus)
isp_put_atpd(isp, bus, atp);
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
