From patchwork Thu Jun 11 05:44:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Dasu X-Patchwork-Id: 1307317 X-Patchwork-Delegate: miquel.raynal@bootlin.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=QaK+L+Xt; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RPc879Fn; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49jCWC48Sbz9sR4 for ; Thu, 11 Jun 2020 15:45:27 +1000 (AEST) 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: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:In-Reply-To: References:List-Owner; bh=5Aaejqu2+V5ThGOoYcatJkMgtUdoONlyJwvNSocunxw=; b=QaK +L+XttGTqOJLtKcDowqPUg+1cheDy/JBk1B73uddugl3kdiHn3R3RXaUBxcb+sOgj4QFZzSAoJ5IW tWA1v4QR8wvjPNYQVOIhXhkDJMXXorEywiAtep5cT8X3SsfnjyTylR7ANrh7glo1bfL6j4+ga6lnz PnAoMWK/yGIBinLm47E+oLVWBHjjVW6QDPtZbPcIBHxaHTszNAAvTqSd0QYwwtP/jo8uG4pG/97YA 3Z4wNDVdfElBjo4jJT5OCQFTcsYBorrNQhwbWcxG7Z9xJMC9NGOdCHv3dplEjBHavJpRYeNewFDzU V/6Psby/viINXDK8HMyH52Zv6YfoUDw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jjG1X-0004Zk-U9; Thu, 11 Jun 2020 05:45:11 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jjG1U-0003K7-Iq for linux-mtd@lists.infradead.org; Thu, 11 Jun 2020 05:45:09 +0000 Received: by mail-wr1-x444.google.com with SMTP id x6so4721270wrm.13 for ; Wed, 10 Jun 2020 22:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CMSRdAMjqQ0hUIKg7+9PjXGS1txRLKEo1w8Yv1LWP4U=; b=RPc879FnDmXOmAiuG2ZiC2YAn/tFY+I56Ips0B76qiI4DawSzuLFJVbQq0JOYlQDvD QLujLY1XQ4R7Jo2IeeSNhcAYgf3KHPenlEC/nFdJIa9AoFcCBxo6ovQH8zm+bPeHfxFx Ia36NQzuV5x9wyHdewsXeQX2C1iAjxvRH5d+dcUdrkTKU5Wa2CLaXobq1J4sAnYghdwv cN1Knh+GBr2tfe99M45qIk5ozZq8B1Daw1dCXcbesgd3/OscMuvVXSbwvDpkVlMVWCIF nwS/J6EaUvJevLnehE9CPm8svB3JeptLEDquIukgcmT5DmpfSsppK5sv3tCRRfqxrYa0 vg+A== 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; bh=CMSRdAMjqQ0hUIKg7+9PjXGS1txRLKEo1w8Yv1LWP4U=; b=qsLj2g5dBTMKApRZTM8+uUZVOGbYknLzAocvvsQ2/tolNpRxpKk74XzXv4asbmS2Ue 6PNoqK/6tVLf2oNszXgs7OwENVQSGG5L7ZrdNrajUHTIgLzjS8hJvfSTWXtrLPIZIwDx oSqnLGKEOJ7ROdXZGFeW6IS4zIj2UTSBg7aQakb2/BZVawwGfUA1ubIjZFFS+7lkdLri bkygxYCoV0g9Xgpd5YvUhhm3rRfXgL07FzViNK7VXZUeCVC+5KLkS75IRcr/m/WRD7EE UxpNQG9Wjnjt1vbPwNSpeu00oVrR2YzD9NKIVrpegHO8179ZmjSaWJOPo/2v57gV9wMz m0xg== X-Gm-Message-State: AOAM532JntlY8G9Gx3u9Y+SIpEijLaUbHz1OaJIBeKnPQ8qn5oKQkXNe b8+3VbdWBameX0wHqJE1pFg= X-Google-Smtp-Source: ABdhPJwiu6b2yxpfn7MNIZSUJW6IzfpHRnguKDTAPMNAkrUoYbMuKaWHiMGXorXYC42Gftp6XKv2Mw== X-Received: by 2002:a5d:6a4b:: with SMTP id t11mr7404152wrw.404.1591854301729; Wed, 10 Jun 2020 22:45:01 -0700 (PDT) Received: from mail.broadcom.com ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id j16sm3492724wre.21.2020.06.10.22.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 22:45:01 -0700 (PDT) From: Kamal Dasu To: Brian Norris , Kamal Dasu , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra Subject: [PATCH 1/2] mtd: rawnand: brcmnand: Don't default to edu transfer Date: Thu, 11 Jun 2020 01:44:53 -0400 Message-Id: <20200611054454.2547-1-kdasu.kdev@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200610_224508_663407_783FAA92 X-CRM114-Status: GOOD ( 11.22 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [kdasu.kdev[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org When flash-dma is absent do not default to using flash-edu. Make sure flash-edu is enabled before setting EDU transfer function. Fixes: a5d53ad26a8b ("mtd: rawnand: brcmnand: Add support for flash-edu for dma transfers") Signed-off-by: Kamal Dasu --- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index 8f9ffb46a09f..0c1d6e543586 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -2953,8 +2953,9 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) if (ret < 0) goto err; - /* set edu transfer function to call */ - ctrl->dma_trans = brcmnand_edu_trans; + if (has_edu(ctrl)) + /* set edu transfer function to call */ + ctrl->dma_trans = brcmnand_edu_trans; } /* Disable automatic device ID config, direct addressing */ From patchwork Thu Jun 11 05:44:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Dasu X-Patchwork-Id: 1307318 X-Patchwork-Delegate: miquel.raynal@bootlin.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=hKE2xqs9; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=sWnloVRp; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49jCWM3qNjz9sR4 for ; Thu, 11 Jun 2020 15:45:35 +1000 (AEST) 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=xmQ/GUtqpLaRrQwN+oxT8S5Tx+0Gv6DAMyAwzcXx86c=; b=hKE2xqs9m8urH89eOXnMMAJ5VF JrIq59cgIKIo1C5Pp9qq10mce+PhuzRWcN6sjfGwHro9kE/1wSYR9cQEvKzr3uc2hrld22nSDfiw6 GgZ5MLT7mb3z8lCKLdDVYL7Nt6gCtK9DTDIMFKs/fBkW5YIL4fvM3nMceeOPa2WH2dTnVMgY5vUF2 wp9Ulo3VHeGrX0gnsXEvX3gyvGk/OmjrEHJP+oT8nDQAwEHLFZ9hj0TA5pBwePpUwdxcOmRnW/BuD ks/aoxWEF/mE087dSzkSIJah3WmkF/tWSSE2c2LSefidnuBWU74IAgO/kaqzFy2u/XwQ++RmpVkKQ uTheXzOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jjG1j-0004ko-6M; Thu, 11 Jun 2020 05:45:23 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jjG1V-0003Vj-LV for linux-mtd@lists.infradead.org; Thu, 11 Jun 2020 05:45:11 +0000 Received: by mail-wm1-x341.google.com with SMTP id r15so3782619wmh.5 for ; Wed, 10 Jun 2020 22:45:07 -0700 (PDT) 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=GM23ntmkLh0x0xXXUygYPBCzInm4vRrzUCKgyJBobDo=; b=sWnloVRpaRtwFyMx2PlMc7a0HO+ZIZPx3+KezHYtUT52Q+GxdjgnaWYUMmNJUW1vnZ mL1wNmIMZNqgjx3LmiLJ9gxU57rd4P7iNagScmoIKDQukYLXvHRZPzukqGpFyjHjCtji siXghYbLloNdrGjYl43pzeYxkp/3xX+MnvinPCtY3unSPyMfeabDHwumR8dCLa9JdxTu LgAa49PFT8YJTpHDEYXT2GPYzT+UgsOt3IwU9eRlIMnGpH5iW7UwjjnVp7K6Oh7gza4H PWXas0L4mxC9KiDqvXKLrLfVam69YUhCUZD46GRE7KqgNTOrA3+r4VPsl4GefKbQLbgO uYUg== 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=GM23ntmkLh0x0xXXUygYPBCzInm4vRrzUCKgyJBobDo=; b=eXCxq4KOFCYvgER6UpHqiYJAQuMpkiPBPwIdXFvThNxF927Il7XAeZPlIgd2Fi8Qvs oqnbwO+rxZScCj8cy/5lJ45DR+orQiAdzOBkAMTRr+WOOqpQctmJVHQT1TRbFruroiXY MndE0Rn4WFU5vcN/QmKPss0+veHlYfJ8U+dRPVggJQp+e6mp+I48FrvCzMQGdAjzdSEd 3wC6NRBRFzcnPvr+16xyQdka0ONCu8xXK9p0rhSgZViVm76b7pfUHhzvUPQ/B4+GrSbG tbKjvHywMuuWzB9ru6u/xQWfbETgysq6QtFJQHgqYRCnKbHQKq2RCFa6rwkQZifJQn8d DKuw== X-Gm-Message-State: AOAM530IbVhLSqRfSvTAPTU6o1YtVut4EbUwGXzb8p7Zpmk0l2c/74Ux AD2j+9YPkv8WEOl0CzjI1Gg= X-Google-Smtp-Source: ABdhPJw+yB26mkquyy1l1FAMcm4KoBgZN/P2q/14vQK7wDgd7NHbQczEHRUXWyCCLzDpNTTIr1OHoQ== X-Received: by 2002:a1c:4302:: with SMTP id q2mr6380413wma.54.1591854306435; Wed, 10 Jun 2020 22:45:06 -0700 (PDT) Received: from mail.broadcom.com ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id j16sm3492724wre.21.2020.06.10.22.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 22:45:06 -0700 (PDT) From: Kamal Dasu To: Brian Norris , Kamal Dasu , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra Subject: [PATCH 2/2] mtd: rawnand: brcmnand: Ecc error handling on EDU transfers Date: Thu, 11 Jun 2020 01:44:54 -0400 Message-Id: <20200611054454.2547-2-kdasu.kdev@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200611054454.2547-1-kdasu.kdev@gmail.com> References: <20200611054454.2547-1-kdasu.kdev@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200610_224509_717246_01C92DB8 X-CRM114-Status: GOOD ( 13.82 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [kdasu.kdev[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Implemented ECC correctable and uncorrectable error handling for EDU reads. If ECC correctable bitflips are encountered on EDU transfer, read page again using pio, This is needed due to a controller lmitation where read and corrected data is not transferred to the DMA buffer on ECC errors. This holds true for ECC correctable errors beyond set threshold. Fixes: a5d53ad26a8b ("mtd: rawnand: brcmnand: Add support for flash-edu for dma transfers") Signed-off-by: Kamal Dasu --- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index 0c1d6e543586..d7daa83c8a58 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -1855,6 +1855,22 @@ static int brcmnand_edu_trans(struct brcmnand_host *host, u64 addr, u32 *buf, edu_writel(ctrl, EDU_STOP, 0); /* force stop */ edu_readl(ctrl, EDU_STOP); + if (ret == 0 && edu_cmd == EDU_CMD_READ) { + u64 err_addr = 0; + + /* + * check for ecc errors here, subpage ecc erros are + * retained in ecc error addr register + */ + err_addr = brcmnand_get_uncorrecc_addr(ctrl); + if (!err_addr) { + err_addr = brcmnand_get_correcc_addr(ctrl); + if (err_addr) + ret = -EUCLEAN; + } else + ret = -EBADMSG; + } + return ret; } @@ -2058,6 +2074,7 @@ static int brcmnand_read(struct mtd_info *mtd, struct nand_chip *chip, u64 err_addr = 0; int err; bool retry = true; + bool edu_read = false; dev_dbg(ctrl->dev, "read %llx -> %p\n", (unsigned long long)addr, buf); @@ -2075,6 +2092,10 @@ static int brcmnand_read(struct mtd_info *mtd, struct nand_chip *chip, else return -EIO; } + + if (has_edu(ctrl)) + edu_read = true; + } else { if (oob) memset(oob, 0x99, mtd->oobsize); @@ -2122,6 +2143,11 @@ static int brcmnand_read(struct mtd_info *mtd, struct nand_chip *chip, if (mtd_is_bitflip(err)) { unsigned int corrected = brcmnand_count_corrected(ctrl); + /* in case of edu correctable error we read again using pio */ + if (edu_read) + err = brcmnand_read_by_pio(mtd, chip, addr, trans, buf, + oob, &err_addr); + dev_dbg(ctrl->dev, "corrected error at 0x%llx\n", (unsigned long long)err_addr); mtd->ecc_stats.corrected += corrected;