diff options
| author | asomers <asomers@FreeBSD.org> | 2016-01-11 21:12:49 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2016-01-11 21:12:49 +0000 |
| commit | c726cf023367deda48e442a5e909971b55e3b2d8 (patch) | |
| tree | 0af5b31b122c45b569518e83e01f376d28bbc958 /sys/dev/mpr/mpr_sas_lsi.c | |
| parent | cd967a6f7f31639f1575aae1d53fa28a77052894 (diff) | |
| download | FreeBSD-src-c726cf023367deda48e442a5e909971b55e3b2d8.zip FreeBSD-src-c726cf023367deda48e442a5e909971b55e3b2d8.tar.gz | |
MFC r292218
Don't retry SAS commands in response to protocol errors
sys/dev/mpr/mpr_sas_lsi.c
sys/dev/mps/mps_sas_lsi.c
When mp[rs]sas_get_sata_identify returns
MPI2_IOCSTATUS_SCSI_PROTOCOL_ERROR, don't bother retrying. Protocol
errors aren't likely to be fixed by sleeping.
Without this change, a system that generated may protocol errors due
to signal integrity issues was taking more than an hour to boot, due
to all the retries.
Diffstat (limited to 'sys/dev/mpr/mpr_sas_lsi.c')
| -rw-r--r-- | sys/dev/mpr/mpr_sas_lsi.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/mpr/mpr_sas_lsi.c b/sys/dev/mpr/mpr_sas_lsi.c index 7d6ef70..b2ffe96 100644 --- a/sys/dev/mpr/mpr_sas_lsi.c +++ b/sys/dev/mpr/mpr_sas_lsi.c @@ -885,7 +885,13 @@ mprsas_get_sas_address_for_sata_disk(struct mpr_softc *sc, ioc_status = le16toh(mpi_reply.IOCStatus) & MPI2_IOCSTATUS_MASK; sas_status = mpi_reply.SASStatus; - if (ioc_status != MPI2_IOCSTATUS_SUCCESS) { + switch (ioc_status) { + case MPI2_IOCSTATUS_SUCCESS: + break; + case MPI2_IOCSTATUS_SCSI_PROTOCOL_ERROR: + /* No sense sleeping. this error won't get better */ + break; + default: if (sc->spinup_wait_time > 0) { mpr_dprint(sc, MPR_INFO, "Sleeping %d seconds " "after SATA ID error to wait for spinup\n", @@ -894,8 +900,10 @@ mprsas_get_sas_address_for_sata_disk(struct mpr_softc *sc, "mprid", sc->spinup_wait_time * hz); } } - } while (((rc && (rc != EWOULDBLOCK)) || ioc_status || sas_status) && - (try_count < 5)); + } while (((rc && (rc != EWOULDBLOCK)) || + (ioc_status && + (ioc_status != MPI2_IOCSTATUS_SCSI_PROTOCOL_ERROR)) + || sas_status) && (try_count < 5)); if (rc == 0 && !ioc_status && !sas_status) { mpr_dprint(sc, MPR_MAPPING, "%s: got SATA identify " |
