Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
3603bc8d
Commit
3603bc8d
authored
Dec 28, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6
parents
68ca243d
a8b554e7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
drivers/net/tg3.c
drivers/net/tg3.c
+9
-4
drivers/net/tg3.h
drivers/net/tg3.h
+7
-0
No files found.
drivers/net/tg3.c
View file @
3603bc8d
...
...
@@ -68,8 +68,8 @@
#define DRV_MODULE_NAME "tg3"
#define PFX DRV_MODULE_NAME ": "
#define DRV_MODULE_VERSION "3.4
6
"
#define DRV_MODULE_RELDATE "Dec
19
, 2005"
#define DRV_MODULE_VERSION "3.4
7
"
#define DRV_MODULE_RELDATE "Dec
28
, 2005"
#define TG3_DEF_MAC_MODE 0
#define TG3_DEF_RX_MODE 0
...
...
@@ -7151,8 +7151,13 @@ do { p = (u32 *)(orig_p + (reg)); \
GET_REG32_LOOP
(
BUFMGR_MODE
,
0x58
);
GET_REG32_LOOP
(
RDMAC_MODE
,
0x08
);
GET_REG32_LOOP
(
WDMAC_MODE
,
0x08
);
GET_REG32_LOOP
(
RX_CPU_BASE
,
0x280
);
GET_REG32_LOOP
(
TX_CPU_BASE
,
0x280
);
GET_REG32_1
(
RX_CPU_MODE
);
GET_REG32_1
(
RX_CPU_STATE
);
GET_REG32_1
(
RX_CPU_PGMCTR
);
GET_REG32_1
(
RX_CPU_HWBKPT
);
GET_REG32_1
(
TX_CPU_MODE
);
GET_REG32_1
(
TX_CPU_STATE
);
GET_REG32_1
(
TX_CPU_PGMCTR
);
GET_REG32_LOOP
(
GRCMBOX_INTERRUPT_0
,
0x110
);
GET_REG32_LOOP
(
FTQ_RESET
,
0x120
);
GET_REG32_LOOP
(
MSGINT_MODE
,
0x0c
);
...
...
drivers/net/tg3.h
View file @
3603bc8d
...
...
@@ -1124,7 +1124,14 @@
/* 0x280 --> 0x400 unused */
#define RX_CPU_BASE 0x00005000
#define RX_CPU_MODE 0x00005000
#define RX_CPU_STATE 0x00005004
#define RX_CPU_PGMCTR 0x0000501c
#define RX_CPU_HWBKPT 0x00005034
#define TX_CPU_BASE 0x00005400
#define TX_CPU_MODE 0x00005400
#define TX_CPU_STATE 0x00005404
#define TX_CPU_PGMCTR 0x0000541c
/* Mailboxes */
#define GRCMBOX_INTERRUPT_0 0x00005800
/* 64-bit */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment