From owner-svn-src-head@FreeBSD.ORG  Sat Feb 21 23:42:28 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBCB4106564A;
	Sat, 21 Feb 2009 23:42:28 +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 DA00B8FC15;
	Sat, 21 Feb 2009 23:42:28 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1LNgSZC078457;
	Sat, 21 Feb 2009 23:42:28 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1LNgS9w078456;
	Sat, 21 Feb 2009 23:42:28 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200902212342.n1LNgS9w078456@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 21 Feb 2009 23:42:28 +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: r188905 - head/sys/dev/ata/chipsets
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2009 23:42:29 -0000

Author: mav
Date: Sat Feb 21 23:42:28 2009
New Revision: 188905
URL: http://svn.freebsd.org/changeset/base/188905

Log:
  Increase initial busy waiting time. If drive was hot-plugged, it may need
  much time to spin-up.

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	Sat Feb 21 23:15:34 2009	(r188904)
+++ head/sys/dev/ata/chipsets/ata-ahci.c	Sat Feb 21 23:42:28 2009	(r188905)
@@ -624,7 +624,7 @@ ata_ahci_start(device_t dev)
 }
 
 static int
-ata_ahci_wait_ready(device_t dev)
+ata_ahci_wait_ready(device_t dev, int t)
 {
     struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev));
     struct ata_channel *ch = device_get_softc(dev);
@@ -634,7 +634,7 @@ ata_ahci_wait_ready(device_t dev)
     while (ATA_INL(ctlr->r_res2, ATA_AHCI_P_TFD + offset) &
 	(ATA_S_BUSY | ATA_S_DRQ)) {
 	    DELAY(1000);
-	    if (timeout++ > 1000) {
+	    if (timeout++ > t) {
 		device_printf(dev, "port is not ready\n");
 		return (-1);
 	    }
@@ -680,7 +680,7 @@ ata_ahci_softreset(device_t dev, int por
     if (ata_ahci_issue_cmd(dev, 0, 0))
 	return -1;
 
-    if (ata_ahci_wait_ready(dev))
+    if (ata_ahci_wait_ready(dev, 1000))
 	return (-1);
 
     return ATA_INL(ctlr->r_res2, ATA_AHCI_P_SIG + offset);
@@ -738,7 +738,7 @@ ata_ahci_reset(device_t dev)
 	      ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DHR));
 
     /* Wait for initial TFD from device. */
-    ata_ahci_wait_ready(dev);
+    ata_ahci_wait_ready(dev, 10000);
 
     /* only probe for PortMultiplier if HW has support */
     if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_SPM) {