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
9756c5a3
Commit
9756c5a3
authored
Mar 07, 2004
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[TIGON3]: Always force PHY reset after major hw config changes.
parent
cf07135a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
14 deletions
+16
-14
drivers/net/tg3.c
drivers/net/tg3.c
+16
-14
No files found.
drivers/net/tg3.c
View file @
9756c5a3
...
...
@@ -782,7 +782,7 @@ static void tg3_frob_aux_power(struct tg3 *tp)
}
}
static
int
tg3_setup_phy
(
struct
tg3
*
);
static
int
tg3_setup_phy
(
struct
tg3
*
,
int
);
static
int
tg3_set_power_state
(
struct
tg3
*
tp
,
int
state
)
{
...
...
@@ -849,7 +849,7 @@ static int tg3_set_power_state(struct tg3 *tp, int state)
tp
->
link_config
.
speed
=
SPEED_10
;
tp
->
link_config
.
duplex
=
DUPLEX_HALF
;
tp
->
link_config
.
autoneg
=
AUTONEG_ENABLE
;
tg3_setup_phy
(
tp
);
tg3_setup_phy
(
tp
,
0
);
}
pci_read_config_word
(
tp
->
pdev
,
pm
+
PCI_PM_PMC
,
&
power_caps
);
...
...
@@ -1212,7 +1212,7 @@ static int tg3_init_5401phy_dsp(struct tg3 *tp)
return
err
;
}
static
int
tg3_setup_copper_phy
(
struct
tg3
*
tp
)
static
int
tg3_setup_copper_phy
(
struct
tg3
*
tp
,
int
force_reset
)
{
int
current_link_up
;
u32
bmsr
,
dummy
;
...
...
@@ -1245,8 +1245,10 @@ static int tg3_setup_copper_phy(struct tg3 *tp)
tg3_readphy
(
tp
,
MII_BMSR
,
&
bmsr
);
tg3_readphy
(
tp
,
MII_BMSR
,
&
bmsr
);
if
(
!
(
bmsr
&
BMSR_LSTATUS
))
tg3_phy_reset
(
tp
,
1
)
;
force_reset
=
1
;
}
if
(
force_reset
)
tg3_phy_reset
(
tp
,
1
);
if
((
tp
->
phy_id
&
PHY_ID_MASK
)
==
PHY_ID_BCM5401
)
{
tg3_readphy
(
tp
,
MII_BMSR
,
&
bmsr
);
...
...
@@ -1775,7 +1777,7 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp,
return
ret
;
}
static
int
tg3_setup_fiber_phy
(
struct
tg3
*
tp
)
static
int
tg3_setup_fiber_phy
(
struct
tg3
*
tp
,
int
force_reset
)
{
u32
orig_pause_cfg
;
u16
orig_active_speed
;
...
...
@@ -1980,14 +1982,14 @@ static int tg3_setup_fiber_phy(struct tg3 *tp)
return
0
;
}
static
int
tg3_setup_phy
(
struct
tg3
*
tp
)
static
int
tg3_setup_phy
(
struct
tg3
*
tp
,
int
force_reset
)
{
int
err
;
if
(
tp
->
phy_id
==
PHY_ID_SERDES
)
{
err
=
tg3_setup_fiber_phy
(
tp
);
err
=
tg3_setup_fiber_phy
(
tp
,
force_reset
);
}
else
{
err
=
tg3_setup_copper_phy
(
tp
);
err
=
tg3_setup_copper_phy
(
tp
,
force_reset
);
}
if
(
tp
->
link_config
.
active_speed
==
SPEED_1000
&&
...
...
@@ -2350,7 +2352,7 @@ static int tg3_poll(struct net_device *netdev, int *budget)
if
(
sblk
->
status
&
SD_STATUS_LINK_CHG
)
{
sblk
->
status
=
SD_STATUS_UPDATED
|
(
sblk
->
status
&
~
SD_STATUS_LINK_CHG
);
tg3_setup_phy
(
tp
);
tg3_setup_phy
(
tp
,
0
);
}
}
...
...
@@ -4986,7 +4988,7 @@ static int tg3_reset_hw(struct tg3 *tp)
*/
tw32_f
(
MAC_LOW_WMARK_MAX_RX_FRAME
,
2
);
err
=
tg3_setup_phy
(
tp
);
err
=
tg3_setup_phy
(
tp
,
1
);
if
(
err
)
return
err
;
...
...
@@ -5168,7 +5170,7 @@ static void tg3_timer(unsigned long __opaque)
phy_event
=
1
;
if
(
phy_event
)
tg3_setup_phy
(
tp
);
tg3_setup_phy
(
tp
,
0
);
}
else
if
(
tp
->
tg3_flags
&
TG3_FLAG_POLL_SERDES
)
{
u32
mac_stat
=
tr32
(
MAC_STATUS
);
int
need_setup
=
0
;
...
...
@@ -5188,7 +5190,7 @@ static void tg3_timer(unsigned long __opaque)
udelay
(
40
);
tw32_f
(
MAC_MODE
,
tp
->
mac_mode
);
udelay
(
40
);
tg3_setup_phy
(
tp
);
tg3_setup_phy
(
tp
,
0
);
}
}
...
...
@@ -5869,7 +5871,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
struct
tg3
*
tp
=
dev
->
priv
;
if
(
!
(
tp
->
tg3_flags
&
TG3_FLAG_INIT_COMPLETE
)
||
tp
->
link_config
.
phy_is_low_power
)
tp
->
link_config
.
phy_is_low_power
)
return
-
EAGAIN
;
spin_lock_irq
(
&
tp
->
lock
);
...
...
@@ -5885,7 +5887,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
tp
->
link_config
.
duplex
=
cmd
->
duplex
;
}
tg3_setup_phy
(
tp
);
tg3_setup_phy
(
tp
,
1
);
spin_unlock
(
&
tp
->
tx_lock
);
spin_unlock_irq
(
&
tp
->
lock
);
...
...
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