From: John Crispin <john@openwrt.org>
Date: Sun, 30 Mar 2014 09:15:37 +0000 (+0000)
Subject: lantiq: fix nand/ebu locking
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=561a7ef93bf641d331ccb023db4b099905287552;p=openwrt%2Fstaging%2Fblocktrron.git

lantiq: fix nand/ebu locking

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 40310
---

diff --git a/target/linux/lantiq/patches-3.10/0104-nand.patch b/target/linux/lantiq/patches-3.10/0104-nand.patch
new file mode 100644
index 0000000000..2712e761f0
--- /dev/null
+++ b/target/linux/lantiq/patches-3.10/0104-nand.patch
@@ -0,0 +1,21 @@
+Index: linux-3.10.34/drivers/mtd/nand/xway_nand.c
+===================================================================
+--- linux-3.10.34.orig/drivers/mtd/nand/xway_nand.c	2014-03-28 11:51:49.790953906 +0000
++++ linux-3.10.34/drivers/mtd/nand/xway_nand.c	2014-03-28 15:45:08.196369790 +0000
+@@ -80,13 +80,16 @@
+ 
+ static void xway_select_chip(struct mtd_info *mtd, int chip)
+ {
++	static unsigned long csflags;
+ 
+ 	switch (chip) {
+ 	case -1:
+ 		ltq_ebu_w32_mask(NAND_CON_CE, 0, EBU_NAND_CON);
+ 		ltq_ebu_w32_mask(NAND_CON_NANDM, 0, EBU_NAND_CON);
++		spin_unlock_irqrestore(&ebu_lock, csflags);
+ 		break;
+ 	case 0:
++		spin_lock_irqsave(&ebu_lock, csflags);
+ 		ltq_ebu_w32_mask(0, NAND_CON_NANDM, EBU_NAND_CON);
+ 		ltq_ebu_w32_mask(0, NAND_CON_CE, EBU_NAND_CON);
+ 		break;