From owner-p4-projects@FreeBSD.ORG  Sun Dec 10 05:41:01 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5350A16A47C; Sun, 10 Dec 2006 05:41:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2280716A416
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 05:41:01 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A06E943C9E
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 05:39:52 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA5f0Wm086916
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 05:41:00 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA5f078086910
	for perforce@freebsd.org; Sun, 10 Dec 2006 05:41:00 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sun, 10 Dec 2006 05:41:00 GMT
Message-Id: <200612100541.kBA5f078086910@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111370 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Dec 2006 05:41:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=111370

Change 111370 by mjacob@mjexp on 2006/12/10 05:40:24

	Merge a working (for my AMD box) copy of bge into this tree.

Affected files ...

.. //depot/projects/mjexp/sys/dev/bge/if_bge.c#5 integrate

Differences ...

==== //depot/projects/mjexp/sys/dev/bge/if_bge.c#5 (text+ko) ====

@@ -2484,12 +2484,6 @@
 		}
 	}
 
-	/*
-	 * Write the magic number to the firmware mailbox at 0xb50
-         * so that the driver can synchronize with the firmware.
-	 */
-	bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER);
-
 	/* Issue global reset */
 	bge_writereg_ind(sc, BGE_MISC_CFG, reset);
 
@@ -2526,6 +2520,11 @@
 		CSR_WRITE_4(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE);
 
 	/*
+	 * Prevent PXE restart: write a magic number to the
+	 * general communications memory at 0xB50.
+	 */
+	bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER);
+	/*
 	 * Poll the value location we just wrote until
 	 * we see the 1's complement of the magic number.
 	 * This indicates that the firmware initialization