From patchwork Mon Jul 10 10:37:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 786114 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 3x5hWd2gvfz9s0g for ; Mon, 10 Jul 2017 20:38:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MfyQqg00"; 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: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=j7WdDO0eRdQExSX3U0FPjHtx/IXicf/mAXCF8TJtba4=; b=Mfy Qqg00VbC49fQCvkvGU1AmBOYyywRSnuPxOAwbG8l2s5XY6hXIm/pbm7CXFjeiwiPy9EWas5VqPhQq 3fU6FFELqvyHF9vOISG/MZ6xGsS0m07cVjFqQNxUOmwSxg8IPV5sfA6MKvQXOGQzbdawIk0K8C+nf b8FBWxGJHZXKqkASOtChzAmQ/UTDne1fIrV3Ds8MmHB0xKMJFRUovRlomKUy4Xp3hFFkfwuwuDhBX vi7oaFn0xlQMC7rzZR2zGSPLtxSHo9CMoOZT9gKpYpBpY3Gdc2SzNoJYjZEvhkWuIraBNCnrRSzFZ uMO0CHr6PdXia+H2g6NjyPNfYxC2Eug==; 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 1dUW4y-0000Rv-56; Mon, 10 Jul 2017 10:38:12 +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 1dUW4u-0000NT-GE for linux-mtd@lists.infradead.org; Mon, 10 Jul 2017 10:38:10 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 3ACA5209A7; Mon, 10 Jul 2017 12:37:44 +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 shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id F06982093D; Mon, 10 Jul 2017 12:37:43 +0200 (CEST) From: Miquel Raynal To: Subject: [PATCH] mtd: nand: fix lack of oob layout when using no ecc Date: Mon, 10 Jul 2017 12:37:26 +0200 Message-Id: <20170710103726.31858-1-miquel.raynal@free-electrons.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170710_033808_862534_2889F8FC X-CRM114-Status: GOOD ( 14.71 ) 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: Boris Brezillon , Richard Weinberger , Cyrille Pitchen , open list , Marek Vasut , "open list:NAND FLASH SUBSYSTEM" , Miquel Raynal , Brian Norris , David Woodhouse MIME-Version: 1.0 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 | 75 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index c5221795a1e8..28ff58e4385f 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -53,7 +53,45 @@ 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_ecc_sp_bbm_only(struct mtd_info *mtd, int section, + struct mtd_oob_region *oobregion) +{ + return -ERANGE; +} + +static int nand_ooblayout_free_sp_bbm_only(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_bbm_only_ops = { + .ecc = nand_ooblayout_ecc_sp_bbm_only, + .free = nand_ooblayout_free_sp_bbm_only, +}; +EXPORT_SYMBOL_GPL(nand_ooblayout_sp_bbm_only_ops); + static int nand_ooblayout_ecc_sp(struct mtd_info *mtd, int section, struct mtd_oob_region *oobregion) { @@ -109,6 +147,30 @@ const struct mtd_ooblayout_ops nand_ooblayout_sp_ops = { }; EXPORT_SYMBOL_GPL(nand_ooblayout_sp_ops); +static int nand_ooblayout_ecc_lp_bbm_only(struct mtd_info *mtd, int section, + struct mtd_oob_region *oobregion) +{ + return -ERANGE; +} + +static int nand_ooblayout_free_lp_bbm_only(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_bbm_only_ops = { + .ecc = nand_ooblayout_ecc_lp_bbm_only, + .free = nand_ooblayout_free_lp_bbm_only, +}; +EXPORT_SYMBOL_GPL(nand_ooblayout_lp_bbm_only_ops); + static int nand_ooblayout_ecc_lp(struct mtd_info *mtd, int section, struct mtd_oob_region *oobregion) { @@ -4635,6 +4697,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_bbm_only_ops); + else + mtd_set_ooblayout(mtd, &nand_ooblayout_lp_bbm_only_ops); + } + + /* * If no default placement scheme is given, select an appropriate one. */ if (!mtd->ooblayout &&