From patchwork Fri Jun 6 03:48:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Wu X-Patchwork-Id: 4309851 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 53526BEEAA for ; Fri, 6 Jun 2014 04:00:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 599342020F for ; Fri, 6 Jun 2014 04:00:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 320D2201E4 for ; Fri, 6 Jun 2014 04:00:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WslIZ-0004Ck-Uc; Fri, 06 Jun 2014 03:58:35 +0000 Received: from nasmtp02.atmel.com ([204.2.163.16] helo=SJOEDG01.corp.atmel.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WslIS-00045l-Gi; Fri, 06 Jun 2014 03:58:29 +0000 Received: from apsmtp01.atmel.com (10.168.254.30) by sjoedg01.corp.atmel.com (10.64.253.30) with Microsoft SMTP Server (TLS) id 14.2.347.0; Thu, 5 Jun 2014 20:59:17 -0700 Received: from shaarm01.corp.atmel.com (10.168.254.13) by apsmtp01.corp.atmel.com (10.168.254.30) with Microsoft SMTP Server id 14.2.347.0; Fri, 6 Jun 2014 11:58:10 +0800 From: Josh Wu To: Subject: [PATCH 2/2] mtd: atmel_nand: NFC: support multiple interrupt handling Date: Fri, 6 Jun 2014 11:48:00 +0800 Message-ID: <1402026480-26648-2-git-send-email-josh.wu@atmel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1402026480-26648-1-git-send-email-josh.wu@atmel.com> References: <1402026480-26648-1-git-send-email-josh.wu@atmel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140605_205828_565208_781F345F X-CRM114-Status: GOOD ( 16.51 ) X-Spam-Score: -0.7 (/) Cc: Josh Wu , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It fixes following error sometime happens during the NFC data transfer: atmel_nand 80000000.nand: Time out to wait for interrupt: 0x00010000 atmel_nand 80000000.nand: something wrong, No XFR_DONE interrupt comes. The root cause is in current interrupt handler, we read the ISR but only handle one interrupt. If there are more than one interrupt come together, then the second one will be lost. During the NFC data transfer. There is possible two NFC interrupts: NFC_CMD_DONE and NFC_XFR_DONE, come in same time. NFC_CMD_DONE means NFC command is send. and NFC_XFR_DONE means NFC data is transfered. This patch can handle multiple NFC interrupts in same time. And during the NFC data transfer, we need to wait for two NFC interrupts: NFC_CMD_DONE and NFC_XFR_DONE. Reported-by: Matthieu CRAPET Signed-off-by: Josh Wu --- drivers/mtd/nand/atmel_nand.c | 61 +++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 347cee2..faee53d 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1579,7 +1579,7 @@ static irqreturn_t hsmc_interrupt(int irq, void *dev_id) { struct atmel_nand_host *host = dev_id; u32 status, mask, pending; - irqreturn_t ret = IRQ_HANDLED; + irqreturn_t ret = IRQ_NONE; status = nfc_readl(host->nfc->hsmc_regs, SR); mask = nfc_readl(host->nfc->hsmc_regs, IMR); @@ -1588,14 +1588,17 @@ static irqreturn_t hsmc_interrupt(int irq, void *dev_id) if (pending & NFC_SR_XFR_DONE) { complete(&host->nfc->comp_xfer_done); nfc_writel(host->nfc->hsmc_regs, IDR, NFC_SR_XFR_DONE); - } else if (pending & NFC_SR_RB_EDGE) { + ret = IRQ_HANDLED; + } + if (pending & NFC_SR_RB_EDGE) { complete(&host->nfc->comp_ready); nfc_writel(host->nfc->hsmc_regs, IDR, NFC_SR_RB_EDGE); - } else if (pending & NFC_SR_CMD_DONE) { + ret = IRQ_HANDLED; + } + if (pending & NFC_SR_CMD_DONE) { complete(&host->nfc->comp_cmd_done); nfc_writel(host->nfc->hsmc_regs, IDR, NFC_SR_CMD_DONE); - } else { - ret = IRQ_NONE; + ret = IRQ_HANDLED; } return ret; @@ -1604,31 +1607,40 @@ static irqreturn_t hsmc_interrupt(int irq, void *dev_id) /* NFC(Nand Flash Controller) related functions */ static int nfc_wait_interrupt(struct atmel_nand_host *host, u32 flag) { - unsigned long timeout; - struct completion *comp; - - if (flag & NFC_SR_XFR_DONE) { - comp = &host->nfc->comp_xfer_done; - } else if (flag & NFC_SR_RB_EDGE) { - comp = &host->nfc->comp_ready; - } else if (flag & NFC_SR_CMD_DONE) { - comp = &host->nfc->comp_cmd_done; - } else { + int i, index = 0; + struct completion *comp[3]; /* Support 3 interrupt completion */ + + if (flag & NFC_SR_XFR_DONE) + comp[index++] = &host->nfc->comp_xfer_done; + + if (flag & NFC_SR_RB_EDGE) + comp[index++] = &host->nfc->comp_ready; + + if (flag & NFC_SR_CMD_DONE) + comp[index++] = &host->nfc->comp_cmd_done; + + if (index == 0) { dev_err(host->dev, "Unkown interrupt flag: 0x%08x\n", flag); return -EINVAL; } - init_completion(comp); + for (i = 0; i < index; i++) + init_completion(comp[i]); /* Enable interrupt that need to wait for */ nfc_writel(host->nfc->hsmc_regs, IER, flag); - timeout = wait_for_completion_timeout(comp, - msecs_to_jiffies(NFC_TIME_OUT_MS)); - if (timeout) - return 0; + for (i = 0; i < index; i++) { + if (wait_for_completion_timeout(comp[i], + msecs_to_jiffies(NFC_TIME_OUT_MS))) + continue; /* wait for next completion */ + else + goto err_timeout; + } - /* Time out to wait for the interrupt */ + return 0; + +err_timeout: dev_err(host->dev, "Time out to wait for interrupt: 0x%08x\n", flag); return -ETIMEDOUT; } @@ -1652,7 +1664,8 @@ static int nfc_send_command(struct atmel_nand_host *host, } nfc_writel(host->nfc->hsmc_regs, CYCLE0, cycle0); nfc_cmd_addr1234_writel(cmd, addr, host->nfc->base_cmd_regs); - return nfc_wait_interrupt(host, NFC_SR_CMD_DONE); + return nfc_wait_interrupt(host, NFC_SR_CMD_DONE | + (cmd & NFCADDR_CMD_DATAEN ? NFC_SR_XFR_DONE : 0)); } static int nfc_device_ready(struct mtd_info *mtd) @@ -1810,10 +1823,6 @@ static void nfc_nand_command(struct mtd_info *mtd, unsigned int command, nfc_addr_cmd = cmd1 | cmd2 | vcmd2 | acycle | csid | dataen | nfcwr; nfc_send_command(host, nfc_addr_cmd, addr1234, cycle0); - if (dataen == NFCADDR_CMD_DATAEN) - if (nfc_wait_interrupt(host, NFC_SR_XFR_DONE)) - dev_err(host->dev, "something wrong, No XFR_DONE interrupt comes.\n"); - /* * Program and erase have their own busy handlers status, sequential * in, and deplete1 need no delay.