From owner-svn-src-all@FreeBSD.ORG  Sat Nov 27 07:03:32 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 57D86106566C;
	Sat, 27 Nov 2010 07:03:32 +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 45BE98FC17;
	Sat, 27 Nov 2010 07:03:32 +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 oAR73Wf0019240;
	Sat, 27 Nov 2010 07:03:32 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAR73WP9019238;
	Sat, 27 Nov 2010 07:03:32 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201011270703.oAR73WP9019238@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 27 Nov 2010 07:03:32 +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: r215936 - 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: Sat, 27 Nov 2010 07:03:32 -0000

Author: mav
Date: Sat Nov 27 07:03:31 2010
New Revision: 215936
URL: http://svn.freebsd.org/changeset/base/215936

Log:
  Do hard reset before soft reset for SATA channels. Soft reset reported to be
  not enough to restore device readiness in some situations.
  
  Tested by: 	Roger Hammerstein <cheeky.m@live.com> on ServerWorks HT1000.

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

Modified: head/sys/dev/ata/chipsets/ata-serverworks.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-serverworks.c	Sat Nov 27 06:35:15 2010	(r215935)
+++ head/sys/dev/ata/chipsets/ata-serverworks.c	Sat Nov 27 07:03:31 2010	(r215936)
@@ -405,7 +405,7 @@ ata_serverworks_sata_reset(device_t dev)
 {
 	struct ata_channel *ch = device_get_softc(dev);
 
-	if (ata_sata_phy_reset(dev, -1, 1))
+	if (ata_sata_phy_reset(dev, -1, 0))
 		ata_generic_reset(dev);
 	else
 		ch->devices = 0;