diff options
| author | brooks <brooks@FreeBSD.org> | 2013-10-18 15:24:18 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-10-18 15:24:18 +0000 |
| commit | 2c64db60d774334e0a7d62c6f1ed6e99f5141bf5 (patch) | |
| tree | 90c52eced277092c263f779aff6aa0ba6536933d /sys/dev/altera/sdcard | |
| parent | 3ccfe0d54448cb218d12f6d0b8057d2afe4b7af1 (diff) | |
| download | FreeBSD-src-2c64db60d774334e0a7d62c6f1ed6e99f5141bf5.zip FreeBSD-src-2c64db60d774334e0a7d62c6f1ed6e99f5141bf5.tar.gz | |
MFP4:
Change 227594 by brooks@brooks_zenith on 2013/04/11 17:10:14
When we fail, print the error that occured if we are giving
up or if bootverbose is set.
MFC after: 3 days
Sponsored by: DARPA/AFRL
Diffstat (limited to 'sys/dev/altera/sdcard')
| -rw-r--r-- | sys/dev/altera/sdcard/altera_sdcard_io.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/dev/altera/sdcard/altera_sdcard_io.c b/sys/dev/altera/sdcard/altera_sdcard_io.c index b256c0b..55d2c4a 100644 --- a/sys/dev/altera/sdcard/altera_sdcard_io.c +++ b/sys/dev/altera/sdcard/altera_sdcard_io.c @@ -390,20 +390,23 @@ altera_sdcard_io_complete(struct altera_sdcard_softc *sc, uint16_t asr) break; } if (error) { + sc->as_retriesleft--; + if (sc->as_retriesleft == 0 || bootverbose) + device_printf(sc->as_dev, "%s: %s operation block %ju " + "length %ju failed; asr 0x%08x (rr1: 0x%04x)%s\n", + __func__, bp->bio_cmd == BIO_READ ? "BIO_READ" : + (bp->bio_cmd == BIO_WRITE ? "BIO_WRITE" : + "unknown"), + bp->bio_pblkno, bp->bio_bcount, asr, rr1, + sc->as_retriesleft != 0 ? " retrying" : ""); /* * This attempt experienced an error; possibly retry. */ - sc->as_retriesleft--; if (sc->as_retriesleft != 0) { sc->as_flags |= ALTERA_SDCARD_FLAG_IOERROR; altera_sdcard_io_start_internal(sc, bp); return (0); } - device_printf(sc->as_dev, "%s: %s operation block %ju length " - "%ju failed; asr 0x%08x (rr1: 0x%04x)\n", __func__, - bp->bio_cmd == BIO_READ ? "BIO_READ" : - (bp->bio_cmd == BIO_WRITE ? "BIO_WRITE" : "unknown"), - bp->bio_pblkno, bp->bio_bcount, asr, rr1); sc->as_flags &= ~ALTERA_SDCARD_FLAG_IOERROR; } else { /* |
