Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be2f092b authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by David Woodhouse
Browse files

mtd: nand: add __nand_correct_data helper function 



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: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: default avatarVimal Singh <vimalsingh@ti.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 23af51ec

drivers/mtd/nand/nand_ecc.c

+24 −7
Original line number Diff line number Diff line
@@ -417,22 +417,22 @@ int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, 
EXPORT_SYMBOL(nand_calculate_ecc);



/**

 * nand_correct_data - [NAND Interface] Detect and correct bit error(s)

 * @mtd:	MTD block structure

 * __nand_correct_data - [NAND Interface] Detect and correct bit error(s)

 * @buf:	raw data read from the chip

 * @read_ecc:	ECC from the chip

 * @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,

		      unsigned char *read_ecc, unsigned char *calc_ecc)

int __nand_correct_data(unsigned char *buf,

			unsigned char *read_ecc, unsigned char *calc_ecc,

			unsigned int eccsize)

{

	unsigned char b0, b1, b2, bit_addr;

	unsigned int byte_addr;

	/* 256 or 512 bytes/ecc  */

	const uint32_t eccsize_mult =

			(((struct nand_chip *)mtd->priv)->ecc.size) >> 8;

	const uint32_t eccsize_mult = eccsize >> 8;



	/*

	 * 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 : ");

	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);



MODULE_LICENSE("GPL");

include/linux/mtd/nand_ecc.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ struct mtd_info; 
 */

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

 */