diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-05-09 09:41:30 +0100 |
---|---|---|
committer | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-05-09 20:49:50 +0100 |
commit | d9a063c3967c72773616cf5eadd4f978b9724c50 (patch) | |
tree | e038cba587dad6c6de629c44278c7dcd62f7d3a3 /target/linux/mediatek | |
parent | 634a45cf1d7e85d633314910bc030d40dbe476bb (diff) | |
download | upstream-d9a063c3967c72773616cf5eadd4f978b9724c50.tar.gz upstream-d9a063c3967c72773616cf5eadd4f978b9724c50.tar.bz2 upstream-d9a063c3967c72773616cf5eadd4f978b9724c50.zip |
kernel: bump 5.15 to 5.15.38
Deleted (upstreamed):
mediatek/patches-5.15/120-10-v5.18-mtd-nand-fix-ecc-parameters-for-mt7622.patch [1]
Other patches automatically rebased.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.38&id=3ec920d755ae69c201b358e8d8e96c32f51145d8
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/mediatek')
-rw-r--r-- | target/linux/mediatek/patches-5.15/120-10-v5.18-mtd-nand-fix-ecc-parameters-for-mt7622.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/target/linux/mediatek/patches-5.15/120-10-v5.18-mtd-nand-fix-ecc-parameters-for-mt7622.patch b/target/linux/mediatek/patches-5.15/120-10-v5.18-mtd-nand-fix-ecc-parameters-for-mt7622.patch deleted file mode 100644 index e1c9493a1c..0000000000 --- a/target/linux/mediatek/patches-5.15/120-10-v5.18-mtd-nand-fix-ecc-parameters-for-mt7622.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 41825166744c6e5664281611f5e6d9a2e9333c2b Mon Sep 17 00:00:00 2001 -From: Chuanhong Guo <gch981213@gmail.com> -Date: Sat, 2 Apr 2022 22:31:20 +0800 -Subject: [PATCH 10/15] mtd: nand: fix ecc parameters for mt7622 - -According to the datasheet, mt7622 only has 5 ECC capabilities instead -of 7, and the decoding error register is arranged as follows: -+------+---------+---------+---------+---------+ -| Bits | 19:15 | 14:10 | 9:5 | 4:0 | -+------+---------+---------+---------+---------+ -| Name | ERRNUM3 | ERRNUM2 | ERRNUM1 | ERRNUM0 | -+------+---------+---------+---------+---------+ -This means err_mask should be 0x1f instead of 0x3f and the number of -bits shifted in mtk_ecc_get_stats should be 5 instead of 8. - -This commit introduces err_shift for the difference in this register -and fix other existing parameters. - -Public MT7622 reference manual can be found on [0] and the info this -commit is based on is from page 656 and page 660. - -[0]: https://wiki.banana-pi.org/Banana_Pi_BPI-R64#Documents - -Fixes: 98dea8d71931 ("mtd: nand: mtk: Support MT7622 NAND flash controller.") -Signed-off-by: Chuanhong Guo <gch981213@gmail.com> -(cherry picked from commit 088b769abd1bd21753002b17b696ae1778b16e8c) ---- - drivers/mtd/nand/raw/mtk_ecc.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - ---- a/drivers/mtd/nand/raw/mtk_ecc.c -+++ b/drivers/mtd/nand/raw/mtk_ecc.c -@@ -43,6 +43,7 @@ - - struct mtk_ecc_caps { - u32 err_mask; -+ u32 err_shift; - const u8 *ecc_strength; - const u32 *ecc_regs; - u8 num_ecc_strength; -@@ -76,7 +77,7 @@ static const u8 ecc_strength_mt2712[] = - }; - - static const u8 ecc_strength_mt7622[] = { -- 4, 6, 8, 10, 12, 14, 16 -+ 4, 6, 8, 10, 12 - }; - - enum mtk_ecc_regs { -@@ -221,7 +222,7 @@ void mtk_ecc_get_stats(struct mtk_ecc *e - for (i = 0; i < sectors; i++) { - offset = (i >> 2) << 2; - err = readl(ecc->regs + ECC_DECENUM0 + offset); -- err = err >> ((i % 4) * 8); -+ err = err >> ((i % 4) * ecc->caps->err_shift); - err &= ecc->caps->err_mask; - if (err == ecc->caps->err_mask) { - /* uncorrectable errors */ -@@ -449,6 +450,7 @@ EXPORT_SYMBOL(mtk_ecc_get_parity_bits); - - static const struct mtk_ecc_caps mtk_ecc_caps_mt2701 = { - .err_mask = 0x3f, -+ .err_shift = 8, - .ecc_strength = ecc_strength_mt2701, - .ecc_regs = mt2701_ecc_regs, - .num_ecc_strength = 20, -@@ -459,6 +461,7 @@ static const struct mtk_ecc_caps mtk_ecc - - static const struct mtk_ecc_caps mtk_ecc_caps_mt2712 = { - .err_mask = 0x7f, -+ .err_shift = 8, - .ecc_strength = ecc_strength_mt2712, - .ecc_regs = mt2712_ecc_regs, - .num_ecc_strength = 23, -@@ -468,10 +471,11 @@ static const struct mtk_ecc_caps mtk_ecc - }; - - static const struct mtk_ecc_caps mtk_ecc_caps_mt7622 = { -- .err_mask = 0x3f, -+ .err_mask = 0x1f, -+ .err_shift = 5, - .ecc_strength = ecc_strength_mt7622, - .ecc_regs = mt7622_ecc_regs, -- .num_ecc_strength = 7, -+ .num_ecc_strength = 5, - .ecc_mode_shift = 4, - .parity_bits = 13, - .pg_irq_sel = 0, |