* [PATCH v2] mtd: rawnand: ifc: Move the ECC engine initialization to the right place
@ 2020-10-16 13:26 Fabio Estevam
2020-10-19 17:15 ` [EXT] " Han Xu
2020-10-26 17:45 ` Miquel Raynal
0 siblings, 2 replies; 4+ messages in thread
From: Fabio Estevam @ 2020-10-16 13:26 UTC (permalink / raw)
To: miquel.raynal
Cc: vigneshr, richard, boris.brezillon, linux-mtd, kernel, han.xu,
Fabio Estevam
No ECC initialization should happen during the host controller probe.
In fact, we need the probe function to call nand_scan() in order to:
- identify the device, its capabilities and constraints (nand_scan_ident())
- configure the ECC engine accordingly (->attach_chip())
- scan its content and prepare the core (nand_scan_tail())
Moving these lines to fsl_ifc_attach_chip() fixes a regression caused by
a previous commit supposed to clarify these steps.
Based on a fix done for the mxc_nand driver by Miquel Raynal.
Reported-by: Han Xu <xhnjupt@gmail.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
Changes since v1:
- Do not remove a blank line
drivers/mtd/nand/raw/fsl_ifc_nand.c | 43 ++++++++++++++++-------------
1 file changed, 24 insertions(+), 19 deletions(-)
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 0e7a9b64301e..e345f9d9f8e8 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -707,6 +707,30 @@ static int fsl_ifc_attach_chip(struct nand_chip *chip)
{
struct mtd_info *mtd = nand_to_mtd(chip);
struct fsl_ifc_mtd *priv = nand_get_controller_data(chip);
+ struct fsl_ifc_ctrl *ctrl = priv->ctrl;
+ struct fsl_ifc_global __iomem *ifc_global = ctrl->gregs;
+ u32 csor;
+
+ csor = ifc_in32(&ifc_global->csor_cs[priv->bank].csor);
+
+ /* Must also set CSOR_NAND_ECC_ENC_EN if DEC_EN set */
+ if (csor & CSOR_NAND_ECC_DEC_EN) {
+ chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;
+ mtd_set_ooblayout(mtd, &fsl_ifc_ooblayout_ops);
+
+ /* Hardware generates ECC per 512 Bytes */
+ chip->ecc.size = 512;
+ if ((csor & CSOR_NAND_ECC_MODE_MASK) == CSOR_NAND_ECC_MODE_4) {
+ chip->ecc.bytes = 8;
+ chip->ecc.strength = 4;
+ } else {
+ chip->ecc.bytes = 16;
+ chip->ecc.strength = 8;
+ }
+ } else {
+ chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
+ chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
+ }
dev_dbg(priv->dev, "%s: nand->numchips = %d\n", __func__,
nanddev_ntargets(&chip->base));
@@ -910,25 +934,6 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
return -ENODEV;
}
- /* Must also set CSOR_NAND_ECC_ENC_EN if DEC_EN set */
- if (csor & CSOR_NAND_ECC_DEC_EN) {
- chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;
- mtd_set_ooblayout(mtd, &fsl_ifc_ooblayout_ops);
-
- /* Hardware generates ECC per 512 Bytes */
- chip->ecc.size = 512;
- if ((csor & CSOR_NAND_ECC_MODE_MASK) == CSOR_NAND_ECC_MODE_4) {
- chip->ecc.bytes = 8;
- chip->ecc.strength = 4;
- } else {
- chip->ecc.bytes = 16;
- chip->ecc.strength = 8;
- }
- } else {
- chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
- chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
- }
-
ret = fsl_ifc_sram_init(priv);
if (ret)
return ret;
--
2.17.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [EXT] [PATCH v2] mtd: rawnand: ifc: Move the ECC engine initialization to the right place
2020-10-16 13:26 [PATCH v2] mtd: rawnand: ifc: Move the ECC engine initialization to the right place Fabio Estevam
@ 2020-10-19 17:15 ` Han Xu
2020-10-26 17:45 ` Miquel Raynal
1 sibling, 0 replies; 4+ messages in thread
From: Han Xu @ 2020-10-19 17:15 UTC (permalink / raw)
To: Fabio Estevam, miquel.raynal
Cc: richard, boris.brezillon, linux-mtd, vigneshr, kernel
> -----Original Message-----
> From: Fabio Estevam <festevam@gmail.com>
> Sent: Friday, October 16, 2020 8:26 AM
> To: miquel.raynal@bootlin.com
> Cc: richard@nod.at; vigneshr@ti.com; boris.brezillon@collabora.com; linux-
> mtd@lists.infradead.org; Han Xu <han.xu@nxp.com>; kernel@pengutronix.de;
> Fabio Estevam <festevam@gmail.com>
> Subject: [EXT] [PATCH v2] mtd: rawnand: ifc: Move the ECC engine initialization
> to the right place
>
> Caution: EXT Email
>
> No ECC initialization should happen during the host controller probe.
>
> In fact, we need the probe function to call nand_scan() in order to:
> - identify the device, its capabilities and constraints (nand_scan_ident())
> - configure the ECC engine accordingly (->attach_chip())
> - scan its content and prepare the core (nand_scan_tail())
>
> Moving these lines to fsl_ifc_attach_chip() fixes a regression caused by a
> previous commit supposed to clarify these steps.
>
> Based on a fix done for the mxc_nand driver by Miquel Raynal.
>
> Reported-by: Han Xu <xhnjupt@gmail.com>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
Tested-by: Han Xu <xhnjupt@gmail.com>
> ---
> Changes since v1:
> - Do not remove a blank line
>
> drivers/mtd/nand/raw/fsl_ifc_nand.c | 43 ++++++++++++++++-------------
> 1 file changed, 24 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c
> b/drivers/mtd/nand/raw/fsl_ifc_nand.c
> index 0e7a9b64301e..e345f9d9f8e8 100644
> --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
> +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
> @@ -707,6 +707,30 @@ static int fsl_ifc_attach_chip(struct nand_chip *chip) {
> struct mtd_info *mtd = nand_to_mtd(chip);
> struct fsl_ifc_mtd *priv = nand_get_controller_data(chip);
> + struct fsl_ifc_ctrl *ctrl = priv->ctrl;
> + struct fsl_ifc_global __iomem *ifc_global = ctrl->gregs;
> + u32 csor;
> +
> + csor = ifc_in32(&ifc_global->csor_cs[priv->bank].csor);
> +
> + /* Must also set CSOR_NAND_ECC_ENC_EN if DEC_EN set */
> + if (csor & CSOR_NAND_ECC_DEC_EN) {
> + chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;
> + mtd_set_ooblayout(mtd, &fsl_ifc_ooblayout_ops);
> +
> + /* Hardware generates ECC per 512 Bytes */
> + chip->ecc.size = 512;
> + if ((csor & CSOR_NAND_ECC_MODE_MASK) ==
> CSOR_NAND_ECC_MODE_4) {
> + chip->ecc.bytes = 8;
> + chip->ecc.strength = 4;
> + } else {
> + chip->ecc.bytes = 16;
> + chip->ecc.strength = 8;
> + }
> + } else {
> + chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
> + chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
> + }
>
> dev_dbg(priv->dev, "%s: nand->numchips = %d\n", __func__,
> nanddev_ntargets(&chip->base)); @@ -910,25 +934,6 @@ static int
> fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
> return -ENODEV;
> }
>
> - /* Must also set CSOR_NAND_ECC_ENC_EN if DEC_EN set */
> - if (csor & CSOR_NAND_ECC_DEC_EN) {
> - chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;
> - mtd_set_ooblayout(mtd, &fsl_ifc_ooblayout_ops);
> -
> - /* Hardware generates ECC per 512 Bytes */
> - chip->ecc.size = 512;
> - if ((csor & CSOR_NAND_ECC_MODE_MASK) ==
> CSOR_NAND_ECC_MODE_4) {
> - chip->ecc.bytes = 8;
> - chip->ecc.strength = 4;
> - } else {
> - chip->ecc.bytes = 16;
> - chip->ecc.strength = 8;
> - }
> - } else {
> - chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
> - chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
> - }
> -
> ret = fsl_ifc_sram_init(priv);
> if (ret)
> return ret;
> --
> 2.17.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] mtd: rawnand: ifc: Move the ECC engine initialization to the right place
2020-10-16 13:26 [PATCH v2] mtd: rawnand: ifc: Move the ECC engine initialization to the right place Fabio Estevam
2020-10-19 17:15 ` [EXT] " Han Xu
@ 2020-10-26 17:45 ` Miquel Raynal
2020-10-26 17:48 ` Miquel Raynal
1 sibling, 1 reply; 4+ messages in thread
From: Miquel Raynal @ 2020-10-26 17:45 UTC (permalink / raw)
To: Fabio Estevam, miquel.raynal
Cc: vigneshr, richard, boris.brezillon, linux-mtd, kernel, han.xu
On Fri, 2020-10-16 at 13:26:26 UTC, Fabio Estevam wrote:
> No ECC initialization should happen during the host controller probe.
>
> In fact, we need the probe function to call nand_scan() in order to:
> - identify the device, its capabilities and constraints (nand_scan_ident())
> - configure the ECC engine accordingly (->attach_chip())
> - scan its content and prepare the core (nand_scan_tail())
>
> Moving these lines to fsl_ifc_attach_chip() fixes a regression caused by
> a previous commit supposed to clarify these steps.
>
> Based on a fix done for the mxc_nand driver by Miquel Raynal.
>
> Reported-by: Han Xu <xhnjupt@gmail.com>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> Tested-by: Han Xu <xhnjupt@gmail.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks.
Miquel
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] mtd: rawnand: ifc: Move the ECC engine initialization to the right place
2020-10-26 17:45 ` Miquel Raynal
@ 2020-10-26 17:48 ` Miquel Raynal
0 siblings, 0 replies; 4+ messages in thread
From: Miquel Raynal @ 2020-10-26 17:48 UTC (permalink / raw)
To: Fabio Estevam, miquel.raynal
Cc: vigneshr, richard, boris.brezillon, linux-mtd, kernel, han.xu
Hello,
Miquel Raynal <miquel.raynal@bootlin.com> wrote on Mon, 26 Oct 2020
18:45:25 +0100:
> On Fri, 2020-10-16 at 13:26:26 UTC, Fabio Estevam wrote:
> > No ECC initialization should happen during the host controller probe.
> >
> > In fact, we need the probe function to call nand_scan() in order to:
> > - identify the device, its capabilities and constraints (nand_scan_ident())
> > - configure the ECC engine accordingly (->attach_chip())
> > - scan its content and prepare the core (nand_scan_tail())
> >
> > Moving these lines to fsl_ifc_attach_chip() fixes a regression caused by
> > a previous commit supposed to clarify these steps.
> >
> > Based on a fix done for the mxc_nand driver by Miquel Raynal.
> >
> > Reported-by: Han Xu <xhnjupt@gmail.com>
> > Signed-off-by: Fabio Estevam <festevam@gmail.com>
> > Tested-by: Han Xu <xhnjupt@gmail.com>
>
> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks.
FYI I've added a Fixes tag.
Thanks,
Miquèl
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-26 17:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-16 13:26 [PATCH v2] mtd: rawnand: ifc: Move the ECC engine initialization to the right place Fabio Estevam
2020-10-19 17:15 ` [EXT] " Han Xu
2020-10-26 17:45 ` Miquel Raynal
2020-10-26 17:48 ` Miquel Raynal
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).