mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-02-19 02:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "mtd: nand: qcom: use oobsize from nand id table"

Browse source
This commit is contained in:
Linux Build Service Account 2018-04-26 08:51:47 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6e4d2c720d
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/include/asm/arch-qca-common/qpic_nand.h
View file

@ -211,10 +211,12 @@
#define NAND_CW_SIZE_4_BIT_ECC 528
#define NAND_CW_SIZE_8_BIT_ECC 532
/* Indicates the data bytes in the user data portion of the code word. */
#define USER_DATA_BYTES_PER_CW 512
#define NAND_CW_SPARE_SIZE_8_BIT_ECC (NAND_CW_SIZE_8_BIT_ECC - \
USER_DATA_BYTES_PER_CW)
/* Indicates the number of bytes covered by BCH ECC logic when
* a codeword is written to a NAND flash device.
* This is also the number of bytes that are part of the image in CW.

15
drivers/mtd/nand/qpic_nand.c
View file

@ -612,7 +612,6 @@ qpic_nand_onfi_save_params(struct mtd_info *mtd,
dev->page_size = param_page->data_per_pg;
mtd->writesize = dev->page_size;
mtd->writebufsize = mtd->writesize;
dev->block_size = param_page->pgs_per_blk * (dev->page_size);
mtd->erasesize = dev->block_size;
dev->num_blocks = param_page->blks_per_LUN;
@ -703,6 +702,7 @@ qpic_nand_save_config(struct mtd_info *mtd)
mtd->oobavail = (DATA_BYTES_IN_IMG_PER_CW - USER_DATA_BYTES_PER_CW) *
dev->cws_per_page;
dev->oob_per_page = mtd->oobavail;
mtd->writebufsize = mtd->writesize;
/* BAD_BLOCK_BYTE_NUM = Page Size - (CW_PER_PAGE * Codeword Size) + 1
* Note: Set CW_PER_PAGE to 1 less than the actual number.
*/
@ -1381,7 +1381,8 @@ static void qpic_nand_get_info_flash_dev(struct mtd_info *mtd,
struct qpic_nand_dev *dev = MTD_QPIC_NAND_DEV(mtd);
mtd->writesize = dev->page_size = flash_dev->pagesize;
mtd->erasesize = dev->block_size = flash_dev->erasesize;
mtd->oobsize = dev->spare_size = (flash_dev->pagesize >> 5);
mtd->oobsize = dev->spare_size = flash_dev->oobsize ?
flash_dev->oobsize : (flash_dev->pagesize >> 5);
}
@ -1454,6 +1455,7 @@ static int qpic_nand_get_info(struct mtd_info *mtd, uint32_t flash_id)
const struct nand_manufacturers *flash_man;
const struct nand_flash_dev *flash_dev;
struct qpic_nand_dev *dev = MTD_QPIC_NAND_DEV(mtd);
uint32_t min_oobsize_8bit_ecc;
man_id = NAND_ID_MAN(flash_id);
dev_id = NAND_ID_DEV(flash_id);
@ -1483,7 +1485,14 @@ static int qpic_nand_get_info(struct mtd_info *mtd, uint32_t flash_id)
else
qpic_nand_get_info_flash_dev(mtd, flash_dev);
mtd->ecc_strength = 4;
min_oobsize_8bit_ecc =
(mtd->writesize / CHUNK_SIZE) * NAND_CW_SPARE_SIZE_8_BIT_ECC;
/*
* Calculate the minimum required oobsize for using 8 bit ecc and use
* 8 bit ecc if this chip oobsize equal or more than that.
*/
mtd->ecc_strength = mtd->oobsize >= min_oobsize_8bit_ecc ? 8 : 4;
dev->num_blocks = mtd->size;
dev->num_blocks /= (dev->block_size);