lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mtd: nand: add __nand_correct_data helper function

Browse Source 
Split nand_correct_data() into two part, a pure calculation function
and a wrapper for mtd interface.

The tmio_nand driver can implement its ecc.correct function easily
using this __nand_correct_data helper.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Vimal Singh <vimalsingh@ti.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Atsushi Nemoto
2009-09-05 01:20:43 +09:00
committed by David Woodhouse
parent 23af51ecfb
commit be2f092bfc
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/mtd/nand/nand_ecc.c
View File

@@ -417,22 +417,22 @@ int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf,
EXPORT_SYMBOL(nand_calculate_ecc); EXPORT_SYMBOL(nand_calculate_ecc);
/** /**
* nand_correct_data - [NAND Interface] Detect and correct bit error(s) * __nand_correct_data - [NAND Interface] Detect and correct bit error(s)
* @mtd: MTD block structure
* @buf: raw data read from the chip * @buf: raw data read from the chip
* @read_ecc: ECC from the chip * @read_ecc: ECC from the chip
* @calc_ecc: the ECC calculated from raw data * @calc_ecc: the ECC calculated from raw data
* @eccsize: data bytes per ecc step (256 or 512)
* *
* Detect and correct a 1 bit error for 256/512 byte block * Detect and correct a 1 bit error for eccsize byte block
*/ */
int nand_correct_data(struct mtd_info *mtd, unsigned char *buf, int __nand_correct_data(unsigned char *buf,
unsigned char *read_ecc, unsigned char *calc_ecc) unsigned char *read_ecc, unsigned char *calc_ecc,
unsigned int eccsize)
{ {
unsigned char b0, b1, b2, bit_addr; unsigned char b0, b1, b2, bit_addr;
unsigned int byte_addr; unsigned int byte_addr;
/* 256 or 512 bytes/ecc */ /* 256 or 512 bytes/ecc */
const uint32_t eccsize_mult = const uint32_t eccsize_mult = eccsize >> 8;
(((struct nand_chip *)mtd->priv)->ecc.size) >> 8;
/* /*
* b0 to b2 indicate which bit is faulty (if any) * b0 to b2 indicate which bit is faulty (if any)
@@ -495,6 +495,23 @@ int nand_correct_data(struct mtd_info *mtd, unsigned char *buf,
printk(KERN_ERR "uncorrectable error : "); printk(KERN_ERR "uncorrectable error : ");
return -1; return -1;
} }
EXPORT_SYMBOL(__nand_correct_data);
/**
* nand_correct_data - [NAND Interface] Detect and correct bit error(s)
* @mtd: MTD block structure
* @buf: raw data read from the chip
* @read_ecc: ECC from the chip
* @calc_ecc: the ECC calculated from raw data
*
* Detect and correct a 1 bit error for 256/512 byte block
*/
int nand_correct_data(struct mtd_info *mtd, unsigned char *buf,
unsigned char *read_ecc, unsigned char *calc_ecc)
{
return __nand_correct_data(buf, read_ecc, calc_ecc,
((struct nand_chip *)mtd->priv)->ecc.size);
}
EXPORT_SYMBOL(nand_correct_data); EXPORT_SYMBOL(nand_correct_data);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

6
include/linux/mtd/nand_ecc.h
View File

@@ -20,6 +20,12 @@ struct mtd_info;
*/ */
int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code); int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code);
/*
* Detect and correct a 1 bit error for eccsize byte block
*/
int __nand_correct_data(u_char *dat, u_char *read_ecc, u_char *calc_ecc,
unsigned int eccsize);
/* /*
* Detect and correct a 1 bit error for 256 byte block * Detect and correct a 1 bit error for 256 byte block
*/ */