* [PATCH] mtd: rawnand: meson: fix bit map use in meson_nfc_ecc_correct()
@ 2022-07-28 7:12 Dan Carpenter
2022-08-03 11:13 ` Liang Yang
2022-09-20 8:10 ` Miquel Raynal
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2022-07-28 7:12 UTC (permalink / raw)
To: Liang Yang
Cc: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Jianxin Pan, Yixun Lan, linux-mtd, linux-amlogic,
kernel-janitors
The meson_nfc_ecc_correct() function accidentally does a right shift
instead of a left shift so it only works for BIT(0). Also use
BIT_ULL() because "correct_bitmap" is a u64 and we want to avoid
shift wrapping bugs.
Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
From review. Untested.
drivers/mtd/nand/raw/meson_nand.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index 829b76b303aa..ad2ffd0ca800 100644
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -454,7 +454,7 @@ static int meson_nfc_ecc_correct(struct nand_chip *nand, u32 *bitflips,
if (ECC_ERR_CNT(*info) != ECC_UNCORRECTABLE) {
mtd->ecc_stats.corrected += ECC_ERR_CNT(*info);
*bitflips = max_t(u32, *bitflips, ECC_ERR_CNT(*info));
- *correct_bitmap |= 1 >> i;
+ *correct_bitmap |= BIT_ULL(i);
continue;
}
if ((nand->options & NAND_NEED_SCRAMBLING) &&
@@ -800,7 +800,7 @@ static int meson_nfc_read_page_hwecc(struct nand_chip *nand, u8 *buf,
u8 *data = buf + i * ecc->size;
u8 *oob = nand->oob_poi + i * (ecc->bytes + 2);
- if (correct_bitmap & (1 << i))
+ if (correct_bitmap & BIT_ULL(i))
continue;
ret = nand_check_erased_ecc_chunk(data, ecc->size,
oob, ecc->bytes + 2,
--
2.35.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: rawnand: meson: fix bit map use in meson_nfc_ecc_correct()
2022-07-28 7:12 [PATCH] mtd: rawnand: meson: fix bit map use in meson_nfc_ecc_correct() Dan Carpenter
@ 2022-08-03 11:13 ` Liang Yang
2022-09-20 8:10 ` Miquel Raynal
1 sibling, 0 replies; 3+ messages in thread
From: Liang Yang @ 2022-08-03 11:13 UTC (permalink / raw)
To: Dan Carpenter
Cc: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Jianxin Pan, Yixun Lan, linux-mtd, linux-amlogic,
kernel-janitors
Hi Dan,
Thanks.
On 2022/7/28 15:12, Dan Carpenter wrote:
> [ EXTERNAL EMAIL ]
>
> The meson_nfc_ecc_correct() function accidentally does a right shift
> instead of a left shift so it only works for BIT(0). Also use
> BIT_ULL() because "correct_bitmap" is a u64 and we want to avoid
> shift wrapping bugs.
>
> Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>>From review. Untested.
>
> drivers/mtd/nand/raw/meson_nand.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
> index 829b76b303aa..ad2ffd0ca800 100644
> --- a/drivers/mtd/nand/raw/meson_nand.c
> +++ b/drivers/mtd/nand/raw/meson_nand.c
> @@ -454,7 +454,7 @@ static int meson_nfc_ecc_correct(struct nand_chip *nand, u32 *bitflips,
> if (ECC_ERR_CNT(*info) != ECC_UNCORRECTABLE) {
> mtd->ecc_stats.corrected += ECC_ERR_CNT(*info);
> *bitflips = max_t(u32, *bitflips, ECC_ERR_CNT(*info));
> - *correct_bitmap |= 1 >> i;
> + *correct_bitmap |= BIT_ULL(i);
> continue;
> }
> if ((nand->options & NAND_NEED_SCRAMBLING) &&
> @@ -800,7 +800,7 @@ static int meson_nfc_read_page_hwecc(struct nand_chip *nand, u8 *buf,
> u8 *data = buf + i * ecc->size;
> u8 *oob = nand->oob_poi + i * (ecc->bytes + 2);
>
> - if (correct_bitmap & (1 << i))
> + if (correct_bitmap & BIT_ULL(i))
> continue;
> ret = nand_check_erased_ecc_chunk(data, ecc->size,
> oob, ecc->bytes + 2,
Acked-by: Liang Yang <liang.yang@amlogic.com>
Thanks,
Liang
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: rawnand: meson: fix bit map use in meson_nfc_ecc_correct()
2022-07-28 7:12 [PATCH] mtd: rawnand: meson: fix bit map use in meson_nfc_ecc_correct() Dan Carpenter
2022-08-03 11:13 ` Liang Yang
@ 2022-09-20 8:10 ` Miquel Raynal
1 sibling, 0 replies; 3+ messages in thread
From: Miquel Raynal @ 2022-09-20 8:10 UTC (permalink / raw)
To: Dan Carpenter, Liang Yang
Cc: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Jianxin Pan, Yixun Lan, linux-mtd, linux-amlogic,
kernel-janitors
On Thu, 2022-07-28 at 07:12:12 UTC, Dan Carpenter wrote:
> The meson_nfc_ecc_correct() function accidentally does a right shift
> instead of a left shift so it only works for BIT(0). Also use
> BIT_ULL() because "correct_bitmap" is a u64 and we want to avoid
> shift wrapping bugs.
>
> Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Acked-by: Liang Yang <liang.yang@amlogic.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-20 8:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-28 7:12 [PATCH] mtd: rawnand: meson: fix bit map use in meson_nfc_ecc_correct() Dan Carpenter
2022-08-03 11:13 ` Liang Yang
2022-09-20 8:10 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).