mtd: rawnand: qcom: Convert nandc to chip in Read/Write helper
PATCH 1/1 mtd: rawnand: qcom: Convert nandc to chip in Read/Write helper
This change will convert nandc to chip in Read/Write helper, this change is needed because if we wnated to access number of steps in Read/Write helper then we need to get the chip->ecc.steps, currentlly its not possible.After this change we can directly acces chip->ecc.steps in Read/Write helper.
--- drivers/mtd/nand/raw/qcom_nandc.c | 52 +++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 21 deletions(-)
drivers/mtd/nand/raw/qcom_nandc.c +31 -21
@@ -1079,8 +1079,10 @@ static int write_data_dma(struct qcom_nand_controller *nandc, int reg_off,* Helper to prepare DMA descriptors for configuring registers * before reading a NAND page. */ -static void config_nand_page_read (struct qcom_nand_controller *nandc) +static void config_nand_page_read (struct nand_chip *chip) { +struct qcom_nand_controller *nandc =get_qcom_nand_controller (chip); +write_reg_dma (nandc,NAND_ADDR0 ,2 ,0 );write_reg_dma (nandc,NAND_DEV0_CFG0 ,3 ,0 );write_reg_dma (nandc,NAND_EBI2_ECC_BUF_CFG ,1 ,0 );
@@ -1094,8 +1096,10 @@ static void config_nand_page_read(struct qcom_nand_controller *nandc)* before reading each codeword in NAND page. */ static void -config_nand_cw_read (struct qcom_nand_controller *nandc,bool use_ecc) +config_nand_cw_read (struct nand_chip *chip,bool use_ecc) { +struct qcom_nand_controller *nandc =get_qcom_nand_controller (chip); +if (nandc->props->is_bam)write_reg_dma (nandc,NAND_READ_LOCATION_0 ,4 ,NAND_BAM_NEXT_SGL );
@@ -1117,19 +1121,23 @@ config_nand_cw_read(struct qcom_nand_controller *nandc, bool use_ecc)* single codeword in page */ static void -config_nand_single_cw_page_read (struct qcom_nand_controller *nandc, +config_nand_single_cw_page_read (struct nand_chip *chip,bool use_ecc) { -config_nand_page_read (nandc); -config_nand_cw_read (nandc, use_ecc); +struct qcom_nand_controller *nandc =get_qcom_nand_controller (chip); + +config_nand_page_read (chip); +config_nand_cw_read (chip, use_ecc); }/* * Helper to prepare DMA descriptors used to configure registers needed for * before writing a NAND page. */ -static void config_nand_page_write (struct qcom_nand_controller *nandc) +static void config_nand_page_write (struct nand_chip *chip) { +struct qcom_nand_controller *nandc =get_qcom_nand_controller (chip); +write_reg_dma (nandc,NAND_ADDR0 ,2 ,0 );write_reg_dma (nandc,NAND_DEV0_CFG0 ,3 ,0 ); write_reg_dma(nandc, NAND_EBI2_ECC_BUF_CFG, 1,
@@ -1140,8 +1148,10 @@ static void config_nand_page_write(struct qcom_nand_controller *nandc)* Helper to prepare DMA descriptors for configuring registers * before writing each codeword in NAND page. */ -static void config_nand_cw_write (struct qcom_nand_controller *nandc) +static void config_nand_cw_write (struct nand_chip *chip) { +struct qcom_nand_controller *nandc =get_qcom_nand_controller (chip); +write_reg_dma (nandc,NAND_FLASH_CMD ,1 ,NAND_BAM_NEXT_SGL );write_reg_dma (nandc,NAND_EXEC_CMD ,1 ,NAND_BAM_NEXT_SGL );
@@ -1215,7 +1225,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 (nandc, false); +config_nand_single_cw_page_read (chip, false);read_data_dma (nandc,FLASH_BUF_ACC , nandc->data_buffer, nandc->buf_count,0 );
@@ -1617,7 +1627,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); -config_nand_page_read (nandc); +config_nand_page_read (chip); data_size1 = mtd->writesize - host->cw_size * (ecc->steps -1 ); oob_size1 = host->bbm_size;
@@ -1645,7 +1655,7 @@ qcom_nandc_read_cw_raw(struct mtd_info *mtd, struct nand_chip *chip,nandc_set_read_loc (nandc,3 , read_loc, oob_size2,1 ); } -config_nand_cw_read (nandc, false); +config_nand_cw_read (chip, false);read_data_dma (nandc, reg_off, data_buf, data_size1,0 ); reg_off += data_size1;
@@ -1856,7 +1866,7 @@ static int read_page_ecc(struct qcom_nand_host *host, u8 *data_buf,u8 *data_buf_start = data_buf, *oob_buf_start = oob_buf;int i, ret; -config_nand_page_read (nandc); +config_nand_page_read (chip);/* queue cmd descs for each codeword */ for (i =0 ; i < ecc->steps; i++) {
@@ -1884,7 +1894,7 @@ static int read_page_ecc(struct qcom_nand_host *host, u8 *data_buf, } } -config_nand_cw_read (nandc, true); +config_nand_cw_read (chip, true);if (data_buf) read_data_dma(nandc, FLASH_BUF_ACC, data_buf,
@@ -1946,7 +1956,7 @@ static int copy_last_cw(struct qcom_nand_host *host, int page)set_address (host, host->cw_size * (ecc->steps -1 ), page);update_rw_regs (host,1 , true); -config_nand_single_cw_page_read (nandc, host->use_ecc); +config_nand_single_cw_page_read (chip, host->use_ecc);read_data_dma (nandc,FLASH_BUF_ACC , nandc->data_buffer, size,0 );
@@ -2036,7 +2046,7 @@ static int qcom_nandc_write_page(struct nand_chip *chip, const uint8_t *buf, host->use_ecc = true;update_rw_regs (host, ecc->steps, false); -config_nand_page_write (nandc); +config_nand_page_write (chip);for (i =0 ; i < ecc->steps; i++) {int data_size, oob_size;
@@ -2068,7 +2078,7 @@ static int qcom_nandc_write_page(struct nand_chip *chip, const uint8_t *buf, oob_buf, oob_size, 0); } -config_nand_cw_write (nandc); +config_nand_cw_write (chip); data_buf += data_size; oob_buf += oob_size;
@@ -2107,7 +2117,7 @@ static int qcom_nandc_write_page_raw(struct nand_chip *chip, host->use_ecc = false;update_rw_regs (host, ecc->steps, false); -config_nand_page_write (nandc); +config_nand_page_write (chip);for (i =0 ; i < ecc->steps; i++) {int data_size1, data_size2, oob_size1, oob_size2;
@@ -2144,7 +2154,7 @@ static int qcom_nandc_write_page_raw(struct nand_chip *chip,write_data_dma (nandc, reg_off, oob_buf, oob_size2,0 ); oob_buf += oob_size2; -config_nand_cw_write (nandc); +config_nand_cw_write (chip); } ret =submit_descs (nandc);
@@ -2191,10 +2201,10 @@ static int qcom_nandc_write_oob(struct nand_chip *chip, int page)set_address (host, host->cw_size * (ecc->steps -1 ), page);update_rw_regs (host,1 , false); -config_nand_page_write (nandc); +config_nand_page_write (chip);write_data_dma (nandc,FLASH_BUF_ACC , nandc->data_buffer, data_size + oob_size,0 ); -config_nand_cw_write (nandc); +config_nand_cw_write (chip); ret =submit_descs (nandc);
@@ -2270,10 +2280,10 @@ static int qcom_nandc_block_markbad(struct nand_chip *chip, loff_t ofs)set_address (host, host->cw_size * (ecc->steps -1 ), page);update_rw_regs (host,1 , false); -config_nand_page_write (nandc); +config_nand_page_write (chip);write_data_dma (nandc,FLASH_BUF_ACC , nandc->data_buffer, host->cw_size,0 ); -config_nand_cw_write (nandc); +config_nand_cw_write (chip); ret =submit_descs (nandc);
Signature · 6 lines
2.7.4 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Miquel Raynal
maintainerHello,
Md Sadre Alam <[email protected]> wrote on Mon, 22 Feb 2021 01:55:01 +0530:
Quoted 7 lines
This change will convert nandc to chip in Read/Write helper, this change is needed because if we wnated to access number of steps in Read/Write helper then we need to get the
chip->ecc.steps, currentlly its not possible.After this change we can directly acceschip->ecc.stepsin Read/Write helper.Signed-off-by Md Sadre Alam <[email protected]>
Thanks for splitting your series, I think it's much easier to review and contains much less imprecise changes.
I have a few minor comments (see the following e-mails), please address them and then please send all your patches a single series, not like 6+ independent patches.
I'll then require someone to test it if we are good I'll merge it.
Thanks,
Miquèl
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/