From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 22 Oct 2006 21:16:15 +0000 (+0000)
Subject: fix a timeout on amd flash chips (patch from #874)
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/6e1db97a554390a99e0bb76f7c35baf31043a709

fix a timeout on amd flash chips (patch from #874)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5262 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/generic-2.4/patches/115-amd_flash_timeout.patch b/target/linux/generic-2.4/patches/115-amd_flash_timeout.patch
new file mode 100644
index 000000000..188aa1c88
--- /dev/null
+++ b/target/linux/generic-2.4/patches/115-amd_flash_timeout.patch
@@ -0,0 +1,39 @@
+diff -u linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c.orig linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c.orig	2004-11-17 12:54:21.000000000 +0100
++++ linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c	2006-10-21 17:55:25.000000000 +0200
+@@ -510,7 +510,7 @@
+ 	   or tells us why it failed. */        
+ 	dq6 = CMD(1<<6);
+ 	dq5 = CMD(1<<5);
+-	timeo = jiffies + (HZ/1000); /* setting timeout to 1ms for now */
++	timeo = jiffies + (HZ/1000) + 1; /* setting timeout to 1ms for now */
+ 		
+ 	oldstatus = cfi_read(map, adr);
+ 	status = cfi_read(map, adr);
+@@ -547,7 +547,7 @@
+ 				printk(KERN_WARNING "Internal flash device timeout occurred or write operation was performed while flash was programming.\n" );
+ 			}
+ 		} else {
+-			printk(KERN_WARNING "Waiting for write to complete timed out in do_write_oneword.");        
++			printk(KERN_WARNING "Waiting for write to complete timed out in do_write_oneword.\n");        
+ 			
+ 			chip->state = FL_READY;
+ 			wake_up(&chip->wq);
+@@ -825,7 +825,7 @@
+ 		chip->state = FL_READY;
+ 		wake_up(&chip->wq);
+ 		cfi_spin_unlock(chip->mutex);
+-		printk("waiting for erase to complete timed out.");
++		printk("waiting for erase to complete timed out.\n");
+ 		DISABLE_VPP(map);
+ 		return -EIO;
+ 	}
+@@ -963,7 +963,7 @@
+ 		}
+         else
+         {
+-		    printk( "Waiting for erase to complete timed out in do_erase_oneblock.");        
++		    printk( "Waiting for erase to complete timed out in do_erase_oneblock.\n");        
+ 		    
+ 		chip->state = FL_READY;
+ 		wake_up(&chip->wq);