git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/e1000/base: add missing device ID
[dpdk.git]
/
drivers
/
net
/
e1000
/
base
/
e1000_ich8lan.c
diff --git
a/drivers/net/e1000/base/e1000_ich8lan.c
b/drivers/net/e1000/base/e1000_ich8lan.c
index
1dc2955
..
b79e3ba
100644
(file)
--- a/
drivers/net/e1000/base/e1000_ich8lan.c
+++ b/
drivers/net/e1000/base/e1000_ich8lan.c
@@
-1268,6
+1268,7
@@
out:
s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
{
s32 ret_val = E1000_SUCCESS;
s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
{
s32 ret_val = E1000_SUCCESS;
+ u8 ulp_exit_timeout = 30;
u32 mac_reg;
u16 phy_reg;
int i = 0;
u32 mac_reg;
u16 phy_reg;
int i = 0;
@@
-1289,10
+1290,12
@@
s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
E1000_WRITE_REG(hw, E1000_H2ME, mac_reg);
}
E1000_WRITE_REG(hw, E1000_H2ME, mac_reg);
}
- /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */
+ if (hw->mac.type == e1000_pch_cnp)
+ ulp_exit_timeout = 100;
+
while (E1000_READ_REG(hw, E1000_FWSM) &
E1000_FWSM_ULP_CFG_DONE) {
while (E1000_READ_REG(hw, E1000_FWSM) &
E1000_FWSM_ULP_CFG_DONE) {
- if (i++ ==
30
) {
+ if (i++ ==
ulp_exit_timeout
) {
ret_val = -E1000_ERR_PHY;
goto out;
}
ret_val = -E1000_ERR_PHY;
goto out;
}