From patchwork Tue Feb 28 16:55:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Dasu X-Patchwork-Id: 733659 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vXlKr5f0kz9s8C for ; Wed, 1 Mar 2017 04:04:16 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dfmhuTMX"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aId7soPY"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=nzD0FiALdtkLTyFWlUhIKa4EjGIHB3F6ELm3r/Rusqg=; b=dfmhuTMXv61QvCVCcIw/w9lMmU Hy7DMDnJlAtjNbYnO3seTcrj4/t0TukPVZyZiQdk+u8q0ils+3PKjp7L8BWzb3C7vG7VECwoqt88Z Z5FK00X1zPQ/nBBdINskmeuiIRI5iSPKTnPBSdg66ED3C+jyByHN5BJUHHrhTtS/179qT/PbAdwON ASTqyBPagvHlWbFYIvdB3fG8kuXe67EqH69aaSMaA7XIIY1AqqCju0iLa9Az6jai5OylfHomxEiaA qp1EiQnYQvRiRdPsZ6Ax/poaOQsL/0h29kB9x8cLKgfzxPx1rRXo98zceyhtBTJZNQ/NiIdRFu4h/ GRxueruQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cilC7-0000g0-2M; Tue, 28 Feb 2017 17:04:11 +0000 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cil57-0005VU-E0 for linux-mtd@lists.infradead.org; Tue, 28 Feb 2017 16:57:04 +0000 Received: by mail-qk0-x243.google.com with SMTP id n186so4259071qkb.0 for ; Tue, 28 Feb 2017 08:56:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1k6XA1g3QTB960tw/jGAjVltSHjnFOB3lUfc3Rnm4nw=; b=aId7soPYf0MHBMkiFZQaPw58oTGyq6msGNE2jOadJN/4wFY+Nm+bHvgqsemCREv86u S6Yz4yiGlkBpYhJ7qsDyLplGO8eoNr/VxcxeBuZNatJaqpr5bi0OpBO2TJ1w2wJSqHG9 NeMGiTny18mx0PZyQup1Ot6ZYXMQogwTaKu7B9BIF1S1y0eBaGbz6mIXR80UcNgsMoVT o1dm46eLvNaVODAhjnNgqaht22zU2PwFiBS53PS6h+7YyBLGm1+FN1uT2QQ0OtR0czvG BSdqmiT6zPYOUsLiZBr2hKhyX8/6FCkKxT0jFtKh6xZzn167ScnE3rV8hT0eIB0DqJrb eVmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1k6XA1g3QTB960tw/jGAjVltSHjnFOB3lUfc3Rnm4nw=; b=TC9fb9MB7xQrBbysKPgqQFm4xbY0ftdjKkJ/3clLUHt8U9ZJ+Z+pidPaiiVQFBzYht dmVq+wxFmp8VXfTqRDh80CAcdqHfDDmDYuGqJ33zlKyNAzLUI+w2GSYicvQ/SZqUD2MM f0m989JQYbNlNHQCJFlElfWVmH7geZ5dLNixZgaM15/l+dK+9nxaA7Sz6fQIxUUCDw5e wYEFjgLsL9fVMwL511xWe5mt32qH672H0jrFYrhQFq+VKmnGCw6HZ0i9SjilzmOS3UZb xU3Zxhct9oEQdJSI5Zg5Zhq2LaISoynBdmfy7jJLrWHANqxJuOeQ6ThS1J9dxFHzOmmO AO2g== X-Gm-Message-State: AMke39k86KcdxERPxo6HR5WOsVlOhwbcj/Acz78cGN0oLEFJXw6vHxqfhNj956COTOXfow== X-Received: by 10.55.161.140 with SMTP id k134mr3627204qke.171.1488300996118; Tue, 28 Feb 2017 08:56:36 -0800 (PST) Received: from mail.broadcom.com ([192.19.218.250]) by smtp.gmail.com with ESMTPSA id m62sm1328154qkf.31.2017.02.28.08.56.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 08:56:35 -0800 (PST) From: Kamal Dasu To: linux-mtd@lists.infradead.org Subject: [PATCH V4, 2/2] mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program Date: Tue, 28 Feb 2017 11:55:26 -0500 Message-Id: <1488300926-3517-2-git-send-email-kdasu.kdev@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488300926-3517-1-git-send-email-kdasu.kdev@gmail.com> References: <1488300926-3517-1-git-send-email-kdasu.kdev@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170228_085657_766911_370E8DBA X-CRM114-Status: GOOD ( 15.08 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400d:c09:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (kdasu.kdev[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: boris.brezillon@free-electrons.com, f.fainelli@gmail.com, Kamal Dasu , richard@nod.at, marek.vasut@gmail.com, bcm-kernel-feedback-list@broadcom.com, cyrille.pitchen@atmel.com, computersforpeace@gmail.com, dwmw2@infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org brcmnand controller v6.x and v7.x lets driver to enable disable #WP pin via NAND_WP bit in CS_SELECT register. Driver implementation assumes that setting/resetting the bit would assert/de-assert #WP pin instantaneously from the flash part's perspective, and was proceeding to erase/program without verifying flash status byte for protection bit. In rigorous testing this was causing rare data corruptions with erase and/or subsequent programming. To fix this check NAND status in addition to controller #WP pin status to make sure both sides are ready to accept new commands. Signed-off-by: Kamal Dasu --- drivers/mtd/nand/brcmnand/brcmnand.c | 70 +++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index c7c4efe..af32685 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -101,6 +101,9 @@ struct brcm_nand_dma_desc { #define BRCMNAND_MIN_BLOCKSIZE (8 * 1024) #define BRCMNAND_MIN_DEVSIZE (4ULL * 1024 * 1024) +#define NAND_CTRL_RDY (INTFC_CTLR_READY | INTFC_FLASH_READY) +#define NAND_POLL_STATUS_TIMEOUT_MS 100 + /* Controller feature flags */ enum { BRCMNAND_HAS_1K_SECTORS = BIT(0), @@ -765,12 +768,69 @@ enum { CS_SELECT_AUTO_DEVICE_ID_CFG = BIT(30), }; -static int brcmnand_set_wp(struct brcmnand_host *host, int en) +static int bcmnand_ctrl_poll_status(struct brcmnand_controller *ctrl, + u32 mask, u32 expected_val, + unsigned long timeout_ms) +{ + unsigned long limit; + u32 val; + + if (!timeout_ms) + timeout_ms = NAND_POLL_STATUS_TIMEOUT_MS; + + limit = jiffies + msecs_to_jiffies(timeout_ms); + do { + val = brcmnand_read_reg(ctrl, BRCMNAND_INTFC_STATUS); + if ((val & mask) == expected_val) + return 0; + + cpu_relax(); + } while (time_after(limit, jiffies)); + + dev_warn(ctrl->dev, "timeout on status poll (expected %x got %x)\n", + expected_val, val & mask); + + return -ETIMEDOUT; +} + +static inline void brcmnand_set_wp_reg(struct brcmnand_controller *ctrl, int en) { - struct brcmnand_controller *ctrl = host->ctrl; u32 val = en ? CS_SELECT_NAND_WP : 0; brcmnand_rmw_reg(ctrl, BRCMNAND_CS_SELECT, CS_SELECT_NAND_WP, 0, val); +} + +static int brcmnand_set_wp(struct brcmnand_host *host, int en) +{ + struct brcmnand_controller *ctrl = host->ctrl; + struct mtd_info *mtd = nand_to_mtd(&host->chip); + struct nand_chip *chip = mtd_to_nand(mtd); + int ret; + + /* + * make sure ctrl/flash ready before and after + * changing state of WP PIN + */ + ret = bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY | NAND_STATUS_READY, + NAND_CTRL_RDY | NAND_STATUS_READY, 0); + if (ret) + return ret; + + brcmnand_set_wp_reg(ctrl, en); + chip->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1); + /* NAND_STATUS_WP 0x00 = protected, 0x80 = not protected */ + ret = bcmnand_ctrl_poll_status(ctrl, + NAND_CTRL_RDY | NAND_STATUS_READY | + NAND_STATUS_WP, + NAND_CTRL_RDY | NAND_STATUS_READY | + (en ? 0 : NAND_STATUS_WP), 0); + + if (ret) { + dev_err_ratelimited(&host->pdev->dev, + "nand #WP expected %s\n", + en ? "On" : "Off"); + return ret; + } return 0; } @@ -1160,15 +1220,15 @@ static irqreturn_t brcmnand_dma_irq(int irq, void *data) static void brcmnand_send_cmd(struct brcmnand_host *host, int cmd) { struct brcmnand_controller *ctrl = host->ctrl; - u32 intfc; + int ret; dev_dbg(ctrl->dev, "send native cmd %d addr_lo 0x%x\n", cmd, brcmnand_read_reg(ctrl, BRCMNAND_CMD_ADDRESS)); BUG_ON(ctrl->cmd_pending != 0); ctrl->cmd_pending = cmd; - intfc = brcmnand_read_reg(ctrl, BRCMNAND_INTFC_STATUS); - WARN_ON(!(intfc & INTFC_CTLR_READY)); + ret = bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY, NAND_CTRL_RDY, 0); + WARN_ON(ret); mb(); /* flush previous writes */ brcmnand_write_reg(ctrl, BRCMNAND_CMD_START,