From: Boris Brezillon <boris.brezillon@free-electrons.com>
To: David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
linux-mtd@lists.infradead.org
Cc: Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Ralf Baechle <ralf@linux-mips.org>,
linux-mips@linux-mips.org,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Wenyou Yang <wenyou.yang@atmel.com>,
Josh Wu <rainyfeeling@outlook.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>,
linux-sunxi@googlegroups.com, Stefan Agner <stefan@agner.ch>,
Kyungmin Park <kyungmin.park@samsung.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
punnaiah choudary kalluri <punnaia@xilinx.com>,
Priit Laes <plaes@plaes.org>, Kamal Dasu <kdasu.kdev@gmail.com>,
bcm-kernel-feedback-list@broadcom.com, linux-api@vger.kernel.org,
Boris Brezillon <boris.brezillon@free-electrons.com>
Subject: [PATCH v3 22/52] mtd: nand: bch: switch to mtd_ooblayout_ops
Date: Fri, 26 Feb 2016 01:57:30 +0100 [thread overview]
Message-ID: <1456448280-27788-23-git-send-email-boris.brezillon@free-electrons.com> (raw)
In-Reply-To: <1456448280-27788-1-git-send-email-boris.brezillon@free-electrons.com>
Replace the nand_ecclayout definition by the equivalent mtd_ooblayout_ops
definition.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
drivers/mtd/nand/nand_bch.c | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
index b3039de..e29e75f 100644
--- a/drivers/mtd/nand/nand_bch.c
+++ b/drivers/mtd/nand/nand_bch.c
@@ -32,13 +32,11 @@
/**
* struct nand_bch_control - private NAND BCH control structure
* @bch: BCH control structure
- * @ecclayout: private ecc layout for this BCH configuration
* @errloc: error location array
* @eccmask: XOR ecc mask, allows erased pages to be decoded as valid
*/
struct nand_bch_control {
struct bch_control *bch;
- struct nand_ecclayout ecclayout;
unsigned int *errloc;
unsigned char *eccmask;
};
@@ -124,7 +122,6 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd)
{
struct nand_chip *nand = mtd_to_nand(mtd);
unsigned int m, t, eccsteps, i;
- struct nand_ecclayout *layout = nand->ecc.layout;
struct nand_bch_control *nbc = NULL;
unsigned char *erased_page;
unsigned int eccsize = nand->ecc.size;
@@ -161,8 +158,17 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd)
eccsteps = mtd->writesize/eccsize;
+ /*
+ * Rely on the default ecclayout to ooblayout wrapper provided by MTD
+ * core if ecc.layout is not NULL.
+ * FIXME: this should be removed when all callers have moved to the
+ * mtd_ooblayout_ops approach.
+ */
+ if (nand->ecc.layout)
+ mtd_set_ecclayout(mtd, nand->ecc.layout);
+
/* if no ecc placement scheme was provided, build one */
- if (!layout) {
+ if (!mtd->ooblayout) {
/* handle large page devices only */
if (mtd->oobsize < 64) {
@@ -171,24 +177,7 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd)
goto fail;
}
- layout = &nbc->ecclayout;
- layout->eccbytes = eccsteps*eccbytes;
-
- /* reserve 2 bytes for bad block marker */
- if (layout->eccbytes+2 > mtd->oobsize) {
- printk(KERN_WARNING "no suitable oob scheme available "
- "for oobsize %d eccbytes %u\n", mtd->oobsize,
- eccbytes);
- goto fail;
- }
- /* put ecc bytes at oob tail */
- for (i = 0; i < layout->eccbytes; i++)
- layout->eccpos[i] = mtd->oobsize-layout->eccbytes+i;
-
- layout->oobfree[0].offset = 2;
- layout->oobfree[0].length = mtd->oobsize-2-layout->eccbytes;
-
- nand->ecc.layout = layout;
+ mtd_set_ooblayout(mtd, &nand_ooblayout_lp_ops);
}
/* sanity checks */
--
2.1.4
next prev parent reply other threads:[~2016-02-26 1:03 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 0:57 [PATCH v3 00/52] mtd: rework ECC layout definition Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 01/52] mtd: kill the ecclayout->oobavail field Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 02/52] mtd: create an mtd_oobavail() helper and make use of it Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 03/52] mtd: mtdswap: remove useless if (!mtd->ecclayout) test Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 04/52] mtd: nand: simplify nand_bch_init() usage Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 05/52] mtd: add mtd_ooblayout_xxx() helper functions Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 06/52] mtd: use mtd_ooblayout_xxx() helpers where appropriate Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 07/52] mtd: nand: core: " Boris Brezillon
2016-02-26 14:35 ` Harvey Hunt
2016-02-26 15:10 ` Boris Brezillon
2016-02-26 15:17 ` Harvey Hunt
2016-02-26 18:33 ` Boris Brezillon
2016-02-29 10:33 ` Harvey Hunt
2016-02-26 0:57 ` [PATCH v3 08/52] mtd: nand: atmel: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 09/52] mtd: nand: fsl_ifc: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 10/52] mtd: nand: gpmi: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 11/52] mtd: nand: lpc32xx: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 12/52] mtd: nand: omap2: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 13/52] mtd: onenand: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 14/52] mtd: add mtd_set_ecclayout() helper function Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 15/52] mtd: use mtd_set_ecclayout() where appropriate Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 16/52] mtd: nand: " Boris Brezillon
2016-03-05 2:26 ` Brian Norris
2016-03-05 8:53 ` Boris Brezillon
2016-03-05 9:01 ` Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 17/52] mtd: onenand: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 18/52] mtd: docg3: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 19/52] mtd: create an mtd_ooblayout_ops struct to ease ECC layout definition Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 20/52] mtd: docg3: switch to mtd_ooblayout_ops Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 21/52] mtd: nand: implement the default mtd_ooblayout_ops Boris Brezillon
2016-02-26 0:57 ` Boris Brezillon [this message]
2016-02-26 0:57 ` [PATCH v3 23/52] mtd: nand: sharpsl: switch to mtd_ooblayout_ops Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 24/52] mtd: nand: jz4740: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 25/52] mtd: nand: atmel: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 26/52] mtd: nand: bf5xx: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 27/52] mtd: nand: brcm: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 28/52] mtd: nand: cafe: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 29/52] mtd: nand: davinci: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 30/52] mtd: nand: denali: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 31/52] mtd: nand: diskonchip: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 32/52] mtd: nand: docg4: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 33/52] mtd: nand: fsl_elbc: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 34/52] mtd: nand: fsl_ifc: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 35/52] mtd: nand: fsmc: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 36/52] mtd: nand: fsmc: get rid of the fsmc_nand_eccplace struct Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 37/52] mtd: nand: gpmi: switch to mtd_ooblayout_ops Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 38/52] mtd: nand: hisi504: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 39/52] mtd: nand: jz4780: " Boris Brezillon
2016-02-29 10:45 ` Harvey Hunt
2016-02-26 0:57 ` [PATCH v3 40/52] mtd: nand: lpc32xx: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 41/52] mtd: nand: mxc: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 42/52] mtd: nand: omap2: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 43/52] mtd: nand: pxa3xx: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 44/52] mtd: nand: s3c2410: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 45/52] mtd: nand: sh_flctl: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 46/52] mtd: nand: sm_common: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 47/52] mtd: nand: sunxi: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 48/52] mtd: nand: vf610: " Boris Brezillon
2016-02-26 19:43 ` Stefan Agner
2016-02-26 20:43 ` Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 49/52] mtd: onenand: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 50/52] staging: mt29f_spinand: " Boris Brezillon
2016-02-26 0:57 ` [PATCH v3 51/52] mtd: nand: kill the ecc->layout field Boris Brezillon
2016-02-26 0:58 ` [PATCH v3 52/52] mtd: kill the nand_ecclayout struct Boris Brezillon
2016-02-26 1:27 ` [PATCH v3 00/52] mtd: rework ECC layout definition Stefan Agner
2016-02-26 2:16 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456448280-27788-23-git-send-email-boris.brezillon@free-electrons.com \
--to=boris.brezillon@free-electrons.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=computersforpeace@gmail.com \
--cc=daniel@zonque.org \
--cc=devel@driverdev.osuosl.org \
--cc=dwmw2@infradead.org \
--cc=ezequiel.garcia@free-electrons.com \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=k.kozlowski@samsung.com \
--cc=kdasu.kdev@gmail.com \
--cc=kgene@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=nicolas.ferre@atmel.com \
--cc=plaes@plaes.org \
--cc=plagnioj@jcrosoft.com \
--cc=punnaia@xilinx.com \
--cc=rainyfeeling@outlook.com \
--cc=ralf@linux-mips.org \
--cc=robert.jarzmik@free.fr \
--cc=stefan@agner.ch \
--cc=wens@csie.org \
--cc=wenyou.yang@atmel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).