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
6cd132be
Commit
6cd132be
authored
Dec 01, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[TG3]: Do not drop existing GRC_MODE_HOST_STACKUP when writing to GRC_MODE.
parent
e689bf58
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
drivers/net/tg3.c
drivers/net/tg3.c
+8
-2
No files found.
drivers/net/tg3.c
View file @
6cd132be
...
@@ -4541,7 +4541,10 @@ static int tg3_reset_hw(struct tg3 *tp)
...
@@ -4541,7 +4541,10 @@ static int tg3_reset_hw(struct tg3 *tp)
tg3_chip_reset
(
tp
);
tg3_chip_reset
(
tp
);
tw32
(
GRC_MODE
,
tp
->
grc_mode
);
val
=
tr32
(
GRC_MODE
);
val
&=
GRC_MODE_HOST_STACKUP
;
tw32
(
GRC_MODE
,
val
|
tp
->
grc_mode
);
tg3_write_mem
(
tp
,
tg3_write_mem
(
tp
,
NIC_SRAM_FIRMWARE_MBOX
,
NIC_SRAM_FIRMWARE_MBOX
,
NIC_SRAM_FIRMWARE_MBOX_MAGIC1
);
NIC_SRAM_FIRMWARE_MBOX_MAGIC1
);
...
@@ -6716,6 +6719,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
...
@@ -6716,6 +6719,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
u32
misc_ctrl_reg
;
u32
misc_ctrl_reg
;
u32
cacheline_sz_reg
;
u32
cacheline_sz_reg
;
u32
pci_state_reg
,
grc_misc_cfg
;
u32
pci_state_reg
,
grc_misc_cfg
;
u32
val
;
u16
pci_cmd
;
u16
pci_cmd
;
int
err
;
int
err
;
...
@@ -6912,7 +6916,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
...
@@ -6912,7 +6916,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
udelay
(
40
);
udelay
(
40
);
/* Initialize data/descriptor byte/word swapping. */
/* Initialize data/descriptor byte/word swapping. */
tw32
(
GRC_MODE
,
tp
->
grc_mode
);
val
=
tr32
(
GRC_MODE
);
val
&=
GRC_MODE_HOST_STACKUP
;
tw32
(
GRC_MODE
,
val
|
tp
->
grc_mode
);
tg3_switch_clocks
(
tp
);
tg3_switch_clocks
(
tp
);
...
...
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