From 62a9b004fc9c248c5341442575b7787596da5800 Mon Sep 17 00:00:00 2001 From: mav Date: Tue, 17 Feb 2009 23:20:04 +0000 Subject: [PATCH] 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 --- sys/dev/ata/ata-queue.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/ata/ata-queue.c b/sys/dev/ata/ata-queue.c index 439f12a9816e..707dfe98c915 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;