From patchwork Tue Apr 19 11:22:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris BREZILLON X-Patchwork-Id: 8878911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 036A39F1D3 for ; Tue, 19 Apr 2016 11:24:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24EF020121 for ; Tue, 19 Apr 2016 11:24:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 58F122026C for ; Tue, 19 Apr 2016 11:24:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1asTjl-00050i-Dh; Tue, 19 Apr 2016 11:22:33 +0000 Received: from down.free-electrons.com ([37.187.137.238] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1asTji-0004vo-CV; Tue, 19 Apr 2016 11:22:31 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 4A80C22B; Tue, 19 Apr 2016 13:22:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from bbrezillon (LMontsouris-657-1-184-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 45D9C8A; Tue, 19 Apr 2016 13:22:07 +0200 (CEST) Date: Tue, 19 Apr 2016 13:22:06 +0200 From: Boris Brezillon To: Roger Quadros Subject: Re: [PATCH v5 39/50] mtd: nand: omap2: switch to mtd_ooblayout_ops Message-ID: <20160419132206.5d909f7e@bbrezillon> In-Reply-To: <57160862.90603@ti.com> References: <1459354505-32551-1-git-send-email-boris.brezillon@free-electrons.com> <1459354505-32551-40-git-send-email-boris.brezillon@free-electrons.com> <5714F011.5080409@ti.com> <20160418170518.363f732d@bbrezillon> <57160862.90603@ti.com> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160419_042230_735997_21BD22DD X-CRM114-Status: GOOD ( 21.39 ) X-Spam-Score: -2.9 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Krzysztof Kozlowski , Harvey Hunt , Nicolas Ferre , Stefan Agner , linux-sunxi@googlegroups.com, linux-mtd@lists.infradead.org, punnaiah choudary kalluri , linux-api@vger.kernel.org, Robert Jarzmik , devel@driverdev.osuosl.org, Archit Taneja , linux-samsung-soc@vger.kernel.org, Kamal Dasu , Richard Weinberger , Chen-Yu Tsai , Kukjin Kim , bcm-kernel-feedback-list@broadcom.com, Ezequiel Garcia , Huang Shijie , Jean-Christophe Plagniol-Villard , Haojian Zhuang , Han Xu , linux-arm-kernel@lists.infradead.org, Priit Laes , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Ralf Baechle , Wenyou Yang , Kyungmin Park , Josh Wu , Alexandre Belloni , Maxime Ripard , Brian Norris , David Woodhouse , Daniel Mack Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Roger, On Tue, 19 Apr 2016 13:28:50 +0300 Roger Quadros wrote: > > @@ -1921,6 +1927,9 @@ static int omap_nand_probe(struct platform_device *pdev) > > nand_chip->ecc.correct = omap_correct_data; > > mtd_set_ooblayout(mtd, &omap_ooblayout_ops); > > oobbytes_per_step = nand_chip->ecc.bytes; > > + > > + if (nand_chip->options & NAND_BUSWIDTH_16) > > + min_oobbytes = 1; > > Shouldn't this have been > if (!(nand_chip->options & NAND_BUSWIDTH_16) > min_oobbytes = 1; > ? Yep. > > > break; > > > > case OMAP_ECC_BCH4_CODE_HW_DETECTION_SW: > > @@ -2038,10 +2047,8 @@ static int omap_nand_probe(struct platform_device *pdev) > > } > > > > /* check if NAND device's OOB is enough to store ECC signatures */ > > - min_oobbytes = (oobbytes_per_step * > > - (mtd->writesize / nand_chip->ecc.size)) + > > - (nand_chip->options & NAND_BUSWIDTH_16 ? > > - BADBLOCK_MARKER_LENGTH : 1); > > + min_oobbytes += (oobbytes_per_step * > > + (mtd->writesize / nand_chip->ecc.size)); > > if (mtd->oobsize < min_oobbytes) { > > dev_err(&info->pdev->dev, > > "not enough OOB bytes required = %d, available=%d\n", > > > > After the above changes BCH with HW ECC worked fine but BCH with SW ECC still failed. > I had to fix it up with the below patch. This is mainly because chip->ecc.steps wasn't > yet initialized before calling nand_bch_init(). > > After the below patch it worked fine with bch4 (hw & sw), bch8 (hw & sw) and ham1. > I couldn't yet verify bch16 though. Thanks for the fix, but I'd prefer fixing the bug for all soft BCH users. Could you try this patch? --->8--- diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c index ca9b2a4..3ca3d39 100644 --- a/drivers/mtd/nand/nand_bch.c +++ b/drivers/mtd/nand/nand_bch.c @@ -177,6 +177,16 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd) goto fail; } + /* + * ecc->steps and ecc->total might be used by mtd->ooblayout->ecc(), + * which is called by mtd_ooblayout_count_eccbytes(). + * Make sure they are properly initialized before calling + * mtd_ooblayout_count_eccbytes(). + * FIXME: we should probaly rework the sequencing in nand_scan_tail() + * to avoid setting those fields twice. + */ + nand->ecc.steps = eccsteps; + nand->ecc.total = eccsteps * eccbytes; if (mtd_ooblayout_count_eccbytes(mtd) != (eccsteps*eccbytes)) { printk(KERN_WARNING "invalid ecc layout\n"); goto fail;