From owner-svn-src-stable@FreeBSD.ORG  Thu Jan 27 13:40:03 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CCBEA1065670;
	Thu, 27 Jan 2011 13:40:03 +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 B5CBD8FC1C;
	Thu, 27 Jan 2011 13:40:03 +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 p0RDe3UJ018135;
	Thu, 27 Jan 2011 13:40:03 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0RDe3rR018133;
	Thu, 27 Jan 2011 13:40:03 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201101271340.p0RDe3rR018133@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 27 Jan 2011 13:40:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217938 - stable/8/sys/dev/ata/chipsets
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Jan 2011 13:40:04 -0000

Author: mav
Date: Thu Jan 27 13:40:03 2011
New Revision: 217938
URL: http://svn.freebsd.org/changeset/base/217938

Log:
  MFC r215936:
  Do hard reset before soft reset for SATA channels. Soft reset reported to be
  not enough to restore device readiness in some situations.

Modified:
  stable/8/sys/dev/ata/chipsets/ata-serverworks.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/ata/chipsets/ata-serverworks.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-serverworks.c	Thu Jan 27 13:38:52 2011	(r217937)
+++ stable/8/sys/dev/ata/chipsets/ata-serverworks.c	Thu Jan 27 13:40:03 2011	(r217938)
@@ -413,7 +413,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;