Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6
+16
-4
+9
-4
drivers/net/tg3.c
+9
-4
drivers/net/tg3.c
···
68
68
69
69
#define DRV_MODULE_NAME "tg3"
70
70
#define PFX DRV_MODULE_NAME ": "
71
-
#define DRV_MODULE_VERSION "3.46"
72
-
#define DRV_MODULE_RELDATE "Dec 19, 2005"
71
+
#define DRV_MODULE_VERSION "3.47"
72
+
#define DRV_MODULE_RELDATE "Dec 28, 2005"
73
73
74
74
#define TG3_DEF_MAC_MODE 0
75
75
#define TG3_DEF_RX_MODE 0
···
7151
7151
GET_REG32_LOOP(BUFMGR_MODE, 0x58);
7152
7152
GET_REG32_LOOP(RDMAC_MODE, 0x08);
7153
7153
GET_REG32_LOOP(WDMAC_MODE, 0x08);
7154
-
GET_REG32_LOOP(RX_CPU_BASE, 0x280);
7155
-
GET_REG32_LOOP(TX_CPU_BASE, 0x280);
7154
+
GET_REG32_1(RX_CPU_MODE);
7155
+
GET_REG32_1(RX_CPU_STATE);
7156
+
GET_REG32_1(RX_CPU_PGMCTR);
7157
+
GET_REG32_1(RX_CPU_HWBKPT);
7158
+
GET_REG32_1(TX_CPU_MODE);
7159
+
GET_REG32_1(TX_CPU_STATE);
7160
+
GET_REG32_1(TX_CPU_PGMCTR);
7156
7161
GET_REG32_LOOP(GRCMBOX_INTERRUPT_0, 0x110);
7157
7162
GET_REG32_LOOP(FTQ_RESET, 0x120);
7158
7163
GET_REG32_LOOP(MSGINT_MODE, 0x0c);
+7
drivers/net/tg3.h
+7
drivers/net/tg3.h
···
1124
1124
/* 0x280 --> 0x400 unused */
1125
1125
1126
1126
#define RX_CPU_BASE 0x00005000
1127
+
#define RX_CPU_MODE 0x00005000
1128
+
#define RX_CPU_STATE 0x00005004
1129
+
#define RX_CPU_PGMCTR 0x0000501c
1130
+
#define RX_CPU_HWBKPT 0x00005034
1127
1131
#define TX_CPU_BASE 0x00005400
1132
+
#define TX_CPU_MODE 0x00005400
1133
+
#define TX_CPU_STATE 0x00005404
1134
+
#define TX_CPU_PGMCTR 0x0000541c
1128
1135
1129
1136
/* Mailboxes */
1130
1137
#define GRCMBOX_INTERRUPT_0 0x00005800 /* 64-bit */