PERFORCE change 111370 for review

[Matt Jacob]

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

Change 111370 by mjacob at 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