Commit af58d7d6 authored by Eli Kupermann's avatar Eli Kupermann Committed by Jeff Garzik

e100 net driver update 1/3:

The patch separates max busy wait constants making in max of 100 usec for
wait scb and max of 50 usec for wait cus idle. These constants found
sufficient using heavy traffic tests.
parent 4a2f6c17
...@@ -144,7 +144,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -144,7 +144,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define E100_MAX_NIC 16 #define E100_MAX_NIC 16
#define E100_MAX_BUSY_WAIT 50 /*Max udelays in wait_scb and wait_cus_idle */ #define E100_MAX_SCB_WAIT 100 /* Max udelays in wait_scb */
#define E100_MAX_CU_IDLE_WAIT 50 /* Max udelays in wait_cus_idle */
/* CPUSAVER_BUNDLE_MAX: Sets the maximum number of frames that will be bundled. /* CPUSAVER_BUNDLE_MAX: Sets the maximum number of frames that will be bundled.
* In some situations, such as the TCP windowing algorithm, it may be * In some situations, such as the TCP windowing algorithm, it may be
......
...@@ -182,7 +182,7 @@ static void e100_non_tx_background(unsigned long); ...@@ -182,7 +182,7 @@ static void e100_non_tx_background(unsigned long);
/* Global Data structures and variables */ /* Global Data structures and variables */
char e100_copyright[] __devinitdata = "Copyright (c) 2002 Intel Corporation"; char e100_copyright[] __devinitdata = "Copyright (c) 2002 Intel Corporation";
#define E100_VERSION "2.0.25-pre1" #define E100_VERSION "2.0.27-pre1"
#define E100_FULL_DRIVER_NAME "Intel(R) PRO/100 Fast Ethernet Adapter - Loadable driver, ver " #define E100_FULL_DRIVER_NAME "Intel(R) PRO/100 Fast Ethernet Adapter - Loadable driver, ver "
...@@ -455,7 +455,7 @@ e100_wait_scb(struct e100_private *bdp) ...@@ -455,7 +455,7 @@ e100_wait_scb(struct e100_private *bdp)
} }
/* it didn't work. do it the slow way using udelay()s */ /* it didn't work. do it the slow way using udelay()s */
for (i = 0; i < E100_MAX_BUSY_WAIT; i++) { for (i = 0; i < E100_MAX_SCB_WAIT; i++) {
if (!readb(&bdp->scb->scb_cmd_low)) if (!readb(&bdp->scb->scb_cmd_low))
return true; return true;
cpu_relax(); cpu_relax();
...@@ -521,7 +521,7 @@ e100_wait_cus_idle(struct e100_private *bdp) ...@@ -521,7 +521,7 @@ e100_wait_cus_idle(struct e100_private *bdp)
cpu_relax(); cpu_relax();
} }
for (i = 0; i < E100_MAX_BUSY_WAIT; i++) { for (i = 0; i < E100_MAX_CU_IDLE_WAIT; i++) {
if (((readw(&(bdp->scb->scb_status)) & SCB_CUS_MASK) != if (((readw(&(bdp->scb->scb_status)) & SCB_CUS_MASK) !=
SCB_CUS_ACTIVE)) { SCB_CUS_ACTIVE)) {
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment