From owner-svn-src-head@FreeBSD.ORG  Mon Feb 23 18:22:07 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 500C3106564A;
	Mon, 23 Feb 2009 18:22:07 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E99F8FC1F;
	Mon, 23 Feb 2009 18:22:07 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NIM7LD032143;
	Mon, 23 Feb 2009 18:22:07 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1NIM7mj032142;
	Mon, 23 Feb 2009 18:22:07 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200902231822.n1NIM7mj032142@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 23 Feb 2009 18:22:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188940 - head/sys/dev/aac
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Feb 2009 18:22:07 -0000

Author: emaste
Date: Mon Feb 23 18:22:06 2009
New Revision: 188940
URL: http://svn.freebsd.org/changeset/base/188940

Log:
  SVN rev 188743 modified aac_rx_get_fwstatus to use the AAC_RX_OMR0
  register instead of AAC_RX_FWSTATUS, as that is the way it's done in
  Adaptec's vendor driver and in the Linux drivers.  (The same applies
  to aac_rkt_get_fwstatus as well.)
  
  However, a concern has been raised about the compatibility of this
  change and old hardware / firmware versions.  In the absense of
  specific information, revert to the original behaviour if the firmware
  does not support the "New comm." interface.  Users of old cards or
  firmware haven't reported the problems that are potentially solved by
  switching to OMR0.

Modified:
  head/sys/dev/aac/aac.c

Modified: head/sys/dev/aac/aac.c
==============================================================================
--- head/sys/dev/aac/aac.c	Mon Feb 23 18:16:17 2009	(r188939)
+++ head/sys/dev/aac/aac.c	Mon Feb 23 18:22:06 2009	(r188940)
@@ -2416,7 +2416,8 @@ aac_rx_get_fwstatus(struct aac_softc *sc
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_MEM0_GETREG4(sc, AAC_RX_OMR0));
+	return(AAC_MEM0_GETREG4(sc, sc->flags & AAC_FLAGS_NEW_COMM ?
+	    AAC_RX_OMR0 : AAC_RX_FWSTATUS));
 }
 
 static int
@@ -2435,7 +2436,8 @@ aac_rkt_get_fwstatus(struct aac_softc *s
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_MEM0_GETREG4(sc, AAC_RKT_OMR0));
+	return(AAC_MEM0_GETREG4(sc, sc->flags & AAC_FLAGS_NEW_COMM ?
+	    AAC_RKT_OMR0 : AAC_RKT_FWSTATUS));
 }
 
 /*