mtd: rawnand: qcom: update last code word register

From QPIC v2 onwards a new register got added to read last
code word.Add support for this READ_LOCATION_LAST_CW_n
register.

In the case of QPIC v2, codewords 0, 1 and 2 will be accessed
through READ_LOCATION_n, while codeword 3 will be accessed
through READ_LOCATION_LAST_CW_n.

Signed-off-by: Md Sadre Alam <mdalam@codeaurora.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/1614109141-7531-5-git-send-email-mdalam@codeaurora.org

diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index 88e1cba..34d31c7 100644 (file)
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -48,6 +48,10 @@
 #define        NAND_READ_LOCATION_1            0xf24
 #define        NAND_READ_LOCATION_2            0xf28
 #define        NAND_READ_LOCATION_3            0xf2c
+#define        NAND_READ_LOCATION_LAST_CW_0    0xf40
+#define        NAND_READ_LOCATION_LAST_CW_1    0xf44
+#define        NAND_READ_LOCATION_LAST_CW_2    0xf48
+#define        NAND_READ_LOCATION_LAST_CW_3    0xf4c
 
 /* dummy register offsets, used by write_reg_dma */
 #define        NAND_DEV_CMD1_RESTORE           0xdead
@@ -187,6 +191,11 @@ nandc_set_reg(chip, reg,                   \
              ((read_size) << READ_LOCATION_SIZE) |                     \
              ((is_last_read_loc) << READ_LOCATION_LAST))
 
+#define nandc_set_read_loc_last(chip, reg, cw_offset, read_size, is_last_read_loc)     \
+nandc_set_reg(chip, reg,                       \
+             ((cw_offset) << READ_LOCATION_OFFSET) |           \
+             ((read_size) << READ_LOCATION_SIZE) |                     \
+             ((is_last_read_loc) << READ_LOCATION_LAST))
 /*
  * Returns the actual register address for all NAND_DEV_ registers
  * (i.e. NAND_DEV_CMD0, NAND_DEV_CMD1, NAND_DEV_CMD2 and NAND_DEV_CMD_VLD)
@@ -316,6 +325,10 @@ struct nandc_regs {
        __le32 read_location1;
        __le32 read_location2;
        __le32 read_location3;
+       __le32 read_location_last0;
+       __le32 read_location_last1;
+       __le32 read_location_last2;
+       __le32 read_location_last3;
 
        __le32 erased_cw_detect_cfg_clr;
        __le32 erased_cw_detect_cfg_set;
@@ -644,6 +657,14 @@ static __le32 *offset_to_nandc_reg(struct nandc_regs *regs, int offset)
                return &regs->read_location2;
        case NAND_READ_LOCATION_3:
                return &regs->read_location3;
+       case NAND_READ_LOCATION_LAST_CW_0:
+               return &regs->read_location_last0;
+       case NAND_READ_LOCATION_LAST_CW_1:
+               return &regs->read_location_last1;
+       case NAND_READ_LOCATION_LAST_CW_2:
+               return &regs->read_location_last2;
+       case NAND_READ_LOCATION_LAST_CW_3:
+               return &regs->read_location_last3;
        default:
                return NULL;
        }
@@ -672,12 +693,21 @@ static bool qcom_nandc_is_last_cw(struct nand_ecc_ctrl *ecc, int cw)
 static void nandc_set_read_loc(struct nand_chip *chip, int cw, int reg,
                               int cw_offset, int read_size, int is_last_read_loc)
 {
+       struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);
+       struct nand_ecc_ctrl *ecc = &chip->ecc;
        int reg_base = NAND_READ_LOCATION_0;
 
+       if (nandc->props->qpic_v2 && qcom_nandc_is_last_cw(ecc, cw))
+               reg_base = NAND_READ_LOCATION_LAST_CW_0;
+
        reg_base += reg * 4;
 
-       return nandc_set_read_loc_first(chip, reg_base, cw_offset,
-                       read_size, is_last_read_loc);
+       if (nandc->props->qpic_v2 && qcom_nandc_is_last_cw(ecc, cw))
+               return nandc_set_read_loc_last(chip, reg_base, cw_offset,
+                               read_size, is_last_read_loc);
+       else
+               return nandc_set_read_loc_first(chip, reg_base, cw_offset,
+                               read_size, is_last_read_loc);
 }
 
 /* helper to configure address register values */
