From owner-p4-projects@FreeBSD.ORG  Mon Jun 15 07:05:06 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A023E106566C; Mon, 15 Jun 2009 07:05:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 593B41065670
	for <perforce@freebsd.org>; Mon, 15 Jun 2009 07:05:06 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 46EE08FC18
	for <perforce@freebsd.org>; Mon, 15 Jun 2009 07:05:06 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5F756NM093003
	for <perforce@freebsd.org>; Mon, 15 Jun 2009 07:05:06 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5F756Ch093001
	for perforce@freebsd.org; Mon, 15 Jun 2009 07:05:06 GMT
	(envelope-from mav@freebsd.org)
Date: Mon, 15 Jun 2009 07:05:06 GMT
Message-Id: <200906150705.n5F756Ch093001@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 164400 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jun 2009 07:05:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=164400

Change 164400 by mav@mav_mavbook on 2009/06/15 07:04:52

	Use CLO only with Soft Reset command. Using it in other cases opens
	race window in SATA protocol, causing false errors reports.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#32 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#32 (text+ko) ====

@@ -857,13 +857,13 @@
 		ahci_phy_check_events(dev);
 	/* Process command errors */
 	if (istatus & (AHCI_P_IX_IF|AHCI_P_IX_HBD|AHCI_P_IX_HBF|AHCI_P_IX_TFE)) {
-device_printf(dev, "%s ERROR is %08x cs %08x ss %08x rs %08x tfd %02x\n",
-    __func__, istatus, cstatus, sstatus, ch->rslots, ATA_INL(ch->r_mem, AHCI_P_TFD));
+device_printf(dev, "%s ERROR is %08x cs %08x ss %08x rs %08x tfd %02x serr %08x\n",
+    __func__, istatus, cstatus, sstatus, ch->rslots, ATA_INL(ch->r_mem, AHCI_P_TFD),
+    ATA_INL(ch->r_mem, AHCI_P_SERR));
 		ccs = (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_CCS_MASK)
 		    >> AHCI_P_CMD_CCS_SHIFT;
 		/* Kick controller into sane state */
 		ahci_stop(dev);
-		ahci_clo(dev);
 		ahci_start(dev);
 		ok = ch->rslots & ~(cstatus | sstatus);
 		err = ch->rslots & (cstatus | sstatus);
@@ -1139,7 +1139,6 @@
 		if (et != AHCI_ERR_NONE) {
 			/* Kick controller into sane state */
 			ahci_stop(ch->dev);
-			ahci_clo(ch->dev);
 			ahci_start(ch->dev);
 			xpt_freeze_simq(ch->sim, 1);
 		}
@@ -1164,7 +1163,6 @@
 
 	/* Kick controller into sane state. */
 	ahci_stop(ch->dev);
-	ahci_clo(ch->dev);
 	ahci_start(ch->dev);
 
 	if (!ch->readlog)