mtd: nand: sunxi: fix OOB handling in ->write_xxx() functions
Subsystems (4)
PATCH v3 1/1 mtd: nand: sunxi: fix OOB handling in ->write_xxx() functions
The USER_DATA register cannot be accessed using byte accessors on A13 SoCs, thus triggering a bug when using memcpy_toio on this register. Declare two helper macros to convert an OOB buffer into a suitable USER_DATA value and vice-versa.
This patch also fixes an error in the oob_required logic (some OOB data are not written even if the user required it) by removing the oob_required condition, which is perfectly valid since the core already fill ->oob_poi with FFs when oob_required is false.
---
Changes since v2:
- add the NFC_USER_DATA_TO_BUF() macro and rename NFC_USER_DATA() into NFC_BUF_TO_USER_DATA()
- rework the commit message
Changes since v1:
- drop the !oob_required conditional path
- replace endianness conversions by a macro relying on byte shifting operations
--- drivers/mtd/nand/sunxi_nand.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
drivers/mtd/nand/sunxi_nand.c +16 -17
@@ -147,6 +147,17 @@#define NFC_ECC_MODE GENMASK(15, 12)#define NFC_RANDOM_SEED GENMASK(30, 16) +/* NFC_USER_DATA helper macros */ +#define NFC_BUF_TO_USER_DATA (buf) ((buf)[0] | ((buf)[1] << 8) | \ + ((buf)[2] << 16) | ((buf)[3] << 24)) +#define NFC_USER_DATA_TO_BUF (buf, val) \ + { \ + (buf)[0] = val; \ + (buf)[1] = val >> 8; \ + (buf)[2] = val >> 16; \ + (buf)[3] = val >> 24; \ + } +#define NFC_DEFAULT_TIMEOUT_MS 1000#define NFC_SRAM_SIZE 1024
@@ -646,15 +657,9 @@ static int sunxi_nfc_hw_ecc_write_page(struct mtd_info *mtd, offset = layout->eccpos[i * ecc->bytes] -4 + mtd->writesize;/* Fill OOB data in */ -if (oob_required) { - tmp =0xffffffff ; -memcpy_toio (nfc->regs +NFC_REG_USER_DATA_BASE , &tmp, -4 ); - }else { -memcpy_toio (nfc->regs +NFC_REG_USER_DATA_BASE , - chip->oob_poi + offset - mtd->writesize, -4 ); - } +writel (NFC_BUF_TO_USER_DATA (chip->oob_poi + + layout->oobfree[i].offset), + nfc->regs +NFC_REG_USER_DATA_BASE ); chip->cmdfunc (mtd,NAND_CMD_RNDIN , offset,-1 );
@@ -784,14 +789,8 @@ static int sunxi_nfc_hw_syndrome_ecc_write_page(struct mtd_info *mtd, offset += ecc->size;/* Fill OOB data in */ -if (oob_required) { - tmp =0xffffffff ; -memcpy_toio (nfc->regs +NFC_REG_USER_DATA_BASE , &tmp, -4 ); - }else { -memcpy_toio (nfc->regs +NFC_REG_USER_DATA_BASE , oob, -4 ); - } +writel (NFC_BUF_TO_USER_DATA (oob), + nfc->regs +NFC_REG_USER_DATA_BASE ); tmp =NFC_DATA_TRANS |NFC_DATA_SWAP_METHOD |NFC_ACCESS_DIR | (1 <<30 );
Signature · 1 line
1.9.1
PATCH v3 1/1 mtd: nand: sunxi: fix OOB handling in ->write_xxx() functions
Quoted 33 lines · Boris Brezillon
The
USER_DATAregister cannot be accessed using byte accessors on A13 SoCs, thus triggering a bug when usingmemcpy_toioon this register. Declare two helper macros to convert an OOB buffer into a suitableUSER_DATAvalue and vice-versa.This patch also fixes an error in the
oob_requiredlogic (some OOB data are not written even if the user required it) by removing theoob_requiredcondition, which is perfectly valid since the core already fill ->oob_poi with FFs whenoob_requiredis false.Signed-off-by Boris Brezillon <[email protected]>Cc <[email protected]> # 3.19+Fixes 1fef62c1423b ("mtd: nand: add sunxi NAND flash controller support")---
Changes since v2:
- add theNFC_USER_DATA_TO_BUF()macro and renameNFC_USER_DATA()intoNFC_BUF_TO_USER_DATA()
- rework the commit messageChanges since v1:
- drop the !oob_required conditional path
- replace endianness conversions by a macro relying on byte shifting operations--- drivers/mtd/nand/sunxi_nand.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)drivers/mtd/nand/sunxi_nand.c +0
-0
drivers/mtd/nand/sunxi_nand.c line 152
Quoted 6 lines
drivers/mtd/nand/sunxi_nand.c +3
-0@@ -147,6 +147,17 @@#define NFC_ECC_MODE GENMASK(15, 12)#define NFC_RANDOM_SEED GENMASK(30, 16) +/* NFC_USER_DATA helper macros */ +#define NFC_BUF_TO_USER_DATA (buf) ((buf)[0] | ((buf)[1] << 8) | \ + ((buf)[2] << 16) | ((buf)[3] << 24))
I thought you were treading on thin ice with bit-shifting a uint8_t, but it appears that C integer promotion rules are on your side here. (The result of this operation should be an int.)
drivers/mtd/nand/sunxi_nand.c line 153
Quoted 1 line
drivers/mtd/nand/sunxi_nand.c +1
-0+#define NFC_USER_DATA_TO_BUF (buf, val) \
BTW, why do you need this macro? It's currently unused. Just as an example? I can take it as-is if you'd like, but I was curious why you felt the need for this in v3, especially for -stable.
Brian
Quoted 49 lines
drivers/mtd/nand/sunxi_nand.c +12
-17+ { \ + (buf)[0 ] = val; \ + (buf)[1 ] = val >>8 ; \ + (buf)[2 ] = val >>16 ; \ + (buf)[3 ] = val >>24 ; \ + } +#define NFC_DEFAULT_TIMEOUT_MS 1000#define NFC_SRAM_SIZE 1024@@ -646,15 +657,9 @@ static int sunxi_nfc_hw_ecc_write_page(struct mtd_info *mtd, offset = layout->eccpos[i * ecc->bytes] -4 + mtd->writesize;/* Fill OOB data in */ -if (oob_required) { - tmp =0xffffffff ; -memcpy_toio (nfc->regs +NFC_REG_USER_DATA_BASE , &tmp, -4 ); - }else { -memcpy_toio (nfc->regs +NFC_REG_USER_DATA_BASE , - chip->oob_poi + offset - mtd->writesize, -4 ); - } +writel (NFC_BUF_TO_USER_DATA (chip->oob_poi + + layout->oobfree[i].offset), + nfc->regs +NFC_REG_USER_DATA_BASE ); chip->cmdfunc (mtd,NAND_CMD_RNDIN , offset,-1 );@@ -784,14 +789,8 @@ static int sunxi_nfc_hw_syndrome_ecc_write_page(struct mtd_info *mtd, offset += ecc->size;/* Fill OOB data in */ -if (oob_required) { - tmp =0xffffffff ; -memcpy_toio (nfc->regs +NFC_REG_USER_DATA_BASE , &tmp, -4 ); - }else { -memcpy_toio (nfc->regs +NFC_REG_USER_DATA_BASE , oob, -4 ); - } +writel (NFC_BUF_TO_USER_DATA (oob), + nfc->regs +NFC_REG_USER_DATA_BASE ); tmp =NFC_DATA_TRANS |NFC_DATA_SWAP_METHOD |NFC_ACCESS_DIR | (1 <<30 );Signature · 1 line
1.9.1
PATCH v3 1/1 mtd: nand: sunxi: fix OOB handling in ->write_xxx() functions
Hi Brian,
Quoted 37 lines · On Fri, 11 Sep 2015 15:46:03 -0700 Brian Norris <[email protected]>…
Quoted 36 lines · Boris Brezillon
The
USER_DATAregister cannot be accessed using byte accessors on A13 SoCs, thus triggering a bug when usingmemcpy_toioon this register. Declare two helper macros to convert an OOB buffer into a suitableUSER_DATAvalue and vice-versa.This patch also fixes an error in the
oob_requiredlogic (some OOB data are not written even if the user required it) by removing theoob_requiredcondition, which is perfectly valid since the core already fill ->oob_poi with FFs whenoob_requiredis false.Signed-off-by Boris Brezillon <[email protected]>Cc <[email protected]> # 3.19+Fixes 1fef62c1423b ("mtd: nand: add sunxi NAND flash controller support")---
Changes since v2:
- add theNFC_USER_DATA_TO_BUF()macro and renameNFC_USER_DATA()intoNFC_BUF_TO_USER_DATA()
- rework the commit messageChanges since v1:
- drop the !oob_required conditional path
- replace endianness conversions by a macro relying on byte shifting operations--- drivers/mtd/nand/sunxi_nand.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)drivers/mtd/nand/sunxi_nand.c +0
-0@@ -147,6 +147,17 @@#define NFC_ECC_MODE GENMASK(15, 12)#define NFC_RANDOM_SEED GENMASK(30, 16)
Quoted 7 lines
drivers/mtd/nand/sunxi_nand.c line 152
Quoted 3 lines
drivers/mtd/nand/sunxi_nand.c +3
-0+/* NFC_USER_DATA helper macros */ +#define NFC_BUF_TO_USER_DATA (buf) ((buf)[0] | ((buf)[1] << 8) | \ + ((buf)[2] << 16) | ((buf)[3] << 24))I thought you were treading on thin ice with bit-shifting a
uint8_t, but it appears that C integer promotion rules are on your side here. (The result of this operation should be an int.)
Yep. I used to cast the first element to an u32 to deal with such use cases until I realized it was actually not needed ;-).
Quoted 6 lines
drivers/mtd/nand/sunxi_nand.c line 153
Quoted 2 lines
drivers/mtd/nand/sunxi_nand.c +1
-0+#define NFC_USER_DATA_TO_BUF (buf, val) \BTW, why do you need this macro? It's currently unused. Just as an example? I can take it as-is if you'd like, but I was curious why you felt the need for this in v3, especially for -stable.
You're right, it's not needed in this patch. I'll remove it from this commit and re-introduce it when needed.
Best Regards,
Boris
Signature · 3 lines
Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com