[PATCH] mtd: rawnand: fsl_elbc: Fix detection when nand_scan_ident() has not selected ecc.mode

[PATCH] mtd: rawnand: fsl_elbc: Fix detection when nand_scan_ident() has not selected ecc.mode

[Pali Rohár]

ecc.mode is set to 0 (aliased to NAND_ECC_NONE) either when function
nand_scan_ident() has not selected ecc.mode or when it selected it to none
ecc mode.

Distinguish between these two states by checking of node property
"nand-ecc-mode" which function nand_scan_ident() uses for filling ecc.mode.

This change fixes usage of none ecc mode if it is specified in DTS file.

Fixes: c9ea9019c5aa ("mtd: rawnand: fsl_elbc: Use ECC configuration from device tree")
Signed-off-by: Pali Rohár <pali@kernel.org>
---
 drivers/mtd/nand/raw/fsl_elbc_nand.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index b0e3eb607ed4..8e14739b3ee9 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -745,7 +745,8 @@ static int fsl_elbc_chip_init(int devnum, u8 *addr, struct udevice *dev)
 		return ret;
 
 	/* If nand_scan_ident() has not selected ecc.mode, do it now */
-	if (nand->ecc.mode == NAND_ECC_NONE) {
+	if (nand->ecc.mode == 0 &&
+	    !ofnode_read_string(nand->flash_node, "nand-ecc-mode")) {
 		/* If CS Base Register selects full hardware ECC then use it */
 		if ((br & BR_DECC) == BR_DECC_CHK_GEN) {
 			nand->ecc.mode = NAND_ECC_HW;
-- 
2.20.1

Re: [PATCH] mtd: rawnand: fsl_elbc: Fix detection when nand_scan_ident() has not selected ecc.mode

[Peng Fan (OSS)]

在 2022/5/12 2:24, Pali Rohár 写道:
> ecc.mode is set to 0 (aliased to NAND_ECC_NONE) either when function
> nand_scan_ident() has not selected ecc.mode or when it selected it to none
> ecc mode.
>
> Distinguish between these two states by checking of node property
> "nand-ecc-mode" which function nand_scan_ident() uses for filling ecc.mode.
>
> This change fixes usage of none ecc mode if it is specified in DTS file.
>
> Fixes: c9ea9019c5aa ("mtd: rawnand: fsl_elbc: Use ECC configuration from device tree")
> Signed-off-by: Pali Rohár <pali@kernel.org>

    powerpc:  +   ids8313
+===================== WARNING ======================
+This board does not use CONFIG_WDT (Driver Model
+for DM watchdog). Please update the board to use
+CONFIG_WDT before the v2019.10 release. Failure to
+update by the deadline may result in board removal.
+See doc/develop/driver-model/migration.rst for more info.
+====================================================
+This board does not use CONFIG_DM_ETH (Driver Model
+for Ethernet drivers). Please update the board to use
+CONFIG_DM_ETH before the v2020.07 release. Failure to
+This board does not use CONFIG_DM_I2C (Driver Model
+for I2C drivers). Please update the board to use
+CONFIG_DM_I2C before the v2022.04 release. Failure to
+This board does not use CONFIG_DM_SERIAL (Driver Model
+for Serial drivers). Please update the board to use
+CONFIG_DM_SERIAL before the v2023.04 release. Failure to
+powerpc-linux-ld.bfd: drivers/mtd/nand/raw/fsl_elbc_nand.o: in function 
`fsl_elbc_chip_init':
+drivers/mtd/nand/raw/fsl_elbc_nand.c:749: undefined reference to 
`ofnode_read_string'
+make[1]: *** [Makefile:1813: u-boot] Error 1
+make: *** [Makefile:177: sub-make] Error 2

Build fail.

Regards,
Peng.

> ---
>   drivers/mtd/nand/raw/fsl_elbc_nand.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
> index b0e3eb607ed4..8e14739b3ee9 100644
> --- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
> +++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
> @@ -745,7 +745,8 @@ static int fsl_elbc_chip_init(int devnum, u8 *addr, struct udevice *dev)
>   		return ret;
>   
>   	/* If nand_scan_ident() has not selected ecc.mode, do it now */
> -	if (nand->ecc.mode == NAND_ECC_NONE) {
> +	if (nand->ecc.mode == 0 &&
> +	    !ofnode_read_string(nand->flash_node, "nand-ecc-mode")) {
>   		/* If CS Base Register selects full hardware ECC then use it */
>   		if ((br & BR_DECC) == BR_DECC_CHK_GEN) {
>   			nand->ecc.mode = NAND_ECC_HW;

Re: [PATCH] mtd: rawnand: fsl_elbc: Fix detection when nand_scan_ident() has not selected ecc.mode

[Pali Rohár]

On Monday 20 June 2022 15:08:43 Peng Fan (OSS) wrote:
> 在 2022/5/12 2:24, Pali Rohár 写道:
> > ecc.mode is set to 0 (aliased to NAND_ECC_NONE) either when function
> > nand_scan_ident() has not selected ecc.mode or when it selected it to none
> > ecc mode.
> > 
> > Distinguish between these two states by checking of node property
> > "nand-ecc-mode" which function nand_scan_ident() uses for filling ecc.mode.
> > 
> > This change fixes usage of none ecc mode if it is specified in DTS file.
> > 
> > Fixes: c9ea9019c5aa ("mtd: rawnand: fsl_elbc: Use ECC configuration from device tree")
> > Signed-off-by: Pali Rohár <pali@kernel.org>
> 
>    powerpc:  +   ids8313
> +===================== WARNING ======================
> +This board does not use CONFIG_WDT (Driver Model
> +for DM watchdog). Please update the board to use
> +CONFIG_WDT before the v2019.10 release. Failure to
> +update by the deadline may result in board removal.
> +See doc/develop/driver-model/migration.rst for more info.
> +====================================================
> +This board does not use CONFIG_DM_ETH (Driver Model
> +for Ethernet drivers). Please update the board to use
> +CONFIG_DM_ETH before the v2020.07 release. Failure to
> +This board does not use CONFIG_DM_I2C (Driver Model
> +for I2C drivers). Please update the board to use
> +CONFIG_DM_I2C before the v2022.04 release. Failure to
> +This board does not use CONFIG_DM_SERIAL (Driver Model
> +for Serial drivers). Please update the board to use
> +CONFIG_DM_SERIAL before the v2023.04 release. Failure to
> +powerpc-linux-ld.bfd: drivers/mtd/nand/raw/fsl_elbc_nand.o: in function
> `fsl_elbc_chip_init':
> +drivers/mtd/nand/raw/fsl_elbc_nand.c:749: undefined reference to
> `ofnode_read_string'

Uff... I see that other nand code guards ofnode_read_string() calls via
#if CONFIG_IS_ENABLED(OF_CONTROL). And seems that same preprocessor
guard is needed also here in fsl driver.

I will send v2 patch with this guard.

> +make[1]: *** [Makefile:1813: u-boot] Error 1
> +make: *** [Makefile:177: sub-make] Error 2
> 
> Build fail.
> 
> Regards,
> Peng.
> 
> > ---
> >   drivers/mtd/nand/raw/fsl_elbc_nand.c | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
> > index b0e3eb607ed4..8e14739b3ee9 100644
> > --- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
> > +++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
> > @@ -745,7 +745,8 @@ static int fsl_elbc_chip_init(int devnum, u8 *addr, struct udevice *dev)
> >   		return ret;
> >   	/* If nand_scan_ident() has not selected ecc.mode, do it now */
> > -	if (nand->ecc.mode == NAND_ECC_NONE) {
> > +	if (nand->ecc.mode == 0 &&
> > +	    !ofnode_read_string(nand->flash_node, "nand-ecc-mode")) {
> >   		/* If CS Base Register selects full hardware ECC then use it */
> >   		if ((br & BR_DECC) == BR_DECC_CHK_GEN) {
> >   			nand->ecc.mode = NAND_ECC_HW;
> 

[PATCH v2] mtd: rawnand: fsl_elbc: Fix detection when nand_scan_ident() has not selected ecc.mode

[Pali Rohár]

ecc.mode is set to 0 (aliased to NAND_ECC_NONE) either when function
nand_scan_ident() has not selected ecc.mode or when it selected it to none
ecc mode.

Distinguish between these two states by checking of node property
"nand-ecc-mode" which function nand_scan_ident() uses for filling ecc.mode.

This change fixes usage of none ecc mode if it is specified in DTS file.

Fixes: c9ea9019c5aa ("mtd: rawnand: fsl_elbc: Use ECC configuration from device tree")
Signed-off-by: Pali Rohár <pali@kernel.org>

---
Changes in v2:
* Add guard for ofnode_read_string()
---
 drivers/mtd/nand/raw/fsl_elbc_nand.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index e734139b5ea5..5d50302eefbe 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -744,7 +744,11 @@ static int fsl_elbc_chip_init(int devnum, u8 *addr, ofnode flash_node)
 		return ret;
 
 	/* If nand_scan_ident() has not selected ecc.mode, do it now */
-	if (nand->ecc.mode == NAND_ECC_NONE) {
+	if (nand->ecc.mode == 0
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+	    && !ofnode_read_string(nand->flash_node, "nand-ecc-mode")
+#endif
+	   ) {
 		/* If CS Base Register selects full hardware ECC then use it */
 		if ((br & BR_DECC) == BR_DECC_CHK_GEN) {
 			nand->ecc.mode = NAND_ECC_HW;
-- 
2.20.1