From owner-svn-src-stable@FreeBSD.ORG  Wed Apr 24 19:33:38 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A380FC4A;
 Wed, 24 Apr 2013 19:33:38 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 964511927;
 Wed, 24 Apr 2013 19:33:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OJXbNb095242;
 Wed, 24 Apr 2013 19:33:37 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3OJXbQX095240;
 Wed, 24 Apr 2013 19:33:37 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201304241933.r3OJXbQX095240@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 24 Apr 2013 19:33:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r249852 - stable/9/sys/dev/ahci
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 24 Apr 2013 19:33:38 -0000

Author: mav
Date: Wed Apr 24 19:33:37 2013
New Revision: 249852
URL: http://svnweb.freebsd.org/changeset/base/249852

Log:
  MFC r248704:
  Read Asynchronous Notification statuses only if Port Multiplier or ATAPI
  device are connected. ATA disks are not using ANs, while the extra register
  read operation is quite expensive.

Modified:
  stable/9/sys/dev/ahci/ahci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/ahci/ahci.c
==============================================================================
--- stable/9/sys/dev/ahci/ahci.c	Wed Apr 24 19:24:53 2013	(r249851)
+++ stable/9/sys/dev/ahci/ahci.c	Wed Apr 24 19:33:37 2013	(r249852)
@@ -1524,7 +1524,8 @@ ahci_ch_intr(void *data)
 	if (ch->numrslots != ch->numtslots)
 		cstatus |= ATA_INL(ch->r_mem, AHCI_P_CI);
 	/* Read SNTF in one of possible ways. */
-	if (istatus & AHCI_P_IX_SDB) {
+	if ((istatus & AHCI_P_IX_SDB) &&
+	    (ch->pm_present || ch->curr[0].atapi != 0)) {
 		if (ch->caps & AHCI_CAP_SSNTF)
 			sntf = ATA_INL(ch->r_mem, AHCI_P_SNTF);
 		else if (ch->fbs_enabled) {