From owner-p4-projects@FreeBSD.ORG  Sat May  1 16:24:14 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 08B3C1065673; Sat,  1 May 2010 16:24:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C188B106564A
	for <perforce@freebsd.org>; Sat,  1 May 2010 16:24:13 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id AFB478FC08
	for <perforce@freebsd.org>; Sat,  1 May 2010 16:24:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41GODsx036183
	for <perforce@freebsd.org>; Sat, 1 May 2010 16:24:13 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41GOD2v036181
	for perforce@freebsd.org; Sat, 1 May 2010 16:24:13 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 1 May 2010 16:24:13 GMT
Message-Id: <201005011624.o41GOD2v036181@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 177558 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 01 May 2010 16:24:14 -0000

http://p4web.freebsd.org/@@177558?ac=10

Change 177558 by mav@mav_mavtest on 2010/05/01 16:23:44

	DMA auto-activate capability doesn't depend on pm_level.

Affected files ...

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

Differences ...

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

@@ -2511,11 +2511,11 @@
 					cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_PMREQ;
 				if (ch->caps2 & AHCI_CAP2_APST)
 					cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_APST;
-				if (ch->caps & AHCI_CAP_SNCQ)
-					cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_DMAAA;
-				cts->xport_specific.sata.caps &=
-				    ch->user[ccb->ccb_h.target_id].caps;
 			}
+			if (ch->caps & AHCI_CAP_SNCQ)
+				cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_DMAAA;
+			cts->xport_specific.sata.caps &=
+			    ch->user[ccb->ccb_h.target_id].caps;
 			cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS;
 		} else {
 			cts->xport_specific.sata.revision = d->revision;