From owner-svn-src-stable-7@FreeBSD.ORG  Thu Nov 17 11:16:57 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D6B551065672;
	Thu, 17 Nov 2011 11:16:57 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C5B428FC14;
	Thu, 17 Nov 2011 11:16:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAHBGv1M001853;
	Thu, 17 Nov 2011 11:16:57 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAHBGvag001851;
	Thu, 17 Nov 2011 11:16:57 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201111171116.pAHBGvag001851@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 17 Nov 2011 11:16:57 +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: r227611 - in stable: 7/sys/dev/mfi 8/sys/dev/mfi
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Nov 2011 11:16:58 -0000

Author: delphij
Date: Thu Nov 17 11:16:56 2011
New Revision: 227611
URL: http://svn.freebsd.org/changeset/base/227611

Log:
  MFC r227409:
  
  Do a dummy read to flush the interrupt ACK that we just performed,
  ensuring that everything is really, truly consistent.
  
  This fixes certain cases where one will see various:
    mfi0: COMMAND 0xffffffXXXXXXXXXX TIMEOUT AFTER XX SECONDS
  
  Requested by:	Vincent Hoffman <vince unsane co uk>

Modified:
  stable/7/sys/dev/mfi/mfi.c
Directory Properties:
  stable/7/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/sys/dev/mfi/mfi.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/7/sys/dev/mfi/mfi.c
==============================================================================
--- stable/7/sys/dev/mfi/mfi.c	Thu Nov 17 10:46:51 2011	(r227610)
+++ stable/7/sys/dev/mfi/mfi.c	Thu Nov 17 11:16:56 2011	(r227611)
@@ -928,6 +928,12 @@ mfi_intr(void *arg)
 	if (sc->mfi_check_clear_intr(sc))
 		return;
 
+	/*
+	 * Do a dummy read to flush the interrupt ACK that we just performed,
+	 * ensuring that everything is really, truly consistent.
+	 */
+	(void)sc->mfi_read_fw_status(sc);
+
 	pi = sc->mfi_comms->hw_pi;
 	ci = sc->mfi_comms->hw_ci;
 	mtx_lock(&sc->mfi_io_lock);