From: Boris Brezillon <boris.brezillon@bootlin.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Wenyou Yang <wenyou.yang@microchip.com>,
Josh Wu <rainyfeeling@outlook.com>,
Tudor Ambarus <Tudor.Ambarus@microchip.com>,
Richard Weinberger <richard@nod.at>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Kamal Dasu <kdasu.kdev@gmail.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Han Xu <han.xu@nxp.com>, Harvey Hunt <harveyhuntnexus@gmail.com>,
Vladimir Zapolskiy <vz@mleia.com>,
Sylvain Lemieux <slemieux.tyco@gmail.com>,
Xiaolei Li <xiaolei.li@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>,
Marc Gonzalez <marc.w.gonzalez@free.fr>,
Mans Rullgard <mans@mansr.com>, Stefan Agner <stefan@agner.ch>,
linux-mtd@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
bcm-kernel-feedback-list@broadcom.com,
linux-mediatek@lists.infradead.org
Subject: Re: [PATCH v4 15/35] mtd: rawnand: mxc: convert driver to nand_scan()
Date: Sat, 21 Jul 2018 19:19:04 +0200 [thread overview]
Message-ID: <20180721191904.541faf4d@bbrezillon> (raw)
In-Reply-To: <20180720151527.16038-16-miquel.raynal@bootlin.com>
On Fri, 20 Jul 2018 17:15:07 +0200
Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> Two helpers have been added to the core to make ECC-related
> configuration between the detection phase and the final NAND scan. Use
> these hooks and convert the driver to just use nand_scan() instead of
> both nand_scan_ident() and nand_scan_tail().
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
> drivers/mtd/nand/raw/mxc_nand.c | 136 +++++++++++++++++++++-------------------
> 1 file changed, 71 insertions(+), 65 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
> index c6eff61e909d..4c9214dea424 100644
> --- a/drivers/mtd/nand/raw/mxc_nand.c
> +++ b/drivers/mtd/nand/raw/mxc_nand.c
> @@ -1691,6 +1691,74 @@ static int mxcnd_probe_dt(struct mxc_nand_host *host)
> }
> #endif
>
> +static int mxcnd_attach_chip(struct nand_chip *chip)
> +{
> + struct mtd_info *mtd = nand_to_mtd(chip);
> + struct mxc_nand_host *host = nand_get_controller_data(chip);
> + struct device *dev = mtd->dev.parent;
> +
> + switch (chip->ecc.mode) {
> + case NAND_ECC_HW:
> + chip->ecc.read_page = mxc_nand_read_page;
> + chip->ecc.read_page_raw = mxc_nand_read_page_raw;
> + chip->ecc.read_oob = mxc_nand_read_oob;
> + chip->ecc.write_page = mxc_nand_write_page_ecc;
> + chip->ecc.write_page_raw = mxc_nand_write_page_raw;
> + chip->ecc.write_oob = mxc_nand_write_oob;
> + break;
> +
> + case NAND_ECC_SOFT:
> + break;
> +
> + default:
> + return -EINVAL;
> + }
> +
> + if (chip->bbt_options & NAND_BBT_USE_FLASH) {
> + chip->bbt_td = &bbt_main_descr;
> + chip->bbt_md = &bbt_mirror_descr;
> + }
> +
> + /* Allocate the right size buffer now */
> + devm_kfree(dev, (void *)host->data_buf);
> + host->data_buf = devm_kzalloc(dev, mtd->writesize + mtd->oobsize,
> + GFP_KERNEL);
> + if (!host->data_buf)
> + return -ENOMEM;
> +
> + /* Call preset again, with correct writesize chip time */
> + host->devtype_data->preset(mtd);
> +
> + if (!chip->ecc.bytes) {
> + if (host->eccsize == 8)
> + chip->ecc.bytes = 18;
> + else if (host->eccsize == 4)
> + chip->ecc.bytes = 9;
> + }
> +
> + /*
> + * Experimentation shows that i.MX NFC can only handle up to 218 oob
> + * bytes. Limit used_oobsize to 218 so as to not confuse copy_spare()
> + * into copying invalid data to/from the spare IO buffer, as this
> + * might cause ECC data corruption when doing sub-page write to a
> + * partially written page.
> + */
> + host->used_oobsize = min(mtd->oobsize, 218U);
> +
> + if (chip->ecc.mode == NAND_ECC_HW) {
> + if (is_imx21_nfc(host) || is_imx27_nfc(host))
> + chip->ecc.strength = 1;
> + else
> + chip->ecc.strength = (host->eccsize == 4) ? 4 : 8;
> + }
> +
> + return 0;
> +}
> +
> +static const struct nand_controller_ops mxcnd_controller_ops = {
> + .attach_chip = mxcnd_attach_chip,
> +};
> +
> static int mxcnd_probe(struct platform_device *pdev)
> {
> struct nand_chip *this;
> @@ -1830,71 +1898,9 @@ static int mxcnd_probe(struct platform_device *pdev)
> host->devtype_data->irq_control(host, 1);
> }
>
> - /* first scan to find the device and get the page size */
> - err = nand_scan_ident(mtd, is_imx25_nfc(host) ? 4 : 1, NULL);
> - if (err)
> - goto escan;
> -
> - switch (this->ecc.mode) {
> - case NAND_ECC_HW:
> - this->ecc.read_page = mxc_nand_read_page;
> - this->ecc.read_page_raw = mxc_nand_read_page_raw;
> - this->ecc.read_oob = mxc_nand_read_oob;
> - this->ecc.write_page = mxc_nand_write_page_ecc;
> - this->ecc.write_page_raw = mxc_nand_write_page_raw;
> - this->ecc.write_oob = mxc_nand_write_oob;
> - break;
> -
> - case NAND_ECC_SOFT:
> - break;
> -
> - default:
> - err = -EINVAL;
> - goto escan;
> - }
> -
> - if (this->bbt_options & NAND_BBT_USE_FLASH) {
> - this->bbt_td = &bbt_main_descr;
> - this->bbt_md = &bbt_mirror_descr;
> - }
> -
> - /* allocate the right size buffer now */
> - devm_kfree(&pdev->dev, (void *)host->data_buf);
> - host->data_buf = devm_kzalloc(&pdev->dev, mtd->writesize + mtd->oobsize,
> - GFP_KERNEL);
> - if (!host->data_buf) {
> - err = -ENOMEM;
> - goto escan;
> - }
> -
> - /* Call preset again, with correct writesize this time */
> - host->devtype_data->preset(mtd);
> -
> - if (!this->ecc.bytes) {
> - if (host->eccsize == 8)
> - this->ecc.bytes = 18;
> - else if (host->eccsize == 4)
> - this->ecc.bytes = 9;
> - }
> -
> - /*
> - * Experimentation shows that i.MX NFC can only handle up to 218 oob
> - * bytes. Limit used_oobsize to 218 so as to not confuse copy_spare()
> - * into copying invalid data to/from the spare IO buffer, as this
> - * might cause ECC data corruption when doing sub-page write to a
> - * partially written page.
> - */
> - host->used_oobsize = min(mtd->oobsize, 218U);
> -
> - if (this->ecc.mode == NAND_ECC_HW) {
> - if (is_imx21_nfc(host) || is_imx27_nfc(host))
> - this->ecc.strength = 1;
> - else
> - this->ecc.strength = (host->eccsize == 4) ? 4 : 8;
> - }
> -
> - /* second phase scan */
> - err = nand_scan_tail(mtd);
> + /* Scan the NAND device */
> + this->dummy_controller.ops = &mxcnd_controller_ops;
> + err = nand_scan(mtd, is_imx25_nfc(host) ? 4 : 1);
> if (err)
> goto escan;
>
next prev parent reply other threads:[~2018-07-21 17:19 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 15:14 [PATCH v4 00/35] Allow dynamic allocations during NAND chip identification phase Miquel Raynal
2018-07-20 15:14 ` [PATCH v4 01/35] mtd: rawnand: brcmnand: convert driver to nand_scan() Miquel Raynal
2018-07-21 6:23 ` Boris Brezillon
2018-07-20 15:14 ` [PATCH v4 02/35] mtd: rawnand: cafe: " Miquel Raynal
2018-07-21 6:35 ` Boris Brezillon
2018-07-20 15:14 ` [PATCH v4 03/35] mtd: rawnand: davinci: " Miquel Raynal
2018-07-21 6:44 ` Boris Brezillon
2018-07-20 15:14 ` [PATCH v4 04/35] mtd: rawnand: denali: convert " Miquel Raynal
2018-07-21 6:46 ` Boris Brezillon
2018-07-25 9:42 ` Masahiro Yamada
2018-07-25 9:51 ` Boris Brezillon
2018-07-25 12:47 ` Miquel Raynal
2018-07-25 14:16 ` Masahiro Yamada
2018-07-20 15:14 ` [PATCH v4 05/35] mtd: rawnand: fsl_elbc: convert driver " Miquel Raynal
2018-07-21 6:50 ` Boris Brezillon
2018-07-20 15:14 ` [PATCH v4 06/35] mtd: rawnand: fsl_ifc: " Miquel Raynal
2018-07-21 6:53 ` Boris Brezillon
2018-07-20 15:14 ` [PATCH v4 07/35] mtd: rawnand: fsmc: " Miquel Raynal
2018-07-21 6:55 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 08/35] mtd: rawnand: gpmi: " Miquel Raynal
2018-07-21 6:56 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 09/35] mtd: rawnand: hisi504: " Miquel Raynal
2018-07-21 6:59 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 10/35] mtd: rawnand: jz4780: " Miquel Raynal
2018-07-21 15:23 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 11/35] mtd: rawnand: lpc32xx_mlc: " Miquel Raynal
2018-07-21 15:26 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 12/35] mtd: rawnand: lpc32xx_slc: " Miquel Raynal
2018-07-21 15:27 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 13/35] mtd: rawnand: marvell: " Miquel Raynal
2018-07-21 16:57 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 14/35] mtd: rawnand: mtk: " Miquel Raynal
2018-07-21 17:10 ` Boris Brezillon
2018-07-26 6:06 ` xiaolei li
2018-07-26 6:14 ` Boris Brezillon
2018-07-26 6:46 ` xiaolei li
2018-07-26 6:49 ` Miquel Raynal
2018-07-26 6:53 ` xiaolei li
2018-07-20 15:15 ` [PATCH v4 15/35] mtd: rawnand: mxc: " Miquel Raynal
2018-07-21 17:19 ` Boris Brezillon [this message]
2018-07-20 15:15 ` [PATCH v4 16/35] mtd: rawnand: nandsim: " Miquel Raynal
2018-07-21 17:21 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 17/35] mtd: rawnand: omap2: " Miquel Raynal
2018-07-21 17:34 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 18/35] mtd: rawnand: s3c2410: " Miquel Raynal
2018-07-21 17:38 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 19/35] mtd: rawnand: sh_flctl: move all NAND chip related setup in one function Miquel Raynal
2018-07-21 17:48 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 20/35] mtd: rawnand: sh_flctl: convert driver to nand_scan() Miquel Raynal
2018-07-21 17:49 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 21/35] mtd: rawnand: sunxi: " Miquel Raynal
2018-07-21 17:50 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 22/35] mtd: rawnand: tango: " Miquel Raynal
2018-07-21 17:52 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 23/35] mtd: rawnand: txx9ndfmc: rename nand controller internal structure Miquel Raynal
2018-07-21 17:53 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 24/35] mtd: rawnand: txx9ndfmc: convert driver to nand_scan() Miquel Raynal
2018-07-21 17:54 ` Boris Brezillon
2018-07-21 18:04 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 25/35] mtd: rawnand: vf610: " Miquel Raynal
2018-07-21 18:05 ` Boris Brezillon
2018-07-25 8:57 ` Stefan Agner
2018-07-20 15:15 ` [PATCH v4 26/35] mtd: rawnand: atmel: " Miquel Raynal
2018-07-22 6:40 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 27/35] mtd: rawnand: sm_common: convert driver to nand_scan_with_ids() Miquel Raynal
2018-07-22 6:44 ` Boris Brezillon
2018-07-26 19:06 ` Boris Brezillon
2018-07-26 23:13 ` Miquel Raynal
2018-07-20 15:15 ` [PATCH v4 28/35] mtd: rawnand: allow exiting immediately nand_scan_ident() Miquel Raynal
2018-07-22 8:49 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 29/35] mtd: rawnand: docg4: convert driver to nand_scan() Miquel Raynal
2018-07-22 8:52 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 30/35] mtd: rawnand: qcom: " Miquel Raynal
2018-07-22 8:59 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 31/35] mtd: rawnand: jz4740: " Miquel Raynal
2018-07-22 9:29 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 32/35] mtd: rawnand: tegra: " Miquel Raynal
2018-07-22 9:31 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 33/35] mtd: rawnand: do not export nand_scan_[ident|tail]() anymore Miquel Raynal
2018-07-22 10:30 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 34/35] mtd: rawnand: allocate model parameter dynamically Miquel Raynal
2018-07-22 10:32 ` Boris Brezillon
2018-07-20 15:15 ` [PATCH v4 35/35] mtd: rawnand: allocate dynamically ONFI parameters during detection Miquel Raynal
2018-07-22 10:35 ` Boris Brezillon
2018-07-26 23:34 ` [PATCH v4 00/35] Allow dynamic allocations during NAND chip identification phase Miquel Raynal
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=20180721191904.541faf4d@bbrezillon \
--to=boris.brezillon@bootlin.com \
--cc=Tudor.Ambarus@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=han.xu@nxp.com \
--cc=harveyhuntnexus@gmail.com \
--cc=kdasu.kdev@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=mans@mansr.com \
--cc=marc.w.gonzalez@free.fr \
--cc=marek.vasut@gmail.com \
--cc=matthias.bgg@gmail.com \
--cc=maxime.ripard@bootlin.com \
--cc=miquel.raynal@bootlin.com \
--cc=nicolas.ferre@microchip.com \
--cc=rainyfeeling@outlook.com \
--cc=richard@nod.at \
--cc=slemieux.tyco@gmail.com \
--cc=stefan@agner.ch \
--cc=vz@mleia.com \
--cc=wens@csie.org \
--cc=wenyou.yang@microchip.com \
--cc=xiaolei.li@mediatek.com \
--cc=yamada.masahiro@socionext.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).