From owner-svn-src-stable@FreeBSD.ORG  Wed Dec  9 17:23:09 2009
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 454BF1065692;
	Wed,  9 Dec 2009 17:23:09 +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 33ED98FC17;
	Wed,  9 Dec 2009 17:23:09 +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 nB9HN9tr031981;
	Wed, 9 Dec 2009 17:23:09 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB9HN9Ld031979;
	Wed, 9 Dec 2009 17:23:09 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200912091723.nB9HN9Ld031979@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 9 Dec 2009 17:23:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200298 - stable/7/sys/dev/ata
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: Wed, 09 Dec 2009 17:23:09 -0000

Author: mav
Date: Wed Dec  9 17:23:08 2009
New Revision: 200298
URL: http://svn.freebsd.org/changeset/base/200298

Log:
  MFC r200121:
  Do not ignore device interrupt if bus mastering is still active. It is
  normal in case of media read error and some ATAPI cases, when transfer size
  is unknown beforehand. PCI ATA BM specification tells that in case of such
  underrun driver should just manually stop DMA engine. DMA engine should
  same time guarantie that all bus mastering transfers completed at the moment
  when driver reads interrupt flag asserted.
  This change fixes interrupt storms and command timeouts in many cases.
  
  PR:             kern/103602, sparc64/121539, kern/133122, kern/139654

Modified:
  stable/7/sys/dev/ata/ata-pci.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/ata/ata-pci.c
==============================================================================
--- stable/7/sys/dev/ata/ata-pci.c	Wed Dec  9 17:20:10 2009	(r200297)
+++ stable/7/sys/dev/ata/ata-pci.c	Wed Dec  9 17:23:08 2009	(r200298)
@@ -445,8 +445,7 @@ ata_pci_status(device_t dev)
 		    (ch->dma->flags & ATA_DMA_ACTIVE))) {
 	int bmstat = ATA_IDX_INB(ch, ATA_BMSTAT_PORT) & ATA_BMSTAT_MASK;
 
-	if ((bmstat & (ATA_BMSTAT_ACTIVE | ATA_BMSTAT_INTERRUPT)) !=
-	    ATA_BMSTAT_INTERRUPT)
+	if ((bmstat & ATA_BMSTAT_INTERRUPT) == 0)
 	    return 0;
 	ATA_IDX_OUTB(ch, ATA_BMSTAT_PORT, bmstat & ~ATA_BMSTAT_ERROR);
 	DELAY(1);