From owner-svn-src-stable@FreeBSD.ORG  Tue Nov 15 17:30:04 2011
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 1EBB0106566C;
	Tue, 15 Nov 2011 17:30:04 +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 08A428FC15;
	Tue, 15 Nov 2011 17:30:04 +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 pAFHU3jr009963;
	Tue, 15 Nov 2011 17:30:03 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAFHU3ij009961;
	Tue, 15 Nov 2011 17:30:03 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201111151730.pAFHU3ij009961@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 15 Nov 2011 17:30:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227533 - stable/9/sys/dev/mfi
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: Tue, 15 Nov 2011 17:30:04 -0000

Author: delphij
Date: Tue Nov 15 17:30:03 2011
New Revision: 227533
URL: http://svn.freebsd.org/changeset/base/227533

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
  
  Submitted by:	scottl
  Ok'ed by:	jhb
  Approved by:	re (kib)

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

Modified: stable/9/sys/dev/mfi/mfi.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi.c	Tue Nov 15 17:15:09 2011	(r227532)
+++ stable/9/sys/dev/mfi/mfi.c	Tue Nov 15 17:30:03 2011	(r227533)
@@ -932,6 +932,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);