@@ -698,8 +728,9 @@ static void set_address(struct qcom_nand_host *host, u16 column, int page)
  *
  * @num_cw:            number of steps for the read/write operation
  * @read:              read or write operation
+ * @cw :               which code word
  */
-static void update_rw_regs(struct qcom_nand_host *host, int num_cw, bool read)
+static void update_rw_regs(struct qcom_nand_host *host, int num_cw, bool read, int cw)
 {
        struct nand_chip *chip = &host->chip;
        u32 cmd, cfg0, cfg1, ecc_bch_cfg;
@@ -737,7 +768,7 @@ static void update_rw_regs(struct qcom_nand_host *host, int num_cw, bool read)
        nandc_set_reg(chip, NAND_EXEC_CMD, 1);
 
        if (read)
-               nandc_set_read_loc(chip, 0, 0, 0, host->use_ecc ?
+               nandc_set_read_loc(chip, cw, 0, 0, host->use_ecc ?
                                   host->cw_data : host->cw_size, 1);
 }
 
@@ -1113,13 +1144,18 @@ static void config_nand_page_read(struct nand_chip *chip)
  * before reading each codeword in NAND page.
  */
 static void
-config_nand_cw_read(struct nand_chip *chip, bool use_ecc)
+config_nand_cw_read(struct nand_chip *chip, bool use_ecc, int cw)
 {
        struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);
+       struct nand_ecc_ctrl *ecc = &chip->ecc;
+
+       int reg = NAND_READ_LOCATION_0;
+
+       if (nandc->props->qpic_v2 && qcom_nandc_is_last_cw(ecc, cw))
+               reg = NAND_READ_LOCATION_LAST_CW_0;
 
        if (nandc->props->is_bam)
-               write_reg_dma(nandc, NAND_READ_LOCATION_0, 4,
-                             NAND_BAM_NEXT_SGL);
+               write_reg_dma(nandc, reg, 4, NAND_BAM_NEXT_SGL);
 
        write_reg_dma(nandc, NAND_FLASH_CMD, 1, NAND_BAM_NEXT_SGL);
        write_reg_dma(nandc, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL);
@@ -1139,10 +1175,10 @@ config_nand_cw_read(struct nand_chip *chip, bool use_ecc)
  */
 static void
 config_nand_single_cw_page_read(struct nand_chip *chip,
-                               bool use_ecc)
+                               bool use_ecc, int cw)
 {
        config_nand_page_read(chip);
-       config_nand_cw_read(chip, use_ecc);
+       config_nand_cw_read(chip, use_ecc, cw);
 }
 
 /*
@@ -1240,7 +1276,7 @@ static int nandc_param(struct qcom_nand_host *host)
        nandc->buf_count = 512;
        memset(nandc->data_buffer, 0xff, nandc->buf_count);
 
-       config_nand_single_cw_page_read(chip, false);
+       config_nand_single_cw_page_read(chip, false, 0);
 
        read_data_dma(nandc, FLASH_BUF_ACC, nandc->data_buffer,
                      nandc->buf_count, 0);
@@ -1517,7 +1553,7 @@ static void qcom_nandc_command(struct nand_chip *chip, unsigned int command,
 
                host->use_ecc = true;
                set_address(host, 0, page_addr);
-               update_rw_regs(host, ecc->steps, true);
+               update_rw_regs(host, ecc->steps, true, 0);
                break;
 
        case NAND_CMD_SEQIN:
@@ -1641,7 +1677,7 @@ qcom_nandc_read_cw_raw(struct mtd_info *mtd, struct nand_chip *chip,
 
        clear_bam_transaction(nandc);
        set_address(host, host->cw_size * cw, page);
-       update_rw_regs(host, 1, true);
+       update_rw_regs(host, 1, true, cw);
        config_nand_page_read(chip);
 
        data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1);
@@ -1670,7 +1706,7 @@ qcom_nandc_read_cw_raw(struct mtd_info *mtd, struct nand_chip *chip,
                nandc_set_read_loc(chip, cw, 3, read_loc, oob_size2, 1);
        }
 
-       config_nand_cw_read(chip, false);
+       config_nand_cw_read(chip, false, cw);
 
        read_data_dma(nandc, reg_off, data_buf, data_size1, 0);
        reg_off += data_size1;
@@ -1909,7 +1945,7 @@ static int read_page_ecc(struct qcom_nand_host *host, u8 *data_buf,
                        }
                }
 
-               config_nand_cw_read(chip, true);
+               config_nand_cw_read(chip, true, i);
 
                if (data_buf)
                        read_data_dma(nandc, FLASH_BUF_ACC, data_buf,
@@ -1969,9 +2005,9 @@ static int copy_last_cw(struct qcom_nand_host *host, int page)
        memset(nandc->data_buffer, 0xff, size);
 
        set_address(host, host->cw_size * (ecc->steps - 1), page);
-       update_rw_regs(host, 1, true);
+       update_rw_regs(host, 1, true, ecc->steps - 1);
 
-       config_nand_single_cw_page_read(chip, host->use_ecc);
+       config_nand_single_cw_page_read(chip, host->use_ecc, ecc->steps - 1);
 
        read_data_dma(nandc, FLASH_BUF_ACC, nandc->data_buffer, size, 0);
 
@@ -2036,7 +2072,7 @@ static int qcom_nandc_read_oob(struct nand_chip *chip, int page)
 
        host->use_ecc = true;
        set_address(host, 0, page);
-       update_rw_regs(host, ecc->steps, true);
+       update_rw_regs(host, ecc->steps, true, 0);
 
        return read_page_ecc(host, NULL, chip->oob_poi, page);
 }
@@ -2060,7 +2096,7 @@ static int qcom_nandc_write_page(struct nand_chip *chip, const uint8_t *buf,
        oob_buf = chip->oob_poi;
 
        host->use_ecc = true;
-       update_rw_regs(host, ecc->steps, false);
+       update_rw_regs(host, ecc->steps, false, 0);
        config_nand_page_write(chip);
 
        for (i = 0; i < ecc->steps; i++) {
@@ -2131,7 +2167,7 @@ static int qcom_nandc_write_page_raw(struct nand_chip *chip,
        oob_buf = chip->oob_poi;
 
        host->use_ecc = false;
-       update_rw_regs(host, ecc->steps, false);
+       update_rw_regs(host, ecc->steps, false, 0);
        config_nand_page_write(chip);
 
        for (i = 0; i < ecc->steps; i++) {
@@ -2214,7 +2250,7 @@ static int qcom_nandc_write_oob(struct nand_chip *chip, int page)
                                    0, mtd->oobavail);
 
        set_address(host, host->cw_size * (ecc->steps - 1), page);
-       update_rw_regs(host, 1, false);
+       update_rw_regs(host, 1, false, 0);
 
        config_nand_page_write(chip);
        write_data_dma(nandc, FLASH_BUF_ACC,
@@ -2293,7 +2329,7 @@ static int qcom_nandc_block_markbad(struct nand_chip *chip, loff_t ofs)
        /* prepare write */
        host->use_ecc = false;
        set_address(host, host->cw_size * (ecc->steps - 1), page);
-       update_rw_regs(host, 1, false);
+       update_rw_regs(host, 1, false, ecc->steps - 1);
 
        config_nand_page_write(chip);
        write_data_dma(nandc, FLASH_BUF_ACC,