From patchwork Fri Mar 3 21:16:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Dasu X-Patchwork-Id: 735239 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 3vZhsK4zF9z9s3v for ; Sat, 4 Mar 2017 08:19:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OEFhLyjd"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p4b86CQx"; 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=x39pvkZ376xrT2gbBr1abRXkqkvPg1bEiypFDyoVhEw=; b=OEFhLyjdCheTGRpvpeSB0vfqz7 t7ZA/u/1eaUd6xgkzwd1KDSvou4RjujwzVmztUxtpbhr1DLoYzBV3w/vGF+NeJWjq6GijThKcg6hX K8LykFHGXnIQHV86uvFT16GAih81SE9jevJ5areqpndX9XOd71Z2rA5BJRfX0vnyLe1yNVL9LwP0P OMPgcX7jP/QY68An1ZZTyTFC3ZOWDSFaOzxJoQnbVzkEo8HeSzeMZhejYtmd/BOwB+NGzQjdw8rPK ppRfFzsCt5CczcBE+j8cCpV4bg3Tfyj+4JXfpsTCXO5vAfjh2xWU8JlpHyjc40m55PdExEm3aU9c+ DPXXTyww==; 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 1cjuc8-0004tf-0M; Fri, 03 Mar 2017 21:19:48 +0000 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cjubK-0004gQ-Uo for linux-mtd@lists.infradead.org; Fri, 03 Mar 2017 21:19:01 +0000 Received: by mail-qk0-x241.google.com with SMTP id n141so6584052qke.3 for ; Fri, 03 Mar 2017 13:18:38 -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=fHZuOwLZhdYQFxdhcqiNTPqXuBLrYCYOoznHnx+Nm/c=; b=p4b86CQxFFLcsYvB2TX61ZSrAckO6CiFaclov+1W33LkGrksqcMSjMcXrQcpWECIy9 HkvH9IECeRtf0aiwstOyQUTmbDT6QYUw8P5gk3/UXCpGnuSqteL66OGaIjatYCz92vHP lloRZUdxM63MFVVcUVfXLq8hkDNvAdYkEdY7Lmd1bz44zv1AEfkLJtWcJEJQfPUvm9/K cH38CbEdOpcHuQa6Yo6d9WFJe+ou6TrPVnQZoSowolhNyH05BULRm9RY/anxv3h3Tpar C09TBxNqUVEruVT3uk2Q3gJG0GUmT7lsxu+KJ9tj6PNOFAlzezU3mhSUI5Cp6DBQEKqy wHGg== 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=fHZuOwLZhdYQFxdhcqiNTPqXuBLrYCYOoznHnx+Nm/c=; b=FegAnfdllMvW2l1w1NIB5GGK14X7u+FlJ77K6Nt1t3N+urrz8RF8aA+r7jEOaaEO7o nlCzEmAaBzULmCw2csJqViT65RjTN/KFXN48Ocm8X8iPQnFU/pcv2q3GX/FLl74lABzt /d7t104rxeDiFP0bkL3R1SIbQp2r7jSR0FNRnPHokeVXOt1McLhgRjy/uCAP/lZiuYxx s4rRSjkgm77/BChW+oUnddxW/J9moqxsgB354pH2BLMtOUG4yWuiWIVkSFKuEmay9b1c pC3wspMH74HG70KpP+0oMMu8pFM36Naq5wOG6WFPyDPkkKTfJlccCnZZOO6TXKkQg7nz Jp5Q== X-Gm-Message-State: AMke39kcJ7kOuHcXP0EG5gtk6F7kTQ1Yaz2NUyN7F3ujPAuM+XhzXpHCZvVu+wIOjaJGMw== X-Received: by 10.237.59.115 with SMTP id q48mr4644259qte.85.1488575917584; Fri, 03 Mar 2017 13:18:37 -0800 (PST) Received: from mail.broadcom.com ([192.19.218.250]) by smtp.gmail.com with ESMTPSA id e5sm252227qtc.6.2017.03.03.13.18.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Mar 2017 13:18:37 -0800 (PST) From: Kamal Dasu To: linux-mtd@lists.infradead.org Subject: [PATCH V6, 1/1] mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program Date: Fri, 3 Mar 2017 16:16:53 -0500 Message-Id: <1488575813-12660-2-git-send-email-kdasu.kdev@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488575813-12660-1-git-send-email-kdasu.kdev@gmail.com> References: <1488575813-12660-1-git-send-email-kdasu.kdev@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170303_131859_078960_8A915A9E X-CRM114-Status: GOOD ( 16.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:241 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 On brcmnand controller v6.x and v7.x, the #WP pin is controlled through the NAND_WP bit in CS_SELECT register. The driver currently assumes that toggling the #WP pin is instantaneously enabling/disabling write-protection, but it actually takes some time to propagate the new state to the internal NAND chip logic. This behavior is sometime causing data corruptions when an erase/program operation is executed before write-protection has really been disabled. Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller") Signed-off-by: Kamal Dasu Acked-by: Boris Brezillon --- drivers/mtd/nand/brcmnand/brcmnand.c | 61 ++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index 42ebd73..7419c5c 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,6 +768,31 @@ enum { CS_SELECT_AUTO_DEVICE_ID_CFG = BIT(30), }; +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(struct brcmnand_controller *ctrl, bool en) { u32 val = en ? CS_SELECT_NAND_WP : 0; @@ -1024,12 +1052,39 @@ static void brcmnand_wp(struct mtd_info *mtd, int wp) if ((ctrl->features & BRCMNAND_HAS_WP) && wp_on == 1) { static int old_wp = -1; + int ret; if (old_wp != wp) { dev_dbg(ctrl->dev, "WP %s\n", wp ? "on" : "off"); old_wp = wp; } + + /* + * 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; + brcmnand_set_wp(ctrl, wp); + 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 | + (wp ? 0 : NAND_STATUS_WP), 0); + + if (ret) + dev_err_ratelimited(&host->pdev->dev, + "nand #WP expected %s\n", + wp ? "on" : "off"); } } @@ -1157,15 +1212,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,