Commit 00da2ea9 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Pass a nand_chip object to ecc->correct() 



Let's make the raw NAND API consistent by patching all helpers and
hooks to take a nand_chip object instead of an mtd_info one.

Now is ecc->correct()'s turn.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent af37d2c3

drivers/mtd/nand/raw/davinci_nand.c

+4 −5
Original line number Diff line number Diff line
@@ -185,10 +185,9 @@ static int nand_davinci_calculate_1bit(struct nand_chip *chip, 
	return 0;

}



static int nand_davinci_correct_1bit(struct mtd_info *mtd, u_char *dat,

static int nand_davinci_correct_1bit(struct nand_chip *chip, u_char *dat,

				     u_char *read_ecc, u_char *calc_ecc)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	uint32_t eccNand = read_ecc[0] | (read_ecc[1] << 8) |

					  (read_ecc[2] << 16);

	uint32_t eccCalc = calc_ecc[0] | (calc_ecc[1] << 8) |
@@ -303,11 +302,11 @@ static int nand_davinci_calculate_4bit(struct nand_chip *chip, 
/* Correct up to 4 bits in data we just read, using state left in the

 * hardware plus the ecc_code computed when it was first written.

 */

static int nand_davinci_correct_4bit(struct mtd_info *mtd,

		u_char *data, u_char *ecc_code, u_char *null)

static int nand_davinci_correct_4bit(struct nand_chip *chip, u_char *data,

				     u_char *ecc_code, u_char *null)

{

	int i;

	struct davinci_nand_info *info = to_davinci_nand(mtd);

	struct davinci_nand_info *info = to_davinci_nand(nand_to_mtd(chip));

	unsigned short ecc10[8];

	unsigned short *ecc16;

	u32 syndrome[4];

drivers/mtd/nand/raw/diskonchip.c

+1 −2
Original line number Diff line number Diff line
@@ -893,11 +893,10 @@ static int doc200x_calculate_ecc(struct nand_chip *this, const u_char *dat, 
	return 0;

}



static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat,

static int doc200x_correct_data(struct nand_chip *this, u_char *dat,

				u_char *read_ecc, u_char *isnull)

{

	int i, ret = 0;

	struct nand_chip *this = mtd_to_nand(mtd);

	struct doc_priv *doc = nand_get_controller_data(this);

	void __iomem *docptr = doc->virtadr;

	uint8_t calc_ecc[6];

drivers/mtd/nand/raw/fsmc_nand.c

+4 −5
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, 
		memcpy(&ecc_code[i], oob, chip->ecc.bytes);

		chip->ecc.calculate(chip, p, &ecc_calc[i]);



		stat = chip->ecc.correct(mtd, p, &ecc_code[i], &ecc_calc[i]);

		stat = chip->ecc.correct(chip, p, &ecc_code[i], &ecc_calc[i]);

		if (stat < 0) {

			mtd->ecc_stats.failed++;

		} else {
@@ -791,11 +791,10 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, 
 * calc_ecc is a 104 bit information containing maximum of 8 error

 * offset informations of 13 bits each in 512 bytes of read data.

 */

static int fsmc_bch8_correct_data(struct mtd_info *mtd, uint8_t *dat,

static int fsmc_bch8_correct_data(struct nand_chip *chip, uint8_t *dat,

				  uint8_t *read_ecc, uint8_t *calc_ecc)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct fsmc_nand_data *host = mtd_to_fsmc(mtd);

	struct fsmc_nand_data *host = mtd_to_fsmc(nand_to_mtd(chip));

	uint32_t err_idx[8];

	uint32_t num_err, i;

	uint32_t ecc1, ecc2, ecc3, ecc4;

drivers/mtd/nand/raw/jz4740_nand.c

+3 −3
Original line number Diff line number Diff line
@@ -215,10 +215,10 @@ static void jz_nand_correct_data(uint8_t *dat, int index, int mask) 
	dat[index+1] = (data >> 8) & 0xff;

}



static int jz_nand_correct_ecc_rs(struct mtd_info *mtd, uint8_t *dat,

static int jz_nand_correct_ecc_rs(struct nand_chip *chip, uint8_t *dat,

				  uint8_t *read_ecc, uint8_t *calc_ecc)

{

	struct jz_nand *nand = mtd_to_jz_nand(mtd);

	struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));

	int i, error_count, index;

	uint32_t reg, status, error;

	unsigned int timeout = 1000;

drivers/mtd/nand/raw/jz4780_nand.c

+2 −2
Original line number Diff line number Diff line
@@ -144,10 +144,10 @@ static int jz4780_nand_ecc_calculate(struct nand_chip *chip, const u8 *dat, 
	return jz4780_bch_calculate(nfc->bch, &params, dat, ecc_code);

}



static int jz4780_nand_ecc_correct(struct mtd_info *mtd, u8 *dat,

static int jz4780_nand_ecc_correct(struct nand_chip *chip, u8 *dat,

				   u8 *read_ecc, u8 *calc_ecc)

{

	struct jz4780_nand_chip *nand = to_jz4780_nand_chip(mtd);

	struct jz4780_nand_chip *nand = to_jz4780_nand_chip(nand_to_mtd(chip));

	struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(nand->chip.controller);

	struct jz4780_bch_params params;

CRA Git | Maintained and supported by SUSTech CRA and CCSE