From owner-svn-src-all@FreeBSD.ORG  Wed May 13 14:25:55 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB2291065678;
	Wed, 13 May 2009 14:25:55 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 98C978FC1C;
	Wed, 13 May 2009 14:25:55 +0000 (UTC)
	(envelope-from nwhitehorn@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 n4DEPt7x058775;
	Wed, 13 May 2009 14:25:55 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4DEPthr058774;
	Wed, 13 May 2009 14:25:55 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200905131425.n4DEPthr058774@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 13 May 2009 14:25:55 +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: r192042 - head/sys/dev/bwi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2009 14:25:56 -0000

Author: nwhitehorn
Date: Wed May 13 14:25:55 2009
New Revision: 192042
URL: http://svn.freebsd.org/changeset/base/192042

Log:
  Add a short delay after programming PHY registers to give some time for
  the engine to catch up. This prevents a machine check exception from
  illegal memory requests with a BCM4318.

Modified:
  head/sys/dev/bwi/bwiphy.c

Modified: head/sys/dev/bwi/bwiphy.c
==============================================================================
--- head/sys/dev/bwi/bwiphy.c	Wed May 13 13:00:52 2009	(r192041)
+++ head/sys/dev/bwi/bwiphy.c	Wed May 13 14:25:55 2009	(r192042)
@@ -664,6 +664,7 @@ bwi_phy_init_11b_rev6(struct bwi_mac *ma
 	for (ofs = 0xa8; ofs < 0xc8; ++ofs) {
 		PHY_WRITE(mac, ofs, (val & 0x3f3f));
 		val += 0x202;
+		DELAY(10);
 	}
 
 	if (phy->phy_mode == IEEE80211_MODE_11G) {