From patchwork Mon Jul 10 12:05:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 786123 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 3x5kSs5QDqz9s1h for ; Mon, 10 Jul 2017 22:05:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XaGQPe+w"; 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=295RpjPt2Ak7I/wICYRTZLhME2vgN8VEMAVp1VuRWe0=; b=XaGQPe+wFB1dog Mp60JOI0oKwLTkS5Gg8ucmqhMmg5VnTZaVRrrBaqfF0J4KmmZkU2mRwpZwgki1nX6uXYfUil5FqFY RUR4bSC1DlUwJmvHEPwbzI2Skb3inLquolTIipp1Bk655Lxky3IUdRATTHzwVEX76oBuLcdjxnAB5 5vih0UbdU5cyepCGWjR/jUOZXV/gQZ7wh28VbfptIbtgyN+/VuXga4dOijNhGhar1G4cH3b9LgaPG 4iBThTOK50QKCuGnn8ky9YLb/wUz0CRUBuSo7VnvWE5Ne1BXkpMTPmcmkBZ+GOXj1vWkCTxLwj1X1 vWembavE9RyspUDbuOaA==; 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 1dUXRq-00032U-Cb; Mon, 10 Jul 2017 12:05:54 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dUXRn-00030Y-8m for linux-mtd@lists.infradead.org; Mon, 10 Jul 2017 12:05:53 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 0377C20942; Mon, 10 Jul 2017 14:05:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from xps13 (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id AF34D2093D; Mon, 10 Jul 2017 14:05:18 +0200 (CEST) Date: Mon, 10 Jul 2017 14:05:19 +0200 From: Miquel RAYNAL To: Boris Brezillon , Richard Weinberger , linux-mtd@lists.infradead.org Subject: [PATCH v2] mtd: nand: fix lack of oob layout when using no ecc Message-ID: <20170710140519.0cb26d90@xps13> In-Reply-To: <20170710103726.31858-1-miquel.raynal@free-electrons.com> References: <20170710103726.31858-1-miquel.raynal@free-electrons.com> Organization: Free Electrons X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; 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-20170710_050551_594232_4F674F90 X-CRM114-Status: GOOD ( 17.91 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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: Marek Vasut , Brian Norris , David Woodhouse , linux-kernel@vger.kernel.org, Cyrille Pitchen Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fix nand core lack of OOB layout when: - the NFC driver does not provide any OOB layout, - ECC operations are disabled (using NAND_ECC_NONE). Using this configuration leads to a crash during the probe. Add layout functions for small and large pages with mainly free bytes plus reserved space for bad block markers. Check the configuration and eventually assign this OOB layout in nand_scan_tail(). Bad block markers position was extracted from the existing OOB layouts by assigning as free all the bytes marked as ECC. Signed-off-by: Miquel Raynal --- drivers/mtd/nand/nand_base.c | 61 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index c5221795a1e8..98ac54c0a0a7 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -53,7 +53,38 @@ static int nand_get_device(struct mtd_info *mtd, int new_state); static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops); -/* Define default oob placement schemes for large and small page devices */ +/* + * Define default OOB placement schemes for: + * - no ECC or software ECC + * - small or large page devices + */ +static int nand_ooblayout_free_sp_no_ecc(struct mtd_info *mtd, int section, + struct mtd_oob_region *oobregion) +{ + if (section > 1) + return -ERANGE; + + if (!section) { + if (mtd->oobsize == 16) { + oobregion->offset = 0; + oobregion->length = 4; + } else { + oobregion->offset = 0; + oobregion->length = 5; + } + } else { + oobregion->offset = 6; + oobregion->length = mtd->oobsize - oobregion->offset; + } + + return 0; +} + +const struct mtd_ooblayout_ops nand_ooblayout_sp_no_ecc_ops = { + .free = nand_ooblayout_free_sp_no_ecc, +}; +EXPORT_SYMBOL_GPL(nand_ooblayout_sp_no_ecc_ops); + static int nand_ooblayout_ecc_sp(struct mtd_info *mtd, int section, struct mtd_oob_region *oobregion) { @@ -109,6 +140,23 @@ const struct mtd_ooblayout_ops nand_ooblayout_sp_ops = { }; EXPORT_SYMBOL_GPL(nand_ooblayout_sp_ops); +static int nand_ooblayout_free_lp_no_ecc(struct mtd_info *mtd, int section, + struct mtd_oob_region *oobregion) +{ + if (section) + return -ERANGE; + + oobregion->offset = 2; + oobregion->length = mtd->oobsize - oobregion->offset; + + return 0; +} + +const struct mtd_ooblayout_ops nand_ooblayout_lp_no_ecc_ops = { + .free = nand_ooblayout_free_lp_no_ecc, +}; +EXPORT_SYMBOL_GPL(nand_ooblayout_lp_no_ecc_ops); + static int nand_ooblayout_ecc_lp(struct mtd_info *mtd, int section, struct mtd_oob_region *oobregion) { @@ -4635,6 +4683,17 @@ int nand_scan_tail(struct mtd_info *mtd) chip->oob_poi = chip->buffers->databuf + mtd->writesize; /* + * When using ECC_NONE, ooblayout must only reserve space for bad block + * markers. + */ + if (!mtd->ooblayout && ecc->mode == NAND_ECC_NONE) { + if (mtd->writesize <= 512) + mtd_set_ooblayout(mtd, &nand_ooblayout_sp_no_ecc_ops); + else + mtd_set_ooblayout(mtd, &nand_ooblayout_lp_no_ecc_ops); + } + + /* * If no default placement scheme is given, select an appropriate one. */ if (!mtd->ooblayout &&