--- src/sys/dev/netif/bge/if_bgereg.h	2008/10/19 09:13:58	1.24
+++ src/sys/dev/netif/bge/if_bgereg.h	2008/10/22 14:24:24	1.25
@@ -279,6 +279,8 @@
 #define BGE_CHIPID_BCM5787_A0		0xb0000000
 #define BGE_CHIPID_BCM5787_A1		0xb0010000
 #define BGE_CHIPID_BCM5787_A2		0xb0020000
+#define BGE_CHIPID_BCM5906_A1		0xc0010000
+#define BGE_CHIPID_BCM5906_A2		0xc0020000
 
 /* shorthand one */
 #define BGE_ASICREV(x)			((x) >> 28)
@@ -1432,6 +1434,18 @@
 #define BGE_RXCPUSTAT_MA_REQ_FIFOOFLOW	0x40000000
 #define BGE_RXCPUSTAT_BLOCKING_READ	0x80000000
 
+/*
+ * V? CPU registers
+ */
+#define BGE_VCPU_STATUS			0x5100
+#define BGE_VCPU_EXT_CTRL		0x6890
+
+#define BGE_VCPU_STATUS_INIT_DONE	0x04000000
+#define BGE_VCPU_STATUS_DRV_RESET 	0x08000000
+
+#define BGE_VCPU_EXT_CTRL_HALT_CPU	0x00400000
+#define BGE_VCPU_EXT_CTRL_DISABLE_WOL	0x20000000
+
 
 /*
  * TX CPU registers
@@ -1677,6 +1691,56 @@
 #define BGE_EE_DELAY			0x6848
 #define BGE_FASTBOOT_PC			0x6894
 
+/*
+ * NVRAM Control registers
+ */
+#define BGE_NVRAM_CMD			0x7000
+#define BGE_NVRAM_STAT			0x7004
+#define BGE_NVRAM_WRDATA		0x7008
+#define BGE_NVRAM_ADDR			0x700c
+#define BGE_NVRAM_RDDATA		0x7010
+#define BGE_NVRAM_CFG1			0x7014
+#define BGE_NVRAM_CFG2			0x7018
+#define BGE_NVRAM_CFG3			0x701c
+#define BGE_NVRAM_SWARB			0x7020
+#define BGE_NVRAM_ACCESS		0x7024
+#define BGE_NVRAM_WRITE1		0x7028
+
+#define BGE_NVRAMCMD_RESET		0x00000001
+#define BGE_NVRAMCMD_DONE		0x00000008
+#define BGE_NVRAMCMD_START		0x00000010
+#define BGE_NVRAMCMD_WR			0x00000020 /* 1 = wr, 0 = rd */
+#define BGE_NVRAMCMD_ERASE		0x00000040
+#define BGE_NVRAMCMD_FIRST		0x00000080
+#define BGE_NVRAMCMD_LAST		0x00000100
+
+#define BGE_NVRAM_READCMD \
+	(BGE_NVRAMCMD_FIRST|BGE_NVRAMCMD_LAST| \
+	BGE_NVRAMCMD_START|BGE_NVRAMCMD_DONE)
+#define BGE_NVRAM_WRITECMD \
+	(BGE_NVRAMCMD_FIRST|BGE_NVRAMCMD_LAST| \
+	BGE_NVRAMCMD_START|BGE_NVRAMCMD_DONE|BGE_NVRAMCMD_WR)
+
+#define BGE_NVRAMSWARB_SET0		0x00000001
+#define BGE_NVRAMSWARB_SET1		0x00000002
+#define BGE_NVRAMSWARB_SET2		0x00000003
+#define BGE_NVRAMSWARB_SET3		0x00000004
+#define BGE_NVRAMSWARB_CLR0		0x00000010
+#define BGE_NVRAMSWARB_CLR1		0x00000020
+#define BGE_NVRAMSWARB_CLR2		0x00000040
+#define BGE_NVRAMSWARB_CLR3		0x00000080
+#define BGE_NVRAMSWARB_GNT0		0x00000100
+#define BGE_NVRAMSWARB_GNT1		0x00000200
+#define BGE_NVRAMSWARB_GNT2		0x00000400
+#define BGE_NVRAMSWARB_GNT3		0x00000800
+#define BGE_NVRAMSWARB_REQ0		0x00001000
+#define BGE_NVRAMSWARB_REQ1		0x00002000
+#define BGE_NVRAMSWARB_REQ2		0x00004000
+#define BGE_NVRAMSWARB_REQ3		0x00008000
+
+#define BGE_NVRAMACC_ENABLE		0x00000001
+#define BGE_NVRAMACC_WRENABLE		0x00000002
+
 /* Mode control register */
 #define BGE_MODECTL_INT_SNDCOAL_ONLY	0x00000001
 #define BGE_MODECTL_BYTESWAP_NONFRAME	0x00000002
@@ -1704,6 +1768,7 @@
 /* Misc. config register */
 #define BGE_MISCCFG_RESET_CORE_CLOCKS	0x00000001
 #define BGE_MISCCFG_TIMER_PRESCALER	0x000000FE
+#define BGE_MISCCFG_EPHY_IDDQ		0x00200000
 
 #define BGE_32BITTIME_66MHZ		(0x41 << 1)
 
@@ -1938,6 +2003,7 @@ struct bge_status_block {
  * Offset of MAC address inside EEPROM.
  */
 #define BGE_EE_MAC_OFFSET		0x7C
+#define BGE_EE_MAC_OFFSET_5906		0x10
 #define BGE_EE_HWCFG_OFFSET		0xC8
 
 #define BGE_HWCFG_VOLTAGE		0x00000003
@@ -2329,8 +2395,8 @@ struct bge_type {
 
 #define BGE_HWREV_TIGON		0x01
 #define BGE_HWREV_TIGON_II	0x02
-#define BGE_TIMEOUT		100000
-#define BGE_TXCONS_UNSET		0xFFFF	/* impossible value */
+#define BGE_TIMEOUT		5000
+#define BGE_TXCONS_UNSET	0xFFFF	/* impossible value */
 
 struct bge_bcom_hack {
 	int			reg;
@@ -2365,7 +2431,8 @@ struct bge_softc {
 #define BGE_FLAG_JITTER_BUG	0x01000000
 #define BGE_FLAG_BER_BUG	0x02000000
 #define BGE_FLAG_ADJUST_TRIM	0x04000000
-#define	BGE_FLAG_CRC_BUG	0x08000000
+#define BGE_FLAG_CRC_BUG	0x08000000
+#define BGE_FLAG_NO_EEPROM	0x10000000
 	uint32_t		bge_chipid;
 	uint8_t			bge_asicrev;
 	uint8_t			bge_chiprev;