From patchwork Tue Jul 12 10:28:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Wen X-Patchwork-Id: 967942 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6CAURCg007932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jul 2011 10:30:47 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QgaEI-0003or-Vx; Tue, 12 Jul 2011 10:30:16 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QgaEI-0003QM-G6; Tue, 12 Jul 2011 10:30:14 +0000 Received: from dakia2.marvell.com ([65.219.4.35]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QgaDC-0003ES-29 for linux-arm-kernel@lists.infradead.org; Tue, 12 Jul 2011 10:29:08 +0000 X-ASG-Debug-ID: 1310466544-082ecdf80001-tbGyMd Received: from maili.marvell.com (maili.marvell.com [10.68.76.51]) by dakia2.marvell.com with ESMTP id zbh1RJkER4DVtghZ; Tue, 12 Jul 2011 03:29:04 -0700 (PDT) X-Barracuda-Envelope-From: leiwen@marvell.com Received: from localhost (sh4-dt.marvell.com [10.38.164.113]) by maili.marvell.com (Postfix) with ESMTP id CF05B8A002; Tue, 12 Jul 2011 03:29:03 -0700 (PDT) From: Lei Wen To: Daniel Mack , Artem Bityutskiy , Igor Grinberg , Eric Miao , David Woodhouse , Haojian Zhuang , linux-mtd@lists.infradead.org, linux-arm-kernel , Yu Tang X-ASG-Orig-Subj: [PATCH V6 4/4] MTD: pxa3xx_nand: enhance suspend and resume routine Subject: [PATCH V6 4/4] MTD: pxa3xx_nand: enhance suspend and resume routine Date: Tue, 12 Jul 2011 03:28:55 -0700 X-ASG-Orig-Subj: [PATCH V6 4/4] MTD: pxa3xx_nand: enhance suspend and resume routine Message-Id: <1310466535-15287-5-git-send-email-leiwen@marvell.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1310096084-14646-1-git-send-email-leiwen@marvell.com> References: <1310096084-14646-1-git-send-email-leiwen@marvell.com> X-Barracuda-Connect: maili.marvell.com[10.68.76.51] X-Barracuda-Start-Time: 1310466544 X-Barracuda-URL: http://10.68.76.222:80/cgi-mod/mark.cgi X-Barracuda-Spam-Score: -1002.00 X-Barracuda-Spam-Status: No, SCORE=-1002.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=1000.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110712_062906_407359_9FCB27A2 X-CRM114-Status: GOOD ( 17.21 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 12 Jul 2011 10:30:47 +0000 (UTC) This patch add protection on the suspend&resume path to prevent some unexpected behavior, like interrupt occur at the very second of resume back and it don't follow normal command path, which lead to bug. Signed-off-by: Lei Wen --- drivers/mtd/nand/pxa3xx_nand.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 3756d54..35149fe 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1246,18 +1246,34 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state) { struct pxa3xx_nand_info *info = platform_get_drvdata(pdev); + struct pxa3xx_nand_platform_data *pdata; + struct mtd_info *mtd; + int cs; + pdata = pdev->dev.platform_data; if (info->state) { dev_err(&pdev->dev, "driver busy, state = %d\n", info->state); return -EAGAIN; } + for (cs = 0; cs < pdata->num_cs; cs ++) { + mtd = info->host[cs]->mtd; + mtd->suspend(mtd); + } + + clk_disable(info->clk); return 0; } static int pxa3xx_nand_resume(struct platform_device *pdev) { struct pxa3xx_nand_info *info = platform_get_drvdata(pdev); + struct pxa3xx_nand_platform_data *pdata; + int cs; + + pdata = pdev->dev.platform_data; + /* We don't want to handle interrupt without calling mtd routine */ + disable_int(info, NDCR_INT_MASK); /* * Directly set the chip select to a invalid value, @@ -1267,6 +1283,18 @@ static int pxa3xx_nand_resume(struct platform_device *pdev) info->cs = 0xff; clk_enable(info->clk); + /* + * As the spec, the NDSR would be updated to 0x1800 when + * do the nand_clk disable/enable. + * To prevent it damage state machine of the driver, clear + * all status before resume + */ + nand_writel(nand, NDSR, NDSR_MASK); + for (cs = 0; cs < pdata->num_cs; cs ++) { + mtd = info->host[cs]->mtd; + mtd->resume(mtd); + } + return 0; } #else