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 36/51] mtd: nand: gpmi: switch to mtd_ooblayout_ops
Date: Thu, 4 Feb 2016 11:06:59 +0100 [thread overview]
Message-ID: <1454580434-32078-37-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/gpmi-nand/gpmi-nand.c | 52 ++++++++++++++++++++++++++--------
1 file changed, 40 insertions(+), 12 deletions(-)
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 3a29b65..316b5ac 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -47,10 +47,44 @@ static struct nand_bbt_descr gpmi_bbt_descr = {
* We may change the layout if we can get the ECC info from the datasheet,
* else we will use all the (page + OOB).
*/
-static struct nand_ecclayout gpmi_hw_ecclayout = {
- .eccbytes = 0,
- .eccpos = { 0, },
- .oobfree = { {.offset = 0, .length = 0} }
+static int gpmi_ooblayout_ecc(struct mtd_info *mtd, int section,
+ struct mtd_oob_region *oobregion)
+{
+ struct nand_chip *chip = mtd_to_nand(mtd);
+ struct gpmi_nand_data *this = nand_get_controller_data(chip);
+ struct bch_geometry *geo = &this->bch_geometry;
+
+ if (section)
+ return -ERANGE;
+
+ oobregion->offset = 0;
+ oobregion->length = geo->page_size - mtd->writesize;
+
+ return 0;
+}
+
+static int gpmi_ooblayout_free(struct mtd_info *mtd, int section,
+ struct mtd_oob_region *oobregion)
+{
+ struct nand_chip *chip = mtd_to_nand(mtd);
+ struct gpmi_nand_data *this = nand_get_controller_data(chip);
+ struct bch_geometry *geo = &this->bch_geometry;
+
+ if (section)
+ return -ERANGE;
+
+ /* The available oob size we have. */
+ if (geo->page_size < mtd->writesize + mtd->oobsize) {
+ oobregion->offset = geo->page_size - mtd->writesize;
+ oobregion->length = mtd->oobsize - oobregion->offset;
+ }
+
+ return 0;
+}
+
+static const struct mtd_ooblayout_ops gpmi_ooblayout_ops = {
+ .ecc = gpmi_ooblayout_ecc,
+ .free = gpmi_ooblayout_free,
};
static const struct gpmi_devdata gpmi_devdata_imx23 = {
@@ -141,7 +175,6 @@ static int set_geometry_by_ecc_info(struct gpmi_nand_data *this)
struct bch_geometry *geo = &this->bch_geometry;
struct nand_chip *chip = &this->nand;
struct mtd_info *mtd = nand_to_mtd(chip);
- struct nand_oobfree *of = gpmi_hw_ecclayout.oobfree;
unsigned int block_mark_bit_offset;
if (!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0))
@@ -229,12 +262,6 @@ static int set_geometry_by_ecc_info(struct gpmi_nand_data *this)
geo->page_size = mtd->writesize + geo->metadata_size +
(geo->gf_len * geo->ecc_strength * geo->ecc_chunk_count) / 8;
- /* The available oob size we have. */
- if (geo->page_size < mtd->writesize + mtd->oobsize) {
- of->offset = geo->page_size - mtd->writesize;
- of->length = mtd->oobsize - of->offset;
- }
-
geo->payload_size = mtd->writesize;
geo->auxiliary_status_offset = ALIGN(geo->metadata_size, 4);
@@ -1841,6 +1868,7 @@ static void gpmi_nand_exit(struct gpmi_nand_data *this)
static int gpmi_init_last(struct gpmi_nand_data *this)
{
struct nand_chip *chip = &this->nand;
+ struct mtd_info *mtd = nand_to_mtd(chip);
struct nand_ecc_ctrl *ecc = &chip->ecc;
struct bch_geometry *bch_geo = &this->bch_geometry;
int ret;
@@ -1862,7 +1890,7 @@ static int gpmi_init_last(struct gpmi_nand_data *this)
ecc->mode = NAND_ECC_HW;
ecc->size = bch_geo->ecc_chunk_size;
ecc->strength = bch_geo->ecc_strength;
- ecc->layout = &gpmi_hw_ecclayout;
+ mtd_set_ooblayout(mtd, &gpmi_ooblayout_ops);
/*
* We only enable the subpage read when:
--
2.1.4
next prev parent reply other threads:[~2016-02-04 10:16 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 ` [PATCH v2 29/51] mtd: nand: davinci: " Boris Brezillon
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 ` Boris Brezillon [this message]
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-37-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).