diff options
author | mav <mav@FreeBSD.org> | 2009-02-17 23:20:04 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2009-02-17 23:20:04 +0000 |
commit | 62a9b004fc9c248c5341442575b7787596da5800 (patch) | |
tree | 4b8fd1ee457d3d03b5b6230dd97322065e6924e0 /sys | |
parent | 0df1aedf21d0954d15c6c1bd1db12df8e4f2c102 (diff) | |
download | FreeBSD-src-62a9b004fc9c248c5341442575b7787596da5800.zip FreeBSD-src-62a9b004fc9c248c5341442575b7787596da5800.tar.gz |
Adaptively increase control command timeout when drive is spun down.
This should fix, for example, cache flush timeout error on shutdown, if
some drives are not mounted.
PR: kern/111023
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ata/ata-queue.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/dev/ata/ata-queue.c b/sys/dev/ata/ata-queue.c index 439f12a..707dfe9 100644 --- a/sys/dev/ata/ata-queue.c +++ b/sys/dev/ata/ata-queue.c @@ -119,6 +119,7 @@ int ata_controlcmd(device_t dev, u_int8_t command, u_int16_t feature, u_int64_t lba, u_int16_t count) { + struct ata_device *atadev = device_get_softc(dev); struct ata_request *request = ata_alloc_request(); int error = ENOMEM; @@ -129,7 +130,13 @@ ata_controlcmd(device_t dev, u_int8_t command, u_int16_t feature, request->u.ata.count = count; request->u.ata.feature = feature; request->flags = ATA_R_CONTROL; - request->timeout = 1; + if (atadev->spindown_state) { + device_printf(dev, "request while spun down, starting.\n"); + atadev->spindown_state = 0; + request->timeout = 31; + } else { + request->timeout = 5; + } request->retries = 0; ata_queue_request(request); error = request->result; |