1 From 41825166744c6e5664281611f5e6d9a2e9333c2b Mon Sep 17 00:00:00 2001
2 From: Chuanhong Guo <gch981213@gmail.com>
3 Date: Sat, 2 Apr 2022 22:31:20 +0800
4 Subject: [PATCH 10/15] mtd: nand: fix ecc parameters for mt7622
6 According to the datasheet, mt7622 only has 5 ECC capabilities instead
7 of 7, and the decoding error register is arranged as follows:
8 +------+---------+---------+---------+---------+
9 | Bits | 19:15 | 14:10 | 9:5 | 4:0 |
10 +------+---------+---------+---------+---------+
11 | Name | ERRNUM3 | ERRNUM2 | ERRNUM1 | ERRNUM0 |
12 +------+---------+---------+---------+---------+
13 This means err_mask should be 0x1f instead of 0x3f and the number of
14 bits shifted in mtk_ecc_get_stats should be 5 instead of 8.
16 This commit introduces err_shift for the difference in this register
17 and fix other existing parameters.
19 Public MT7622 reference manual can be found on [0] and the info this
20 commit is based on is from page 656 and page 660.
22 [0]: https://wiki.banana-pi.org/Banana_Pi_BPI-R64#Documents
24 Fixes: 98dea8d71931 ("mtd: nand: mtk: Support MT7622 NAND flash controller.")
25 Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
26 (cherry picked from commit 088b769abd1bd21753002b17b696ae1778b16e8c)
28 drivers/mtd/nand/raw/mtk_ecc.c | 12 ++++++++----
29 1 file changed, 8 insertions(+), 4 deletions(-)
31 --- a/drivers/mtd/nand/raw/mtk_ecc.c
32 +++ b/drivers/mtd/nand/raw/mtk_ecc.c
38 const u8 *ecc_strength;
41 @@ -76,7 +77,7 @@ static const u8 ecc_strength_mt2712[] =
44 static const u8 ecc_strength_mt7622[] = {
45 - 4, 6, 8, 10, 12, 14, 16
50 @@ -221,7 +222,7 @@ void mtk_ecc_get_stats(struct mtk_ecc *e
51 for (i = 0; i < sectors; i++) {
52 offset = (i >> 2) << 2;
53 err = readl(ecc->regs + ECC_DECENUM0 + offset);
54 - err = err >> ((i % 4) * 8);
55 + err = err >> ((i % 4) * ecc->caps->err_shift);
56 err &= ecc->caps->err_mask;
57 if (err == ecc->caps->err_mask) {
58 /* uncorrectable errors */
59 @@ -449,6 +450,7 @@ EXPORT_SYMBOL(mtk_ecc_get_parity_bits);
61 static const struct mtk_ecc_caps mtk_ecc_caps_mt2701 = {
64 .ecc_strength = ecc_strength_mt2701,
65 .ecc_regs = mt2701_ecc_regs,
66 .num_ecc_strength = 20,
67 @@ -459,6 +461,7 @@ static const struct mtk_ecc_caps mtk_ecc
69 static const struct mtk_ecc_caps mtk_ecc_caps_mt2712 = {
72 .ecc_strength = ecc_strength_mt2712,
73 .ecc_regs = mt2712_ecc_regs,
74 .num_ecc_strength = 23,
75 @@ -468,10 +471,11 @@ static const struct mtk_ecc_caps mtk_ecc
78 static const struct mtk_ecc_caps mtk_ecc_caps_mt7622 = {
82 .ecc_strength = ecc_strength_mt7622,
83 .ecc_regs = mt7622_ecc_regs,
84 - .num_ecc_strength = 7,
85 + .num_ecc_strength = 5,