renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

mtd: pxa3xx_nand: add single-bit error corrections reporting

Browse Source 
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Yeasah Pell <yeasah@comrex.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Yeasah Pell 2009-07-01 18:11:35 +03:00 committed by David Woodhouse
parent 71b7d0d90d
commit 223cf6c3b5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mtd/nand/pxa3xx_nand.c
View File

@ -102,6 +102,7 @@ enum {
ERR_SENDCMD = -2, ERR_SENDCMD = -2,
ERR_DBERR = -3, ERR_DBERR = -3,
ERR_BBERR = -4, ERR_BBERR = -4,
ERR_SBERR = -5,
}; };
enum { enum {
@ -564,11 +565,13 @@ static irqreturn_t pxa3xx_nand_irq(int irq, void *devid)
status = nand_readl(info, NDSR); status = nand_readl(info, NDSR);
if (status & (NDSR_RDDREQ | NDSR_DBERR)) { if (status & (NDSR_RDDREQ | NDSR_DBERR | NDSR_SBERR)) {
if (status & NDSR_DBERR) if (status & NDSR_DBERR)
info->retcode = ERR_DBERR; info->retcode = ERR_DBERR;
else if (status & NDSR_SBERR)
info->retcode = ERR_SBERR;
disable_int(info, NDSR_RDDREQ | NDSR_DBERR); disable_int(info, NDSR_RDDREQ | NDSR_DBERR | NDSR_SBERR);
if (info->use_dma) { if (info->use_dma) {
info->state = STATE_DMA_READING; info->state = STATE_DMA_READING;
@ -670,7 +673,7 @@ static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
if (prepare_read_prog_cmd(info, cmdset->read1, column, page_addr)) if (prepare_read_prog_cmd(info, cmdset->read1, column, page_addr))
break; break;
pxa3xx_nand_do_cmd(info, NDSR_RDDREQ | NDSR_DBERR); pxa3xx_nand_do_cmd(info, NDSR_RDDREQ | NDSR_DBERR | NDSR_SBERR);
/* We only are OOB, so if the data has error, does not matter */ /* We only are OOB, so if the data has error, does not matter */
if (info->retcode == ERR_DBERR) if (info->retcode == ERR_DBERR)
@ -687,7 +690,7 @@ static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
if (prepare_read_prog_cmd(info, cmdset->read1, column, page_addr)) if (prepare_read_prog_cmd(info, cmdset->read1, column, page_addr))
break; break;
pxa3xx_nand_do_cmd(info, NDSR_RDDREQ | NDSR_DBERR); pxa3xx_nand_do_cmd(info, NDSR_RDDREQ | NDSR_DBERR | NDSR_SBERR);
if (info->retcode == ERR_DBERR) { if (info->retcode == ERR_DBERR) {
/* for blank page (all 0xff), HW will calculate its ECC as /* for blank page (all 0xff), HW will calculate its ECC as
@ -861,8 +864,12 @@ static int pxa3xx_nand_ecc_correct(struct mtd_info *mtd,
* consider it as a ecc error which will tell the caller the * consider it as a ecc error which will tell the caller the
* read fail We have distinguish all the errors, but the * read fail We have distinguish all the errors, but the
* nand_read_ecc only check this function return value * nand_read_ecc only check this function return value
*
* Corrected (single-bit) errors must also be noted.
*/ */
if (info->retcode != ERR_NONE) if (info->retcode == ERR_SBERR)
return 1;
else if (info->retcode != ERR_NONE)
return -1; return -1;
return 0; return 0;