From: Miquel Raynal <miquel.raynal@bootlin.com> To: Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <Tudor.Ambarus@microchip.com>, <linux-mtd@lists.infradead.org> Cc: Miquel Raynal <miquel.raynal@bootlin.com>, stable@vger.kernel.org Subject: [PATCH v3 2/7] mtd: rawnand: fsmc: Fix external use of SW Hamming ECC helper Date: Tue, 13 Apr 2021 18:18:35 +0200 [thread overview] Message-ID: <20210413161840.345208-3-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20210413161840.345208-1-miquel.raynal@bootlin.com> 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: 90ccf0a0192f ("mtd: nand: ecc-hamming: Rename the exported functions") Cc: stable@vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/fsmc_nand.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c index a24e2f57fa68..99a4dde9825a 100644 --- a/drivers/mtd/nand/raw/fsmc_nand.c +++ b/drivers/mtd/nand/raw/fsmc_nand.c @@ -25,6 +25,7 @@ #include <linux/sched.h> #include <linux/types.h> #include <linux/mtd/mtd.h> +#include <linux/mtd/nand-ecc-sw-hamming.h> #include <linux/mtd/rawnand.h> #include <linux/platform_device.h> #include <linux/of.h> @@ -432,6 +433,15 @@ static int fsmc_read_hwecc_ecc1(struct nand_chip *chip, const u8 *data, return 0; } +static int fsmc_correct_ecc1(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); +} + /* Count the number of 0's in buff upto a max of max_bits */ static int count_written_bits(u8 *buff, int size, int max_bits) { @@ -917,7 +927,7 @@ static int fsmc_nand_attach_chip(struct nand_chip *nand) case NAND_ECC_ENGINE_TYPE_ON_HOST: dev_info(host->dev, "Using 1-bit HW ECC scheme\n"); nand->ecc.calculate = fsmc_read_hwecc_ecc1; - nand->ecc.correct = rawnand_sw_hamming_correct; + nand->ecc.correct = fsmc_correct_ecc1; nand->ecc.hwctl = fsmc_enable_hwecc; nand->ecc.bytes = 3; nand->ecc.strength = 1; -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Miquel Raynal <miquel.raynal@bootlin.com> To: Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <Tudor.Ambarus@microchip.com>, <linux-mtd@lists.infradead.org> Cc: Miquel Raynal <miquel.raynal@bootlin.com>, stable@vger.kernel.org Subject: [PATCH v3 2/7] mtd: rawnand: fsmc: Fix external use of SW Hamming ECC helper Date: Tue, 13 Apr 2021 18:18:35 +0200 [thread overview] Message-ID: <20210413161840.345208-3-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20210413161840.345208-1-miquel.raynal@bootlin.com> 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: 90ccf0a0192f ("mtd: nand: ecc-hamming: Rename the exported functions") Cc: stable@vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/fsmc_nand.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c index a24e2f57fa68..99a4dde9825a 100644 --- a/drivers/mtd/nand/raw/fsmc_nand.c +++ b/drivers/mtd/nand/raw/fsmc_nand.c @@ -25,6 +25,7 @@ #include <linux/sched.h> #include <linux/types.h> #include <linux/mtd/mtd.h> +#include <linux/mtd/nand-ecc-sw-hamming.h> #include <linux/mtd/rawnand.h> #include <linux/platform_device.h> #include <linux/of.h> @@ -432,6 +433,15 @@ static int fsmc_read_hwecc_ecc1(struct nand_chip *chip, const u8 *data, return 0; } +static int fsmc_correct_ecc1(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); +} + /* Count the number of 0's in buff upto a max of max_bits */ static int count_written_bits(u8 *buff, int size, int max_bits) { @@ -917,7 +927,7 @@ static int fsmc_nand_attach_chip(struct nand_chip *nand) case NAND_ECC_ENGINE_TYPE_ON_HOST: dev_info(host->dev, "Using 1-bit HW ECC scheme\n"); nand->ecc.calculate = fsmc_read_hwecc_ecc1; - nand->ecc.correct = rawnand_sw_hamming_correct; + nand->ecc.correct = fsmc_correct_ecc1; nand->ecc.hwctl = fsmc_enable_hwecc; nand->ecc.bytes = 3; nand->ecc.strength = 1; -- 2.27.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2021-04-13 16:27 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-13 16:18 [PATCH v3 0/7] Fix use of Hamming helpers Miquel Raynal 2021-04-13 16:18 ` [PATCH v3 1/7] mtd: rawnand: cs553x: Fix external use of SW Hamming ECC helper Miquel Raynal 2021-04-13 16:18 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-04-13 16:18 ` Miquel Raynal [this message] 2021-04-13 16:18 ` [PATCH v3 2/7] mtd: rawnand: fsmc: " Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-04-13 16:18 ` [PATCH v3 3/7] mtd: rawnand: lpc32xx_slc: " Miquel Raynal 2021-04-13 16:18 ` Miquel Raynal 2021-04-13 21:13 ` Vladimir Zapolskiy 2021-04-13 21:13 ` Vladimir Zapolskiy 2021-05-10 9:09 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-04-13 16:18 ` [PATCH v3 4/7] mtd: rawnand: ndfc: " Miquel Raynal 2021-04-13 16:18 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-04-13 16:18 ` [PATCH v3 5/7] mtd: rawnand: sharpsl: " Miquel Raynal 2021-04-13 16:18 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-04-13 16:18 ` [PATCH v3 6/7] mtd: rawnand: tmio: " Miquel Raynal 2021-04-13 16:18 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-04-13 16:18 ` [PATCH v3 7/7] mtd: rawnand: txx9ndfmc: " Miquel Raynal 2021-04-13 16:18 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal 2021-05-10 9:09 ` Miquel Raynal
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210413161840.345208-3-miquel.raynal@bootlin.com \ --to=miquel.raynal@bootlin.com \ --cc=Tudor.Ambarus@microchip.com \ --cc=linux-mtd@lists.infradead.org \ --cc=richard@nod.at \ --cc=stable@vger.kernel.org \ --cc=vigneshr@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.