From owner-svn-src-all@FreeBSD.ORG  Wed Sep  1 06:43:41 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC01D10656AD;
	Wed,  1 Sep 2010 06:43:41 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BA748FC12;
	Wed,  1 Sep 2010 06:43:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o816hfje054057;
	Wed, 1 Sep 2010 06:43:41 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o816hf5k054055;
	Wed, 1 Sep 2010 06:43:41 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201009010643.o816hf5k054055@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 1 Sep 2010 06:43:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212081 - head/sys/dev/ata/chipsets
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2010 06:43:41 -0000

Author: mav
Date: Wed Sep  1 06:43:41 2010
New Revision: 212081
URL: http://svn.freebsd.org/changeset/base/212081

Log:
  Increase device reset timeout from 10 to 15 seconds, same as in ahci(4).
  Some devices found need about 10-12 seconds to spinup.

Modified:
  head/sys/dev/ata/chipsets/ata-ahci.c

Modified: head/sys/dev/ata/chipsets/ata-ahci.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ahci.c	Wed Sep  1 05:39:56 2010	(r212080)
+++ head/sys/dev/ata/chipsets/ata-ahci.c	Wed Sep  1 06:43:41 2010	(r212081)
@@ -815,7 +815,7 @@ ata_ahci_hardreset(device_t dev, int por
     if (!ata_sata_phy_reset(dev, port, 0))
 	return (ENOENT);
     /* Wait for clearing busy status. */
-    if (ata_ahci_wait_ready(dev, 10000)) {
+    if (ata_ahci_wait_ready(dev, 15000)) {
 	device_printf(dev, "hardware reset timeout\n");
 	return (EBUSY);
     }