From owner-svn-src-all@FreeBSD.ORG  Sun Dec  6 23:56:54 2009
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 B4F6C1065694;
	Sun,  6 Dec 2009 23:56:54 +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 A44458FC3C;
	Sun,  6 Dec 2009 23:56:54 +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 nB6NusBn035622;
	Sun, 6 Dec 2009 23:56:54 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB6NusBb035620;
	Sun, 6 Dec 2009 23:56:54 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200912062356.nB6NusBb035620@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 6 Dec 2009 23:56:54 +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: r200196 - head/sys/dev/ahci
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: Sun, 06 Dec 2009 23:56:54 -0000

Author: mav
Date: Sun Dec  6 23:56:54 2009
New Revision: 200196
URL: http://svn.freebsd.org/changeset/base/200196

Log:
  Add Asynchronous Notification support for controllers without SNTF
  capability by snooping SDB FIS receive area. It should be even faster
  then regular way, but less reliable.

Modified:
  head/sys/dev/ahci/ahci.c

Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c	Sun Dec  6 23:51:27 2009	(r200195)
+++ head/sys/dev/ahci/ahci.c	Sun Dec  6 23:56:54 2009	(r200196)
@@ -1129,7 +1129,8 @@ ahci_notify_events(device_t dev, u_int32
 	struct cam_path *dpath;
 	int i;
 
-	ATA_OUTL(ch->r_mem, AHCI_P_SNTF, status);
+	if (ch->caps & AHCI_CAP_SSNTF)
+		ATA_OUTL(ch->r_mem, AHCI_P_SNTF, status);
 	if (bootverbose)
 		device_printf(dev, "SNTF 0x%04x\n", status);
 	for (i = 0; i < 16; i++) {
@@ -1188,8 +1189,16 @@ ahci_ch_intr(void *data)
 	/* Read command statuses. */
 	sstatus = ATA_INL(ch->r_mem, AHCI_P_SACT);
 	cstatus = ATA_INL(ch->r_mem, AHCI_P_CI);
-	if ((istatus & AHCI_P_IX_SDB) && (ch->caps & AHCI_CAP_SSNTF))
-		sntf = ATA_INL(ch->r_mem, AHCI_P_SNTF);
+	if (istatus & AHCI_P_IX_SDB) {
+		if (ch->caps & AHCI_CAP_SSNTF)
+			sntf = ATA_INL(ch->r_mem, AHCI_P_SNTF);
+		else {
+			u_int8_t *fis = ch->dma.rfis + 0x58;
+
+			if (fis[1] & 0x80)
+				sntf = (1 << (fis[1] & 0x0f));
+		}
+	}
 	/* Process PHY events */
 	if (istatus & (AHCI_P_IX_PC | AHCI_P_IX_PRC | AHCI_P_IX_OF |
 	    AHCI_P_IX_IF | AHCI_P_IX_HBD | AHCI_P_IX_HBF | AHCI_P_IX_TFE)) {