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, Josh Wu <josh.wu@atmel.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>,
Boris Brezillon <boris.brezillon@free-electrons.com>
Subject: [PATCH v2 29/51] mtd: nand: davinci: switch to mtd_ooblayout_ops
Date: Thu, 4 Feb 2016 11:06:52 +0100 [thread overview]
Message-ID: <1454580434-32078-30-git-send-email-boris.brezillon@free-electrons.com> (raw)
In-Reply-To: <1454580434-32078-1-git-send-email-boris.brezillon@free-electrons.com>
Implementing the mtd_ooblayout_ops interface is the new way of exposing
ECC/OOB layout to MTD users.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
drivers/mtd/nand/davinci_nand.c | 118 +++++++++++++++-------------------------
1 file changed, 44 insertions(+), 74 deletions(-)
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 8cb821b..fe3fd29 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -54,7 +54,6 @@
*/
struct davinci_nand_info {
struct nand_chip chip;
- struct nand_ecclayout ecclayout;
struct device *dev;
struct clk *clk;
@@ -480,63 +479,46 @@ static int nand_davinci_dev_ready(struct mtd_info *mtd)
* ten ECC bytes plus the manufacturer's bad block marker byte, and
* and not overlapping the default BBT markers.
*/
-static struct nand_ecclayout hwecc4_small = {
- .eccbytes = 10,
- .eccpos = { 0, 1, 2, 3, 4,
- /* offset 5 holds the badblock marker */
- 6, 7,
- 13, 14, 15, },
- .oobfree = {
- {.offset = 8, .length = 5, },
- {.offset = 16, },
- },
-};
+static int hwecc4_ooblayout_small_ecc(struct mtd_info *mtd, int section,
+ struct mtd_oob_region *oobregion)
+{
+ if (section > 2)
+ return -ERANGE;
+
+ if (!section) {
+ oobregion->offset = 0;
+ oobregion->length = 5;
+ } else if (section == 1) {
+ oobregion->offset = 6;
+ oobregion->length = 2;
+ } else {
+ oobregion->offset = 13;
+ oobregion->length = 3;
+ }
-/* An ECC layout for using 4-bit ECC with large-page (2048bytes) flash,
- * storing ten ECC bytes plus the manufacturer's bad block marker byte,
- * and not overlapping the default BBT markers.
- */
-static struct nand_ecclayout hwecc4_2048 = {
- .eccbytes = 40,
- .eccpos = {
- /* at the end of spare sector */
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- },
- .oobfree = {
- /* 2 bytes at offset 0 hold manufacturer badblock markers */
- {.offset = 2, .length = 22, },
- /* 5 bytes at offset 8 hold BBT markers */
- /* 8 bytes at offset 16 hold JFFS2 clean markers */
- },
-};
+ return 0;
+}
-/*
- * An ECC layout for using 4-bit ECC with large-page (4096bytes) flash,
- * storing ten ECC bytes plus the manufacturer's bad block marker byte,
- * and not overlapping the default BBT markers.
- */
-static struct nand_ecclayout hwecc4_4096 = {
- .eccbytes = 80,
- .eccpos = {
- /* at the end of spare sector */
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- },
- .oobfree = {
- /* 2 bytes at offset 0 hold manufacturer badblock markers */
- {.offset = 2, .length = 46, },
- /* 5 bytes at offset 8 hold BBT markers */
- /* 8 bytes at offset 16 hold JFFS2 clean markers */
- },
+static int hwecc4_ooblayout_small_free(struct mtd_info *mtd, int section,
+ struct mtd_oob_region *oobregion)
+{
+ if (section > 1)
+ return -ERANGE;
+
+ if (!section) {
+ oobregion->offset = 8;
+ oobregion->length = 5;
+ } else {
+ oobregion->offset = 16;
+ oobregion->length = mtd->oobsize - 16;
+ }
+
+ return 0;
+}
+
+static const struct mtd_ooblayout_ops hwecc4_small_ooblayout_ops = {
+ .ecc = hwecc4_ooblayout_small_ecc,
+ .free = hwecc4_ooblayout_small_free,
};
#if defined(CONFIG_OF)
@@ -805,26 +787,14 @@ static int nand_davinci_probe(struct platform_device *pdev)
* table marker fits in the free bytes.
*/
if (chunks == 1) {
- info->ecclayout = hwecc4_small;
- info->ecclayout.oobfree[1].length = mtd->oobsize - 16;
- goto syndrome_done;
- }
- if (chunks == 4) {
- info->ecclayout = hwecc4_2048;
+ mtd_set_ooblayout(mtd, &hwecc4_small_ooblayout_ops);
+ } else if (chunks == 4 || chunks == 8) {
+ mtd_set_ooblayout(mtd, &nand_ooblayout_lp_ops);
info->chip.ecc.mode = NAND_ECC_HW_OOB_FIRST;
- goto syndrome_done;
- }
- if (chunks == 8) {
- info->ecclayout = hwecc4_4096;
- info->chip.ecc.mode = NAND_ECC_HW_OOB_FIRST;
- goto syndrome_done;
+ } else {
+ ret = -EIO;
+ goto err;
}
-
- ret = -EIO;
- goto err;
-
-syndrome_done:
- info->chip.ecc.layout = &info->ecclayout;
}
ret = nand_scan_tail(mtd);
--
2.1.4
next prev parent reply other threads:[~2016-02-04 10:18 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-04 10:06 [PATCH v2 00/51] mtd: rework ECC layout definition Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 01/51] mtd: kill the ecclayout->oobavail field Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 02/51] mtd: create an mtd_oobavail() helper and make use of it Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 03/51] mtd: mtdswap: remove useless if (!mtd->ecclayout) test Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 04/51] mtd: nand: simplify nand_bch_init() usage Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 05/51] mtd: add mtd_ooblayout_xxx() helper functions Boris Brezillon
2016-02-05 7:35 ` Boris Brezillon
2016-02-05 9:27 ` Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 06/51] mtd: use mtd_ooblayout_xxx() helpers where appropriate Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 07/51] mtd: nand: core: " Boris Brezillon
2016-02-05 9:31 ` Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 08/51] mtd: nand: atmel: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 09/51] mtd: nand: fsl_ifc: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 10/51] mtd: nand: gpmi: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 11/51] mtd: nand: lpc32xx: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 12/51] mtd: nand: omap2: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 13/51] mtd: onenand: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 14/51] mtd: add mtd_set_ecclayout() helper function Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 15/51] mtd: use mtd_set_ecclayout() where appropriate Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 16/51] mtd: nand: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 17/51] mtd: onenand: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 18/51] mtd: docg3: " Boris Brezillon
2016-02-06 21:55 ` Robert Jarzmik
2016-02-04 10:06 ` [PATCH v2 19/51] mtd: create an mtd_ooblayout_ops struct to ease ECC layout definition Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 20/51] mtd: docg3: switch to mtd_ooblayout_ops Boris Brezillon
2016-02-06 21:57 ` Robert Jarzmik
2016-02-04 10:06 ` [PATCH v2 21/51] mtd: nand: implement the default mtd_ooblayout_ops Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 22/51] mtd: nand: bch: switch to mtd_ooblayout_ops Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 23/51] mtd: nand: sharpsl: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 24/51] mtd: nand: jz4740: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 25/51] mtd: nand: atmel: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 26/51] mtd: nand: bf5xx: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 27/51] mtd: nand: brcm: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 28/51] mtd: nand: cafe: " Boris Brezillon
2016-02-04 10:06 ` Boris Brezillon [this message]
2016-02-04 10:06 ` [PATCH v2 30/51] mtd: nand: denali: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 31/51] mtd: nand: diskonchip: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 32/51] mtd: nand: docg4: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 33/51] mtd: nand: fsl_elbc: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 34/51] mtd: nand: fsl_ifc: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 35/51] mtd: nand: fsmc: " Boris Brezillon
2016-02-04 10:06 ` [PATCH v2 36/51] mtd: nand: gpmi: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 37/51] mtd: nand: hisi504: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 38/51] mtd: nand: jz4780: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 39/51] mtd: nand: lpc32xx: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 40/51] mtd: nand: mxc: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 41/51] mtd: nand: omap2: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 42/51] mtd: nand: pxa3xx: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 43/51] mtd: nand: s3c2410: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 44/51] mtd: nand: sh_flctl: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 45/51] mtd: nand: sm_common: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 46/51] mtd: nand: sunxi: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 47/51] mtd: nand: vf610: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 48/51] mtd: onenand: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 49/51] staging: mt29f_spinand: " Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 50/51] mtd: nand: kill the ecc->layout field Boris Brezillon
2016-02-04 10:07 ` [PATCH v2 51/51] mtd: kill the nand_ecclayout struct 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=1454580434-32078-30-git-send-email-boris.brezillon@free-electrons.com \
--to=boris.brezillon@free-electrons.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=josh.wu@atmel.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=kyungmin.park@samsung.com \
--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=plaes@plaes.org \
--cc=punnaia@xilinx.com \
--cc=ralf@linux-mips.org \
--cc=robert.jarzmik@free.fr \
--cc=stefan@agner.ch \
--cc=wens@csie.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).