From owner-svn-src-user@FreeBSD.ORG  Thu Sep 15 06:41:43 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFBD7106564A;
	Thu, 15 Sep 2011 06:41:43 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF3D38FC08;
	Thu, 15 Sep 2011 06:41:43 +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 p8F6fhYp060641;
	Thu, 15 Sep 2011 06:41:43 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8F6fhVl060639;
	Thu, 15 Sep 2011 06:41:43 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109150641.p8F6fhVl060639@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 15 Sep 2011 06:41:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225568 -
	user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Sep 2011 06:41:43 -0000

Author: adrian
Date: Thu Sep 15 06:41:43 2011
New Revision: 225568
URL: http://svn.freebsd.org/changeset/base/225568

Log:
  These aren't strictly RX_CLEAR hangs; but I'm adding them for now
  so I can see if they pop up.
  
  I'm seeing beacon hangs on Merlin when a second NIC is also busy
  doing traffic.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Thu Sep 15 05:05:31 2011	(r225567)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Thu Sep 15 06:41:43 2011	(r225568)
@@ -564,7 +564,9 @@ ar5416DetectBBHang(struct ath_hal *ah)
 		{ 0x1E000000, 0x7E000B00, HAL_BB_HANG_DFS },
 		{ 0x52000B00, 0x7E000B00, HAL_BB_HANG_RIFS },
 		{ 0x18000B00, 0x7E000B00, HAL_BB_HANG_RX_CLEAR },
-		{ 0x00702400, 0x7E7FFFEF, HAL_BB_HANG_RX_CLEAR }
+		{ 0x00702400, 0x7E7FFFEF, HAL_BB_HANG_RX_CLEAR },
+		{ 0x18002313, 0x7EF3FFFF, HAL_BB_HANG_RX_CLEAR },
+		{ 0x00902400, 0x5DF3FFEE, HAL_BB_HANG_RX_CLEAR },
 	};
 	uint32_t hang_sig;
 	int i;