From: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date: Thu, 25 Aug 2005 20:06:23 +0000 (-0700)
Subject: [PATCH] e100: Increased delay loop for command blocks
X-Git-Tag: v2.6.14-rc1~1025^2~2^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e6280f26b43775d8fa0c54e50c92491cfccbf738;p=linux-2.6-omap-h63xx.git

[PATCH] e100: Increased delay loop for command blocks

Increased delay loop for command blocks

Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index e0fcac889a5..09448ec48a7 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -785,6 +785,7 @@ static int e100_eeprom_save(struct nic *nic, u16 start, u16 count)
 }
 
 #define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */
+#define E100_WAIT_SCB_FAST 20       /* delay like the old code */
 static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
 {
 	unsigned long flags;
@@ -798,7 +799,7 @@ static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
 		if(likely(!readb(&nic->csr->scb.cmd_lo)))
 			break;
 		cpu_relax();
-		if(unlikely(i > (E100_WAIT_SCB_TIMEOUT >> 1)))
+		if(unlikely(i > E100_WAIT_SCB_FAST))
 			udelay(5);
 	}
 	if(unlikely(i == E100_WAIT_SCB_TIMEOUT)) {