kernel: mtk_bmt: fix block copying on remap with bmt v2

Copy from the previously mapped block (in case it was remapped already)

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry-picked from commit 7d1e2be1605eda85e1a607a3d3ddefed1b961d3d)

diff --git a/target/linux/generic/files/drivers/mtd/nand/mtk_bmt_v2.c b/target/linux/generic/files/drivers/mtd/nand/mtk_bmt_v2.c
index f2dc05be2bc475dc1799216374dcda8d114a3137..2770376e98bb14b6d468bad14954e08cd4e5d20f 100644 (file)
--- a/target/linux/generic/files/drivers/mtd/nand/mtk_bmt_v2.c
+++ b/target/linux/generic/files/drivers/mtd/nand/mtk_bmt_v2.c
@@ -285,21 +285,21 @@ error:
  */
 static bool remap_block_v2(u16 block, u16 mapped_block, int copy_len)
 {
-       u16 mapped_blk;
+       u16 new_block;
        struct bbbt *bbt;
 
        bbt = bmtd.bbt;
-       mapped_blk = find_valid_block_in_pool(bbt);
-       if (mapped_blk == 0)
+       new_block = find_valid_block_in_pool(bbt);
+       if (new_block == 0)
                return false;
 
        /* Map new bad block to available block in pool */
-       bbt->bb_tbl[block] = mapped_blk;
+       bbt->bb_tbl[block] = new_block;
 
        /* Erase new block */
-       bbt_nand_erase(mapped_blk);
+       bbt_nand_erase(new_block);
        if (copy_len > 0)
-               bbt_nand_copy(mapped_blk, block, copy_len);
+               bbt_nand_copy(new_block, mapped_block, copy_len);
 
        bmtd.bmt_blk_idx = upload_bmt(bbt, bmtd.bmt_blk_idx);