1 files changed, 31 insertions, 17 deletions

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 10b1f7a4fe50..a4615fcc3d00 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -38,8 +38,8 @@
 
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
 
-#define CHIP_DELAY_TIMEOUT      (2 * HZ/10)
-#define NAND_STOP_DELAY         (2 * HZ/50)
+#define CHIP_DELAY_TIMEOUT      msecs_to_jiffies(200)
+#define NAND_STOP_DELAY         msecs_to_jiffies(40)
 #define PAGE_CHUNK_SIZE         (2048)
 
 /*
@@ -605,11 +605,24 @@ static void start_data_dma(struct pxa3xx_nand_info *info)
 {}
 #endif
 
+static irqreturn_t pxa3xx_nand_irq_thread(int irq, void *data)
+{
+        struct pxa3xx_nand_info *info = data;
+
+        handle_data_pio(info);
+
+        info->state = STATE_CMD_DONE;
+        nand_writel(info, NDSR, NDSR_WRDREQ | NDSR_RDDREQ);
+
+        return IRQ_HANDLED;
+}
+
 static irqreturn_t pxa3xx_nand_irq(int irq, void *devid)
 {
         struct pxa3xx_nand_info *info = devid;
         unsigned int status, is_completed = 0, is_ready = 0;
         unsigned int ready, cmd_done;
+        irqreturn_t ret = IRQ_HANDLED;
 
         if (info->cs == 0) {
                 ready           = NDSR_FLASH_RDY;
@@ -651,7 +664,8 @@ static irqreturn_t pxa3xx_nand_irq(int irq, void *devid)
                 } else {
                         info->state = (status & NDSR_RDDREQ) ?
                                       STATE_PIO_READING : STATE_PIO_WRITING;
-                        handle_data_pio(info);
+                        ret = IRQ_WAKE_THREAD;
+                        goto NORMAL_IRQ_EXIT;
                 }
         }
         if (status & cmd_done) {
@@ -692,7 +706,7 @@ static irqreturn_t pxa3xx_nand_irq(int irq, void *devid)
         if (is_ready)
                 complete(&info->dev_ready);
 NORMAL_IRQ_EXIT:
-        return IRQ_HANDLED;
+        return ret;
 }
 
 static inline int is_buf_blank(uint8_t *buf, size_t len)
@@ -951,7 +965,7 @@ static void nand_cmdfunc(struct mtd_info *mtd, unsigned command,
 {
         struct pxa3xx_nand_host *host = mtd->priv;
         struct pxa3xx_nand_info *info = host->info_data;
-        int ret, exec_cmd;
+        int exec_cmd;
 
         /*
          * if this is a x16 device ,then convert the input
@@ -983,9 +997,8 @@ static void nand_cmdfunc(struct mtd_info *mtd, unsigned command,
                 info->need_wait = 1;
                 pxa3xx_nand_start(info);
 
-                ret = wait_for_completion_timeout(&info->cmd_complete,
-                                CHIP_DELAY_TIMEOUT);
-                if (!ret) {
+                if (!wait_for_completion_timeout(&info->cmd_complete,
+                    CHIP_DELAY_TIMEOUT)) {
                         dev_err(&info->pdev->dev, "Wait time out!!!\n");
                         /* Stop State Machine for next command cycle */
                         pxa3xx_nand_stop(info);
@@ -1000,7 +1013,7 @@ static void nand_cmdfunc_extended(struct mtd_info *mtd,
 {
         struct pxa3xx_nand_host *host = mtd->priv;
         struct pxa3xx_nand_info *info = host->info_data;
-        int ret, exec_cmd, ext_cmd_type;
+        int exec_cmd, ext_cmd_type;
 
         /*
          * if this is a x16 device then convert the input
@@ -1063,9 +1076,8 @@ static void nand_cmdfunc_extended(struct mtd_info *mtd,
                 init_completion(&info->cmd_complete);
                 pxa3xx_nand_start(info);
 
-                ret = wait_for_completion_timeout(&info->cmd_complete,
-                                CHIP_DELAY_TIMEOUT);
-                if (!ret) {
+                if (!wait_for_completion_timeout(&info->cmd_complete,
+                    CHIP_DELAY_TIMEOUT)) {
                         dev_err(&info->pdev->dev, "Wait time out!!!\n");
                         /* Stop State Machine for next command cycle */
                         pxa3xx_nand_stop(info);
@@ -1198,13 +1210,11 @@ static int pxa3xx_nand_waitfunc(struct mtd_info *mtd, struct nand_chip *this)
 {
         struct pxa3xx_nand_host *host = mtd->priv;
         struct pxa3xx_nand_info *info = host->info_data;
-        int ret;
 
         if (info->need_wait) {
-                ret = wait_for_completion_timeout(&info->dev_ready,
-                                CHIP_DELAY_TIMEOUT);
                 info->need_wait = 0;
-                if (!ret) {
+                if (!wait_for_completion_timeout(&info->dev_ready,
+                    CHIP_DELAY_TIMEOUT)) {
                         dev_err(&info->pdev->dev, "Ready time out!!!\n");
                         return NAND_STATUS_FAIL;
                 }
@@ -1508,6 +1518,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
                 return ret;
         }
 
+        memset(pxa3xx_flash_ids, 0, sizeof(pxa3xx_flash_ids));
+
         pxa3xx_flash_ids[0].name = f->name;
         pxa3xx_flash_ids[0].dev_id = (f->chip_id >> 8) & 0xffff;
         pxa3xx_flash_ids[0].pagesize = f->page_size;
@@ -1710,7 +1722,9 @@ static int alloc_nand_resource(struct platform_device *pdev)
         /* initialize all interrupts to be disabled */
         disable_int(info, NDSR_MASK);
 
-        ret = request_irq(irq, pxa3xx_nand_irq, 0, pdev->name, info);
+        ret = request_threaded_irq(irq, pxa3xx_nand_irq,
+                                   pxa3xx_nand_irq_thread, IRQF_ONESHOT,
+                                   pdev->name, info);
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed to request IRQ\n");
                 goto fail_free_buf;