mtd: rawnand: sunxi: add has_ecc_block_512 capability

The H616 controller can't handle 512 bytes ECC block size. The
NFC_ECC_BLOCK_512 bit disappeared in H6, and NDFC_RANDOM_EN took its
place.

So, add has_ecc_block_512 capability to only set this bit on SoC having
it.

No functional change.

Signed-off-by: Richard Genoud <richard.genoud@bootlin.com>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 021034a761b7149df74e23a5cbace86269f829e2..7976cd862b1b6fa94808ab6b167ee0e110accf0c 100644 (file)
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -233,6 +233,7 @@ static inline struct sunxi_nand_chip *to_sunxi_nand(struct nand_chip *nand)
  *
  * @has_mdma:          Use mbus dma mode, otherwise general dma
  *                     through MBUS on A23/A33 needs extra configuration.
+ * @has_ecc_block_512: If the ECC can handle 512B or only 1024B chuncks
  * @reg_io_data:       I/O data register
  * @reg_ecc_err_cnt:   ECC error counter register
  * @reg_user_data:     User data register
@@ -244,6 +245,7 @@ static inline struct sunxi_nand_chip *to_sunxi_nand(struct nand_chip *nand)
  */
 struct sunxi_nfc_caps {
        bool has_mdma;
+       bool has_ecc_block_512;
        unsigned int reg_io_data;
        unsigned int reg_ecc_err_cnt;
        unsigned int reg_user_data;
@@ -1758,8 +1760,14 @@ static int sunxi_nand_hw_ecc_ctrl_init(struct nand_chip *nand,
        sunxi_nand->ecc.ecc_ctl = NFC_ECC_MODE(i) | NFC_ECC_EXCEPTION |
                                  NFC_ECC_PIPELINE | NFC_ECC_EN;
 
-       if (ecc->size == 512)
-               sunxi_nand->ecc.ecc_ctl |= NFC_ECC_BLOCK_512;
+       if (ecc->size == 512) {
+               if (nfc->caps->has_ecc_block_512) {
+                       sunxi_nand->ecc.ecc_ctl |= NFC_ECC_BLOCK_512;
+               } else {
+                       dev_err(nfc->dev, "512B ECC block not supported\n");
+                       return -EOPNOTSUPP;
+               }
+       }
 
        return 0;
 }
@@ -2214,6 +2222,7 @@ static const u8 sunxi_ecc_strengths_a10[] = {
 };
 
 static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = {
+       .has_ecc_block_512 = true,
        .reg_io_data = NFC_REG_A10_IO_DATA,
        .reg_ecc_err_cnt = NFC_REG_A10_ECC_ERR_CNT,
        .reg_user_data = NFC_REG_A10_USER_DATA,
@@ -2226,6 +2235,7 @@ static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = {
 
 static const struct sunxi_nfc_caps sunxi_nfc_a23_caps = {
        .has_mdma = true,
+       .has_ecc_block_512 = true,
        .reg_io_data = NFC_REG_A23_IO_DATA,
        .reg_ecc_err_cnt = NFC_REG_A10_ECC_ERR_CNT,
        .reg_user_data = NFC_REG_A10_USER_DATA,