1 From aa705c1b0860da91f2ed1a4c0b57337e6de689e1 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Thu, 7 Aug 2014 18:55:31 +0200
4 Subject: [PATCH 17/36] MTD: xway: fix nand locking
6 Signed-off-by: John Crispin <blogic@openwrt.org>
8 drivers/mtd/nand/xway_nand.c | 15 +++------------
9 1 file changed, 3 insertions(+), 12 deletions(-)
11 diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
12 index f813a55..e430f2d 100644
13 --- a/drivers/mtd/nand/xway_nand.c
14 +++ b/drivers/mtd/nand/xway_nand.c
15 @@ -80,13 +80,16 @@ static void xway_reset_chip(struct nand_chip *chip)
17 static void xway_select_chip(struct mtd_info *mtd, int chip)
19 + static unsigned long csflags;
23 ltq_ebu_w32_mask(NAND_CON_CE, 0, EBU_NAND_CON);
24 ltq_ebu_w32_mask(NAND_CON_NANDM, 0, EBU_NAND_CON);
25 + spin_unlock_irqrestore(&ebu_lock, csflags);
28 + spin_lock_irqsave(&ebu_lock, csflags);
29 ltq_ebu_w32_mask(0, NAND_CON_NANDM, EBU_NAND_CON);
30 ltq_ebu_w32_mask(0, NAND_CON_CE, EBU_NAND_CON);
32 @@ -99,7 +102,6 @@ static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
34 struct nand_chip *this = mtd->priv;
35 unsigned long nandaddr = (unsigned long) this->IO_ADDR_W;
36 - unsigned long flags;
38 if (ctrl & NAND_CTRL_CHANGE) {
40 @@ -109,11 +111,9 @@ static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
43 if (cmd != NAND_CMD_NONE) {
44 - spin_lock_irqsave(&ebu_lock, flags);
45 writeb(cmd, (void __iomem *) (nandaddr | xway_latchcmd));
46 while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0)
48 - spin_unlock_irqrestore(&ebu_lock, flags);
52 @@ -126,12 +126,9 @@ static unsigned char xway_read_byte(struct mtd_info *mtd)
54 struct nand_chip *this = mtd->priv;
55 unsigned long nandaddr = (unsigned long) this->IO_ADDR_R;
56 - unsigned long flags;
59 - spin_lock_irqsave(&ebu_lock, flags);
60 ret = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA));
61 - spin_unlock_irqrestore(&ebu_lock, flags);
65 @@ -140,26 +137,20 @@ static void xway_read_buf(struct mtd_info *mtd, u_char *buf, int len)
67 struct nand_chip *this = mtd->priv;
68 unsigned long nandaddr = (unsigned long) this->IO_ADDR_R;
69 - unsigned long flags;
72 - spin_lock_irqsave(&ebu_lock, flags);
73 for (i = 0; i < len; i++)
74 buf[i] = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA));
75 - spin_unlock_irqrestore(&ebu_lock, flags);
78 static void xway_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
80 struct nand_chip *this = mtd->priv;
81 unsigned long nandaddr = (unsigned long) this->IO_ADDR_W;
82 - unsigned long flags;
85 - spin_lock_irqsave(&ebu_lock, flags);
86 for (i = 0; i < len; i++)
87 ltq_w8(buf[i], (void __iomem *)nandaddr);
88 - spin_unlock_irqrestore(&ebu_lock, flags);
91 static int xway_nand_probe(struct platform_device *pdev)