From: Venkatesh Srinivas <me@endeavour.zapto.org>
Date: Fri, 27 Jan 2012 10:55:15 +0000 (-0800)
Subject: kernel -- nata: Use ATA_DEFAULT_TIMEOUT (10) rather than 1 for ATA controlcmds.
X-Git-Tag: v3.0.1~53
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/63365ca0a2dcc418c841f56036fb254bb8616bdc

kernel -- nata: Use ATA_DEFAULT_TIMEOUT (10) rather than 1 for ATA controlcmds.

A one-second timeout for control commands was inappropriate for
SET TRANSFER MODE/ENABLE RCACHE/ENABLE WCACHE on spun-down WD Caviar Greens,
among others.
---

diff --git a/sys/dev/disk/nata/ata-queue.c b/sys/dev/disk/nata/ata-queue.c
index 8aec1d36ee..b1b96a34ae 100644
--- a/sys/dev/disk/nata/ata-queue.c
+++ b/sys/dev/disk/nata/ata-queue.c
@@ -168,7 +168,7 @@ 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;
+	request->timeout = ATA_DEFAULT_TIMEOUT;
 	request->retries = 0;
 	ata_queue_request(request);
 	error = request->result;