From owner-svn-src-projects@FreeBSD.ORG  Wed Nov  9 20:12:59 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 60941106564A;
	Wed,  9 Nov 2011 20:12:59 +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 50FFA8FC1B;
	Wed,  9 Nov 2011 20:12:59 +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 pA9KCxM5098125;
	Wed, 9 Nov 2011 20:12:59 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA9KCxZJ098123;
	Wed, 9 Nov 2011 20:12:59 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201111092012.pA9KCxZJ098123@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 9 Nov 2011 20:12:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227406 - projects/head_mfi/sys/dev/mfi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Nov 2011 20:12:59 -0000

Author: delphij
Date: Wed Nov  9 20:12:59 2011
New Revision: 227406
URL: http://svn.freebsd.org/changeset/base/227406

Log:
  Incorporate Scott Long's patch for mfi(4) that fixes mfi(4) timeouts for
  our hardware:
  
  mfi0@pci0:2:0:0:        class=0x010400 card=0x100a1000 chip=0x00601000 rev=0x04 hdr=0x00
      vendor     = 'LSI Logic / Symbios Logic'
      device     = 'MegaRAID SAS 1078'

Modified:
  projects/head_mfi/sys/dev/mfi/mfi.c

Modified: projects/head_mfi/sys/dev/mfi/mfi.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi.c	Wed Nov  9 19:09:03 2011	(r227405)
+++ projects/head_mfi/sys/dev/mfi/mfi.c	Wed Nov  9 20:12:59 2011	(r227406)
@@ -1239,6 +1239,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);