Commit 3e09c025 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: ndfc: Fix external use of SW Hamming ECC helper 



Since the Hamming software ECC engine has been updated to become a
proper and independent ECC engine, it is now mandatory to either
initialize the engine before using any one of his functions or use one
of the bare helpers which only perform the calculations. As there is no
actual need for a proper ECC initialization, let's just use the bare
helper instead of the rawnand one.

Fixes: 90ccf0a0 ("mtd: nand: ecc-hamming: Rename the exported functions")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210413161840.345208-5-miquel.raynal@bootlin.com
parent c4b7d7c4

drivers/mtd/nand/raw/ndfc.c

+11 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/mtd/ndfc.h>

#include <linux/slab.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand-ecc-sw-hamming.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <asm/io.h>
@@ -100,6 +101,15 @@ static int ndfc_calculate_ecc(struct nand_chip *chip, 
	return 0;

}



static int ndfc_correct_ecc(struct nand_chip *chip,

			    unsigned char *buf,

			    unsigned char *read_ecc,

			    unsigned char *calc_ecc)

{

	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,

				      chip->ecc.size, false);

}



/*

 * Speedups for buffer read/write/verify

 *
@@ -145,7 +155,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc, 
	chip->controller = &ndfc->ndfc_control;

	chip->legacy.read_buf = ndfc_read_buf;

	chip->legacy.write_buf = ndfc_write_buf;

	chip->ecc.correct = rawnand_sw_hamming_correct;

	chip->ecc.correct = ndfc_correct_ecc;

	chip->ecc.hwctl = ndfc_enable_hwecc;

	chip->ecc.calculate = ndfc_calculate_ecc;

	chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;