From patchwork Thu Mar 30 06:45:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 96229 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp102253qgd; Wed, 29 Mar 2017 23:49:10 -0700 (PDT) X-Received: by 10.98.50.5 with SMTP id y5mr4401572pfy.169.1490856550628; Wed, 29 Mar 2017 23:49:10 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s26si1236143pgd.313.2017.03.29.23.49.10; Wed, 29 Mar 2017 23:49:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932945AbdC3GtJ (ORCPT + 22 others); Thu, 30 Mar 2017 02:49:09 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:39928 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932215AbdC3GtF (ORCPT ); Thu, 30 Mar 2017 02:49:05 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id v2U6kUcP015463; Thu, 30 Mar 2017 15:46:32 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v2U6kUcP015463 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1490856393; bh=1CBcEIafwY3CJeycM20szkRU62MG/pxqt6n3nvIVYDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2ghd8pj1/lHSRnMqF3QvUcuAB4CT+Rh9phfDgL4xcwP9pULAqlSqHoA1UjdTjWt8k ju1ZWZJli3XzItnxo0vcoknN5g/Wsca4X7K5lcOaWFt+B9tRVMuWJnRlOFQ6hktkOn cXMWGYv6Br73VPRbk8gKxZImNazdH103U/WqsbawUl5r3uKYJdJkDkLIsGkMZ/LAG6 Pe6J+Safm5cDii5cOjUVy9eqO51t8vQS4k0pKW4QBuGhVsUOuhQa/kGeYOQAlOSFFY bWFkbgnxl2OcGfLoaI/Xdof+OgnjTQxdpMx9HQMYvtUDGxceYPUscNnpUoDfvMxdda mT1dwWYMb2wyw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Enrico Jorns , Artem Bityutskiy , Dinh Nguyen , Boris Brezillon , Marek Vasut , Graham Moore , David Woodhouse , Masami Hiramatsu , Chuanxiao Dong , Jassi Brar , Masahiro Yamada , linux-kernel@vger.kernel.org, Brian Norris , Richard Weinberger , Cyrille Pitchen Subject: [PATCH v3 01/37] mtd: nand: relax ecc.read_page() return value for uncorrectable ECC Date: Thu, 30 Mar 2017 15:45:47 +0900 Message-Id: <1490856383-31560-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490856383-31560-1-git-send-email-yamada.masahiro@socionext.com> References: <1490856383-31560-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The comment for ecc.read_page() requires that it should return "0 if bitflips uncorrectable". Actually, drivers could return positive values when uncorrectable bitflips occur. For example, nand_read_page_swecc() is the case. If ecc.correct() returns -EBADMSG for the first ECC sector, and a positive value for the second one, nand_read_page_swecc() returns a positive max_bitflips and increments ecc_stats.failed for the same page. The requirement can be relaxed by tweaking nand_do_read_ops(). Move the max_bitflips calculation below the retry. Signed-off-by: Masahiro Yamada Suggested-by: Boris Brezillon --- Changes in v3: - Newly added Changes in v2: None drivers/mtd/nand/nand_base.c | 3 +-- include/linux/mtd/nand.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index e13f959..f828ad7 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -1993,8 +1993,6 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, break; } - max_bitflips = max_t(unsigned int, max_bitflips, ret); - /* Transfer not aligned data */ if (use_bufpoi) { if (!NAND_HAS_SUBPAGE_READ(chip) && !oob && @@ -2045,6 +2043,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, } buf += bytes; + max_bitflips = max_t(unsigned int, max_bitflips, ret); } else { memcpy(buf, chip->buffers->databuf + col, bytes); buf += bytes; diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 9591e0f..69cccd1 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -525,7 +525,7 @@ static inline void nand_hw_control_init(struct nand_hw_control *nfc) * out-of-band data). * @read_page: function to read a page according to the ECC generator * requirements; returns maximum number of bitflips corrected in - * any single ECC step, 0 if bitflips uncorrectable, -EIO hw error + * any single ECC step, -EIO hw error * @read_subpage: function to read parts of the page covered by ECC; * returns same as read_page() * @write_subpage: function to write parts of the page covered by ECC.