mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Subsystems (2)
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can be used by boards equipped with a NAND chip that requires 4-bit ECC strength. The SPEAr600 HW ECC only supports 1-bit ECC strength.
To enable SW BCH4, you need to specify this in your config header:
#define CONFIG_NAND_ECC_BCH
#define CONFIG_BCH
And use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
---
v2:
- Removed err = 0 initialization as suggested by Viresh
- Completed the commit text
- Added Viresh's Acked-by
drivers/mtd/nand/fsmc_nand.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/mtd/nand/fsmc_nand.c +40 -0
@@ -13,6 +13,7 @@#include <asm/io.h> #include <linux/bitops.h> #include <linux/err.h> +#include <linux/mtd/nand_bch.h> #include <linux/mtd/nand_ecc.h> #include <linux/mtd/fsmc_nand.h> #include <asm/arch/hardware.h>
@@ -390,6 +391,45 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,return 0 ; } +#ifndef CONFIG_SPL_BUILD +/* +* fsmc_nand_switch_ecc - switch the ECC operation between different engines +* +* @eccstrength - the number of bits that could be corrected +* (1 - HW, 4 - SW BCH4) +*/ +int __maybe_unused fsmc_nand_switch_ecc (uint32_t eccstrength) +{ +struct nand_chip *nand; +struct mtd_info *mtd; +int err; + + mtd = &nand_info[nand_curr_device]; + nand = mtd->priv; + +/* Setup the ecc configurations again */ +if (eccstrength ==1 ) { + nand->ecc.mode =NAND_ECC_HW ; + nand->ecc.bytes =3 ; + nand->ecc.strength =1 ; + nand->ecc.layout = &fsmc_ecc1_layout; + nand->ecc.correct = nand_correct_data; + }else { + nand->ecc.mode =NAND_ECC_SOFT_BCH ; + nand->ecc.calculate = nand_bch_calculate_ecc; + nand->ecc.correct = nand_bch_correct_data; + nand->ecc.bytes =7 ; + nand->ecc.strength =4 ; + nand->ecc.layout =NULL ; + } + +/* Update NAND handling after ECC mode switch */ + err =nand_scan_tail (mtd); + +return err; +} +#endif /* CONFIG_SPL_BUILD */ +int fsmc_nand_init (struct nand_chip *nand) {static int chip_nr;
Signature · 1 line
2.5.1
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Quoted 46 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can be used by boards equipped with a NAND chip that requires 4-bit ECC strength.
The SPEAr600 HW ECC only supports 1-bit ECC strength.To enable SW BCH4, you need to specify this in your config header:
#define
CONFIG_NAND_ECC_BCH
#defineCONFIG_BCHAnd use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>---
v2:
- Removed err = 0 initialization as suggested by Viresh
- Completed the commit text
- Added Viresh's Acked-bydrivers/mtd/nand/fsmc_nand.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)drivers/mtd/nand/fsmc_nand.c +4
-0@@ -13,6 +13,7 @@#include <asm/io.h> #include <linux/bitops.h> #include <linux/err.h> +#include <linux/mtd/nand_bch.h> #include <linux/mtd/nand_ecc.h> #include <linux/mtd/fsmc_nand.h> #include <asm/arch/hardware.h> @@ -390,6 +391,45 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd,struct nand_chip *chip, return 0; } +#ifndef CONFIG_SPL_BUILD +/* +* fsmc_nand_switch_ecc - switch the ECC operation between different
Quoted 6 lines
engines
+ *
+ * @eccstrength - the number of bits that could be corrected
+ * (1 - HW, 4 - SW BCH4)
+ */
+int__maybe_unusedfsmc_nand_switch_ecc(uint32_t eccstrength)
What calls this function? You didn't CC me on the rest of the patchset... I'm guessing it's a copy-and-paste of what arch/arm/cpu/armv7/omap3/board.c does?
Quoted 13 lines
drivers/mtd/nand/fsmc_nand.c +13
-0+{ +struct nand_chip *nand; +struct mtd_info *mtd; +int err; + + mtd = &nand_info[nand_curr_device]; + nand = mtd->priv; + +/* Setup the ecc configurations again */ +if (eccstrength ==1 ) { + nand->ecc.mode =NAND_ECC_HW ; + nand->ecc.bytes =3 ; + nand->ecc.strength =1 ;
drivers/mtd/nand/fsmc_nand.c static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, · line 424
Quoted 10 lines
drivers/mtd/nand/fsmc_nand.c +10
-0+ nand->ecc.layout = &fsmc_ecc1_layout; + nand->ecc.correct = nand_correct_data; + }else { + nand->ecc.mode =NAND_ECC_SOFT_BCH ; + nand->ecc.calculate = nand_bch_calculate_ecc; + nand->ecc.correct = nand_bch_correct_data; + nand->ecc.bytes =7 ; + nand->ecc.strength =4 ; + nand->ecc.layout =NULL ; + }
nand_scan_tail() should already set .caclulate, .correct, and .bytes for NAND_ECC_SOFT_BCH.
When switching from BCH to HW, how does .calculate get set back to fsmc_read_hwecc?
What stops this from being called with FSMC_VER8 which appears to have BCH8 hw ecc?
-Scott
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Hi Scott,
Quoted 44 lines · Scott Wood
Quoted 43 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can be used by boards equipped with a NAND chip that requires 4-bit ECC strength.
The SPEAr600 HW ECC only supports 1-bit ECC strength.To enable SW BCH4, you need to specify this in your config header:
#define
CONFIG_NAND_ECC_BCH
#defineCONFIG_BCHAnd use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>---
v2:
- Removed err = 0 initialization as suggested by Viresh
- Completed the commit text
- Added Viresh's Acked-bydrivers/mtd/nand/fsmc_nand.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)drivers/mtd/nand/fsmc_nand.c +1
-0@@ -13,6 +13,7 @@#include <asm/io.h> #include <linux/bitops.h> #include <linux/err.h> +#include <linux/mtd/nand_bch.h> #include <linux/mtd/nand_ecc.h> #include <linux/mtd/fsmc_nand.h> #include <asm/arch/hardware.h> @@ -390,6 +391,45 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd,struct nand_chip *chip, return 0; }
Quoted 13 lines
Quoted 9 lines
drivers/mtd/nand/fsmc_nand.c +3
-0+#ifndef CONFIG_SPL_BUILD +/* +* fsmc_nand_switch_ecc - switch the ECC operation between different engines
+ *
+ * @eccstrength - the number of bits that could be corrected
+ * (1 - HW, 4 - SW BCH4)
+ */
+int__maybe_unusedfsmc_nand_switch_ecc(uint32_t eccstrength)What calls this function? You didn't CC me on the rest of the patchset... I'm guessing it's a copy-and-paste of what
arch/arm/cpu/armv7/omap3/board.cdoes?
Yes.
Quoted 18 lines
Quoted 18 lines
drivers/mtd/nand/fsmc_nand.c +18
-0+{ +struct nand_chip *nand; +struct mtd_info *mtd; +int err; + + mtd = &nand_info[nand_curr_device]; + nand = mtd->priv; + +/* Setup the ecc configurations again */ +if (eccstrength ==1 ) { + nand->ecc.mode =NAND_ECC_HW ; + nand->ecc.bytes =3 ; + nand->ecc.strength =1 ; + nand->ecc.layout = &fsmc_ecc1_layout; + nand->ecc.correct = nand_correct_data; + }else { + nand->ecc.mode =NAND_ECC_SOFT_BCH ; + nand->ecc.calculate = nand_bch_calculate_ecc;
Quoted 8 lines
drivers/mtd/nand/fsmc_nand.c static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, · line 424
Quoted 5 lines
drivers/mtd/nand/fsmc_nand.c +5
-0+ nand->ecc.correct = nand_bch_correct_data; + nand->ecc.bytes =7 ; + nand->ecc.strength =4 ; + nand->ecc.layout =NULL ; + }
nand_scan_tail()should already set .caclulate, .correct, and .bytes forNAND_ECC_SOFT_BCH.
Yes, thanks for pointing this out.
Quoted 2 lines
When switching from BCH to HW, how does .calculate get set back to
fsmc_read_hwecc?
Probably not at all. I must have missed testing this.
Quoted 2 lines
What stops this from being called with
FSMC_VER8which appears to have BCH8 hw ecc?
This function will not be called by any platform that supports FSMC_VER8
- only from SPEArxxx. Which unfortunately only supports 1 bit HW ECC. I could add a comment to make this clear.
Thanks,
Stefan
PATCH v3 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
In reply to Stefan RoeseThis patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can be used by boards equipped with a NAND chip that requires 4-bit ECC strength. The SPEAr600 HW ECC only supports 1-bit ECC strength.
To enable SW BCH4, you need to specify this in your config header:
And use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
---
v3:
- Don't set .caclulate, .correct, and .bytes for NAND_ECC_SOFT_BCH as this will be done in nand_scan_tail()
- Set .caclulate back to fsmc_read_hwecc() in the HW case
- Added comment that this function will only be called on SPEAr platforms, not supporting the BCH8 HW ECC (FSMC_VER8)
v2:
- Removed err = 0 initialization as suggested by Viresh
- Completed the commit text
- Added Viresh's Acked-by
drivers/mtd/nand/fsmc_nand.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
drivers/mtd/nand/fsmc_nand.c +47 -0
@@ -390,6 +390,53 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,return 0 ; } +#ifndef CONFIG_SPL_BUILD +/* +* fsmc_nand_switch_ecc - switch the ECC operation between different engines +* +* @eccstrength - the number of bits that could be corrected +* (1 - HW, 4 - SW BCH4) +*/ +int __maybe_unused fsmc_nand_switch_ecc (uint32_t eccstrength) +{ +struct nand_chip *nand; +struct mtd_info *mtd; +int err; + +/* +* This functions is only called on SPEAr600 platforms, supporting +* 1 bit HW ECC. The BCH8 HW ECC (FSMC_VER8) from the ST-Ericsson +* Nomadik SoC is currently supporting this fsmc_nand_switch_ecc() +* function, as it doesn't need to switch to a different ECC layout. +*/ + mtd = &nand_info[nand_curr_device]; + nand = mtd->priv; + +/* Setup the ecc configurations again */ +if (eccstrength ==1 ) { + nand->ecc.mode =NAND_ECC_HW ; + nand->ecc.bytes =3 ; + nand->ecc.strength =1 ; + nand->ecc.layout = &fsmc_ecc1_layout; + nand->ecc.calculate = fsmc_read_hwecc; + nand->ecc.correct = nand_correct_data; + }else { +/* +* .calculate .correct and .bytes will be set in +* nand_scan_tail() +*/ + nand->ecc.mode =NAND_ECC_SOFT_BCH ; + nand->ecc.strength =4 ; + nand->ecc.layout =NULL ; + } + +/* Update NAND handling after ECC mode switch */ + err =nand_scan_tail (mtd); + +return err; +} +#endif /* CONFIG_SPL_BUILD */ +int fsmc_nand_init (struct nand_chip *nand) {static int chip_nr;
Signature · 1 line
2.5.1
PATCH v3 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Quoted 43 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can be used by boards equipped with a NAND chip that requires 4-bit ECC strength.
The SPEAr600 HW ECC only supports 1-bit ECC strength.To enable SW BCH4, you need to specify this in your config header:
And use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>---
v3:
- Don't set .caclulate, .correct, and .bytes forNAND_ECC_SOFT_BCHas this will be done innand_scan_tail()
- Set .caclulate back tofsmc_read_hwecc()in the HW case
- Added comment that this function will only be called on SPEAr platforms, not supporting the BCH8 HW ECC (FSMC_VER8)v2:
- Removed err = 0 initialization as suggested by Viresh
- Completed the commit text
- Added Viresh's Acked-bydrivers/mtd/nand/fsmc_nand.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)drivers/mtd/nand/fsmc_nand.c +3
-0@@ -390,6 +390,53 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd,struct nand_chip *chip, return 0; } +#ifndef CONFIG_SPL_BUILD +/* +* fsmc_nand_switch_ecc - switch the ECC operation between different
Quoted 6 lines
engines
+ *
+ * @eccstrength - the number of bits that could be corrected
+ * (1 - HW, 4 - SW BCH4)
+ */
+int__maybe_unusedfsmc_nand_switch_ecc(uint32_t eccstrength)
Why do you need __maybe_unused on a non-static function?
Quoted 21 lines
drivers/mtd/nand/fsmc_nand.c +21
-0+{ +struct nand_chip *nand; +struct mtd_info *mtd; +int err; + +/* +* This functions is only called on SPEAr600 platforms, supporting +* 1 bit HW ECC. The BCH8 HW ECC (FSMC_VER8) from the ST-Ericsson +* Nomadik SoC is currently supporting this fsmc_nand_switch_ecc() +* function, as it doesn't need to switch to a different ECC layout. +*/ + mtd = &nand_info[nand_curr_device]; + nand = mtd->priv; + +/* Setup the ecc configurations again */ +if (eccstrength ==1 ) { + nand->ecc.mode =NAND_ECC_HW ; + nand->ecc.bytes =3 ; + nand->ecc.strength =1 ; + nand->ecc.layout = &fsmc_ecc1_layout; + nand->ecc.calculate = fsmc_read_hwecc;
drivers/mtd/nand/fsmc_nand.c static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, · line 431
Quoted 10 lines
drivers/mtd/nand/fsmc_nand.c +10
-0+ nand->ecc.correct = nand_correct_data; + }else { +/* +* .calculate .correct and .bytes will be set in +* nand_scan_tail() +*/ + nand->ecc.mode =NAND_ECC_SOFT_BCH ; + nand->ecc.strength =4 ; + nand->ecc.layout =NULL ; + }
Even though you say this function will currently not be called on systems with BCH8 hardware, it would be good to at least test explicitly for eccstrength == 4 and error out if something other than 1 or 4 is requested.
-Scott
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
In reply to Stefan RoeseQuoted 9 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can be used by boards equipped with a NAND chip that requires 4-bit ECC strength. The SPEAr600 HW ECC only supports 1-bit ECC strength.
To enable SW BCH4, you need to specify this in your config header:
#define
CONFIG_NAND_ECC_BCH
#defineCONFIG_BCH
Quoted 7 lines
And use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/cfe26b66/attachment.sig>
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Quoted 14 lines · Tom Rini
Quoted 12 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can be used by boards equipped with a NAND chip that requires 4-bit ECC strength.
The SPEAr600 HW ECC only supports 1-bit ECC strength.To enable SW BCH4, you need to specify this in your config header:
#define
CONFIG_NAND_ECC_BCH
#defineCONFIG_BCHAnd use the command "nandecc bch4" to select this ECC scheme upon runtime.
Quoted 8 lines
Quoted 5 lines
Tested on SPEAr600 x600 board.
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>Applied to u-boot/master, thanks!
There's a v3, and some minor comments even on that one...
-Scott
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Quoted 17 lines · Scott Wood
Quoted 16 lines · Tom Rini
Quoted 14 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can be used by boards equipped with a NAND chip that requires 4-bit ECC strength.
The SPEAr600 HW ECC only supports 1-bit ECC strength.To enable SW BCH4, you need to specify this in your config header:
#define
CONFIG_NAND_ECC_BCH
#defineCONFIG_BCHAnd use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>Applied to u-boot/master, thanks!
There's a v3, and some minor comments even on that one...
Mutter, sorry. Would you rather a revert of the series or just incremental on top?
And aside, this is one reason I prefer resends of the whole series for anything non-trivial. 6 or 9 patches in patchwork is a lot clear that "oh, still in progress" as I clean things up rather than 1.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/74763294/attachment.sig>
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Quoted 24 lines · Tom Rini
Quoted 23 lines · Scott Wood
Quoted 22 lines · Tom Rini
Quoted 19 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can
be used by boards equipped with a NAND chip that requires 4-bit ECC strength.
The SPEAr600 HW ECC only supports 1-bit ECC strength.To enable SW BCH4, you need to specify this in your config header:
#define
CONFIG_NAND_ECC_BCH
#defineCONFIG_BCHAnd use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Applied to u-boot/master, thanks!
There's a v3, and some minor comments even on that one...
Mutter, sorry. Would you rather a revert of the series or just incremental on top?
Either is fine -- I just wanted to make sure it didn't get forgotten.
-Scott
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Quoted 28 lines · Scott Wood
Quoted 27 lines · Tom Rini
Quoted 26 lines · Scott Wood
Quoted 24 lines · Tom Rini
Quoted 11 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can
be used by boards equipped with a NAND chip that requires 4-bit ECC strength.
The SPEAr600 HW ECC only supports 1-bit ECC strength.To enable SW BCH4, you need to specify this in your config header:
#define
CONFIG_NAND_ECC_BCH
#defineCONFIG_BCHQuoted 8 lines
And use the command "nandecc bch4" to select this ECC scheme upon runtime.
Tested on SPEAr600 x600 board.
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>Applied to u-boot/master, thanks!
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
There's a v3, and some minor comments even on that one...
Mutter, sorry. Would you rather a revert of the series or just incremental on top?
Either is fine -- I just wanted to make sure it didn't get forgotten.
OK, Stefan, please do an incremental on top of master now to cover what's been noted in v3, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/b874b8e3/attachment.sig>
PATCH v2 1/4 mtd: nand: fsmc: Add BCH4 SW ECC support for SPEAr600
Quoted 31 lines · Tom Rini
Quoted 30 lines · Scott Wood
Quoted 29 lines · Tom Rini
Quoted 27 lines · Scott Wood
Quoted 16 lines · Tom Rini
Quoted 14 lines · Stefan Roese
This patch adds support for 4-bit ECC BCH4 for the SPEAr600 SoC. This can
be used by boards equipped with a NAND chip that requires 4-bit ECC strength.
The SPEAr600 HW ECC only supports 1-bit ECC strength.To enable SW BCH4, you need to specify this in your config header:
#define
CONFIG_NAND_ECC_BCH
#defineCONFIG_BCHAnd use the command "nandecc bch4" to select this ECC scheme upon runtime.
Quoted 8 lines
Quoted 5 lines
Tested on SPEAr600 x600 board.
Signed-off-by Stefan Roese <[email protected]>Cc Scott Wood <[email protected]>Acked-by Viresh Kumar <[email protected]>Applied to u-boot/master, thanks!
There's a v3, and some minor comments even on that one...
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Mutter, sorry. Would you rather a revert of the series or just incremental on top?
Either is fine -- I just wanted to make sure it didn't get forgotten.
OK, Stefan, please do an incremental on top of master now to cover what's been noted in v3, thanks!
Sure.
Thanks,
Stefan