Merge tag 'mtd/for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

[sfrench/cifs-2.6.git] / drivers / mtd / nand / raw / meson_nand.c

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index b10011dec1e62c5733f6a8017806cc1cb7374ded..25e3c1cb605e7f95318181616b5470b7cace104d 100644 (file)
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/iopoll.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/sched/task_stack.h>
 
 #define NFC_REG_CMD            0x00
@@ -135,6 +134,7 @@ struct meson_nfc_nand_chip {
 struct meson_nand_ecc {
        u32 bch;
        u32 strength;
+       u32 size;
 };
 
 struct meson_nfc_data {
@@ -190,7 +190,8 @@ struct meson_nfc {
 };
 
 enum {
-       NFC_ECC_BCH8_1K         = 2,
+       NFC_ECC_BCH8_512        = 1,
+       NFC_ECC_BCH8_1K,
        NFC_ECC_BCH24_1K,
        NFC_ECC_BCH30_1K,
        NFC_ECC_BCH40_1K,
@@ -198,15 +199,16 @@ enum {
        NFC_ECC_BCH60_1K,
 };
 
-#define MESON_ECC_DATA(b, s)   { .bch = (b),   .strength = (s)}
+#define MESON_ECC_DATA(b, s, sz)       { .bch = (b), .strength = (s), .size = (sz) }
 
 static struct meson_nand_ecc meson_ecc[] = {
-       MESON_ECC_DATA(NFC_ECC_BCH8_1K, 8),
-       MESON_ECC_DATA(NFC_ECC_BCH24_1K, 24),
-       MESON_ECC_DATA(NFC_ECC_BCH30_1K, 30),
-       MESON_ECC_DATA(NFC_ECC_BCH40_1K, 40),
-       MESON_ECC_DATA(NFC_ECC_BCH50_1K, 50),
-       MESON_ECC_DATA(NFC_ECC_BCH60_1K, 60),
+       MESON_ECC_DATA(NFC_ECC_BCH8_512, 8,  512),
+       MESON_ECC_DATA(NFC_ECC_BCH8_1K,  8,  1024),
+       MESON_ECC_DATA(NFC_ECC_BCH24_1K, 24, 1024),
+       MESON_ECC_DATA(NFC_ECC_BCH30_1K, 30, 1024),
+       MESON_ECC_DATA(NFC_ECC_BCH40_1K, 40, 1024),
+       MESON_ECC_DATA(NFC_ECC_BCH50_1K, 50, 1024),
+       MESON_ECC_DATA(NFC_ECC_BCH60_1K, 60, 1024),
 };
 
 static int meson_nand_calc_ecc_bytes(int step_size, int strength)
@@ -224,8 +226,27 @@ static int meson_nand_calc_ecc_bytes(int step_size, int strength)
 
 NAND_ECC_CAPS_SINGLE(meson_gxl_ecc_caps,
                     meson_nand_calc_ecc_bytes, 1024, 8, 24, 30, 40, 50, 60);
-NAND_ECC_CAPS_SINGLE(meson_axg_ecc_caps,
-                    meson_nand_calc_ecc_bytes, 1024, 8);
+
+static const int axg_stepinfo_strengths[] = { 8 };
+
+static const struct nand_ecc_step_info axg_stepinfo[] = {
+       {
+               .stepsize = 1024,
+               .strengths = axg_stepinfo_strengths,
+               .nstrengths = ARRAY_SIZE(axg_stepinfo_strengths)
+       },
+       {
+               .stepsize = 512,
+               .strengths = axg_stepinfo_strengths,
+               .nstrengths = ARRAY_SIZE(axg_stepinfo_strengths)
+       },
+};
+
+static const struct nand_ecc_caps meson_axg_ecc_caps = {
+       .stepinfos = axg_stepinfo,
+       .nstepinfos = ARRAY_SIZE(axg_stepinfo),
+       .calc_ecc_bytes = meson_nand_calc_ecc_bytes,
+};
 
 static struct meson_nfc_nand_chip *to_meson_nand(struct nand_chip *nand)
 {
@@ -400,9 +421,10 @@ static void meson_nfc_set_data_oob(struct nand_chip *nand,
        }
 }
 
-static int meson_nfc_wait_no_rb_pin(struct meson_nfc *nfc, int timeout_ms,
+static int meson_nfc_wait_no_rb_pin(struct nand_chip *nand, int timeout_ms,
                                    bool need_cmd_read0)
 {
+       struct meson_nfc *nfc = nand_get_controller_data(nand);
        u32 cmd, cfg;
 
        meson_nfc_cmd_idle(nfc, nfc->timing.twb);
@@ -414,8 +436,7 @@ static int meson_nfc_wait_no_rb_pin(struct meson_nfc *nfc, int timeout_ms,
        writel(cfg, nfc->reg_base + NFC_REG_CFG);
 
        reinit_completion(&nfc->completion);
-       cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_STATUS;
-       writel(cmd, nfc->reg_base + NFC_REG_CMD);
+       nand_status_op(nand, NULL);
 
        /* use the max erase time as the maximum clock for waiting R/B */
        cmd = NFC_CMD_RB | NFC_CMD_RB_INT_NO_PIN | nfc->timing.tbers_max;
@@ -425,12 +446,8 @@ static int meson_nfc_wait_no_rb_pin(struct meson_nfc *nfc, int timeout_ms,
                                         msecs_to_jiffies(timeout_ms)))
                return -ETIMEDOUT;
 
-       if (need_cmd_read0) {
-               cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_READ0;
-               writel(cmd, nfc->reg_base + NFC_REG_CMD);
-               meson_nfc_drain_cmd(nfc);
-               meson_nfc_wait_cmd_finish(nfc, CMD_FIFO_EMPTY_TIMEOUT);
-       }
+       if (need_cmd_read0)
+               nand_exit_status_op(nand);
 
        return 0;
 }
@@ -463,9 +480,11 @@ static int meson_nfc_wait_rb_pin(struct meson_nfc *nfc, int timeout_ms)
        return ret;
 }
 
-static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms,
+static int meson_nfc_queue_rb(struct nand_chip *nand, int timeout_ms,
                              bool need_cmd_read0)
 {
+       struct meson_nfc *nfc = nand_get_controller_data(nand);
+
        if (nfc->no_rb_pin) {
                /* This mode is used when there is no wired R/B pin.
                 * It works like 'nand_soft_waitrdy()', but instead of
@@ -477,7 +496,7 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms,
                 * needed (for all cases except page programming - this
                 * is reason of 'need_cmd_read0' flag).
                 */
-               return meson_nfc_wait_no_rb_pin(nfc, timeout_ms,
+               return meson_nfc_wait_no_rb_pin(nand, timeout_ms,
                                                need_cmd_read0);
        } else {
                return meson_nfc_wait_rb_pin(nfc, timeout_ms);
@@ -687,7 +706,7 @@ static int meson_nfc_rw_cmd_prepare_and_execute(struct nand_chip *nand,
        if (in) {
                nfc->cmdfifo.rw.cmd1 = cs | NFC_CMD_CLE | NAND_CMD_READSTART;
                writel(nfc->cmdfifo.rw.cmd1, nfc->reg_base + NFC_REG_CMD);
-               meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tR_max), true);
+               meson_nfc_queue_rb(nand, PSEC_TO_MSEC(sdr->tR_max), true);
        } else {
                meson_nfc_cmd_idle(nfc, nfc->timing.tadl);
        }
@@ -733,7 +752,7 @@ static int meson_nfc_write_page_sub(struct nand_chip *nand,
 
        cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_PAGEPROG;
        writel(cmd, nfc->reg_base + NFC_REG_CMD);
-       meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tPROG_max), false);
+       meson_nfc_queue_rb(nand, PSEC_TO_MSEC(sdr->tPROG_max), false);
 
        meson_nfc_dma_buffer_release(nand, data_len, info_len, DMA_TO_DEVICE);
 
@@ -1049,7 +1068,7 @@ static int meson_nfc_exec_op(struct nand_chip *nand,
                        break;
 
                case NAND_OP_WAITRDY_INSTR:
-                       meson_nfc_queue_rb(nfc, instr->ctx.waitrdy.timeout_ms,
+                       meson_nfc_queue_rb(nand, instr->ctx.waitrdy.timeout_ms,
                                           true);
                        if (instr->delay_ns)
                                meson_nfc_cmd_idle(nfc, delay_idle);
@@ -1259,7 +1278,8 @@ static int meson_nand_bch_mode(struct nand_chip *nand)
                return -EINVAL;
 
        for (i = 0; i < ARRAY_SIZE(meson_ecc); i++) {
-               if (meson_ecc[i].strength == nand->ecc.strength) {
+               if (meson_ecc[i].strength == nand->ecc.strength &&
+                   meson_ecc[i].size == nand->ecc.size) {
                        meson_chip->bch_mode = meson_ecc[i].bch;
                        return 0;
                }