projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
e1000e: Reduce boot time by tightening sleep ranges
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
intel
/
e1000e
/
ethtool.c
diff --git
a/drivers/net/ethernet/intel/e1000e/ethtool.c
b/drivers/net/ethernet/intel/e1000e/ethtool.c
index
02ebf20
..
0834269
100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/
drivers/net/ethernet/intel/e1000e/ethtool.c
@@
-1014,7
+1014,7
@@
static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
/* Disable all the interrupts */
ew32(IMC, 0xFFFFFFFF);
e1e_flush();
/* Disable all the interrupts */
ew32(IMC, 0xFFFFFFFF);
e1e_flush();
- usleep_range(10000,
20
000);
+ usleep_range(10000,
11
000);
/* Test each interrupt */
for (i = 0; i < 10; i++) {
/* Test each interrupt */
for (i = 0; i < 10; i++) {
@@
-1046,7
+1046,7
@@
static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
ew32(IMC, mask);
ew32(ICS, mask);
e1e_flush();
ew32(IMC, mask);
ew32(ICS, mask);
e1e_flush();
- usleep_range(10000,
20
000);
+ usleep_range(10000,
11
000);
if (adapter->test_icr & mask) {
*data = 3;
if (adapter->test_icr & mask) {
*data = 3;
@@
-1064,7
+1064,7
@@
static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
ew32(IMS, mask);
ew32(ICS, mask);
e1e_flush();
ew32(IMS, mask);
ew32(ICS, mask);
e1e_flush();
- usleep_range(10000,
20
000);
+ usleep_range(10000,
11
000);
if (!(adapter->test_icr & mask)) {
*data = 4;
if (!(adapter->test_icr & mask)) {
*data = 4;
@@
-1082,7
+1082,7
@@
static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
ew32(IMC, ~mask & 0x00007FFF);
ew32(ICS, ~mask & 0x00007FFF);
e1e_flush();
ew32(IMC, ~mask & 0x00007FFF);
ew32(ICS, ~mask & 0x00007FFF);
e1e_flush();
- usleep_range(10000,
20
000);
+ usleep_range(10000,
11
000);
if (adapter->test_icr) {
*data = 5;
if (adapter->test_icr) {
*data = 5;
@@
-1094,7
+1094,7
@@
static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
/* Disable all the interrupts */
ew32(IMC, 0xFFFFFFFF);
e1e_flush();
/* Disable all the interrupts */
ew32(IMC, 0xFFFFFFFF);
e1e_flush();
- usleep_range(10000,
20
000);
+ usleep_range(10000,
11
000);
/* Unhook test interrupt handler */
free_irq(irq, netdev);
/* Unhook test interrupt handler */
free_irq(irq, netdev);
@@
-1470,7
+1470,7
@@
static int e1000_set_82571_fiber_loopback(struct e1000_adapter *adapter)
*/
ew32(SCTL, E1000_SCTL_ENABLE_SERDES_LOOPBACK);
e1e_flush();
*/
ew32(SCTL, E1000_SCTL_ENABLE_SERDES_LOOPBACK);
e1e_flush();
- usleep_range(10000,
20
000);
+ usleep_range(10000,
11
000);
return 0;
}
return 0;
}
@@
-1584,7
+1584,7
@@
static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
hw->phy.media_type == e1000_media_type_internal_serdes) {
ew32(SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
e1e_flush();
hw->phy.media_type == e1000_media_type_internal_serdes) {
ew32(SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
e1e_flush();
- usleep_range(10000,
20
000);
+ usleep_range(10000,
11
000);
break;
}
/* Fall Through */
break;
}
/* Fall Through */