Author: scottl
Date: Thu May 11 15:19:04 2017
New Revision: 318188
URL: https://svnweb.freebsd.org/changeset/base/318188
Log:
Improve error messages during command timeout for the mpr and mps
drivers.
Sponsored by: Netflix
Modified:
head/sys/dev/mpr/mpr_sas.c
head/sys/dev/mps/mps_sas.c
Modified: head/sys/dev/mpr/mpr_sas.c
==============================================================================
--- head/sys/dev/mpr/mpr_sas.c Thu May 11 13:50:16 2017 (r318187)
+++ head/sys/dev/mpr/mpr_sas.c Thu May 11 15:19:04 2017 (r318188)
@@ -1562,7 +1562,7 @@ mprsas_send_abort(struct mpr_softc *sc,
return -1;
}
- mprsas_log_command(tm, MPR_RECOVERY|MPR_INFO,
+ mprsas_log_command(cm, MPR_RECOVERY|MPR_INFO,
"Aborting command %p\n", cm);
req = (MPI2_SCSI_TASK_MANAGE_REQUEST *)tm->cm_req;
@@ -1594,7 +1594,7 @@ mprsas_send_abort(struct mpr_softc *sc,
err = mpr_map_command(sc, tm);
if (err)
- mprsas_log_command(tm, MPR_RECOVERY,
+ mpr_dprint(sc, MPR_RECOVERY,
"error %d sending abort for cm %p SMID %u\n",
err, cm, req->TaskMID);
return err;
@@ -1635,8 +1635,9 @@ mprsas_scsiio_timeout(void *data)
targ = cm->cm_targ;
targ->timeouts++;
- mprsas_log_command(cm, MPR_ERROR, "command timeout cm %p ccb %p target "
- "%u, handle(0x%04x)\n", cm, cm->cm_ccb, targ->tid, targ->handle);
+ mprsas_log_command(cm, MPR_ERROR, "command timeout %d cm %p target "
+ "%u, handle(0x%04x)\n", cm->cm_ccb->ccb_h.timeout, cm, targ->tid,
+ targ->handle);
if (targ->encl_level_valid) {
mpr_dprint(sc, MPR_ERROR, "At enclosure level %d, slot %d, "
"connector name (%4s)\n", targ->encl_level, targ->encl_slot,
Modified: head/sys/dev/mps/mps_sas.c
==============================================================================
--- head/sys/dev/mps/mps_sas.c Thu May 11 13:50:16 2017 (r318187)
+++ head/sys/dev/mps/mps_sas.c Thu May 11 15:19:04 2017 (r318188)
@@ -1505,7 +1505,7 @@ mpssas_send_abort(struct mps_softc *sc,
return -1;
}
- mpssas_log_command(tm, MPS_RECOVERY|MPS_INFO,
+ mpssas_log_command(cm, MPS_RECOVERY|MPS_INFO,
"Aborting command %p\n", cm);
req = (MPI2_SCSI_TASK_MANAGE_REQUEST *)tm->cm_req;
@@ -1536,7 +1536,7 @@ mpssas_send_abort(struct mps_softc *sc,
err = mps_map_command(sc, tm);
if (err)
- mpssas_log_command(tm, MPS_RECOVERY,
+ mps_dprint(sc, MPS_RECOVERY,
"error %d sending abort for cm %p SMID %u\n",
err, cm, req->TaskMID);
return err;
@@ -1574,12 +1574,13 @@ mpssas_scsiio_timeout(void *data)
return;
}
- mpssas_log_command(cm, MPS_INFO, "command timeout cm %p ccb %p\n",
- cm, cm->cm_ccb);
-
targ = cm->cm_targ;
targ->timeouts++;
+ mpssas_log_command(cm, MPS_ERROR, "command timeout %d cm %p target "
+ "%u, handle(0x%04x)\n", cm->cm_ccb->ccb_h.timeout, cm, targ->tid,
+ targ->handle);
+
/* XXX first, check the firmware state, to see if it's still
* operational. if not, do a diag reset.
*/
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
