Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel: mtk_bmt: on error, do not attempt to remap out-of-range blocks

Browse source 
Pass errors to caller instead

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2022-03-09 16:14:12 +01:00
parent 7d1e2be160
commit be1f2b4d9d
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
target/linux/generic/files/drivers/mtd/nand/mtk_bmt.c
View file

@ -92,6 +92,17 @@ bool mapping_block_in_range(int block, int *start, int *end)
return false; return false;
} }
static bool
mtk_bmt_remap_block(u32 block, u32 mapped_block, int copy_len)
{
int start, end;
if (!mapping_block_in_range(block, &start, &end))
return false;
return bmtd.ops->remap_block(block, mapped_block, copy_len);
}
static int static int
mtk_bmt_read(struct mtd_info *mtd, loff_t from, mtk_bmt_read(struct mtd_info *mtd, loff_t from,
struct mtd_oob_ops *ops) struct mtd_oob_ops *ops)
@ -101,7 +112,6 @@ mtk_bmt_read(struct mtd_info *mtd, loff_t from,
loff_t cur_from; loff_t cur_from;
int ret = 0; int ret = 0;
int max_bitflips = 0; int max_bitflips = 0;
int start, end;
ops->retlen = 0; ops->retlen = 0;
ops->oobretlen = 0; ops->oobretlen = 0;
@ -129,16 +139,15 @@ mtk_bmt_read(struct mtd_info *mtd, loff_t from,
else else
max_bitflips = max_t(int, max_bitflips, cur_ret); max_bitflips = max_t(int, max_bitflips, cur_ret);
if (cur_ret < 0 && !mtd_is_bitflip(cur_ret)) { if (cur_ret < 0 && !mtd_is_bitflip(cur_ret)) {
bmtd.ops->remap_block(block, cur_block, mtd->erasesize); if (mtk_bmt_remap_block(block, cur_block, mtd->erasesize) &&
if (retry_count++ < 10) retry_count++ < 10)
continue; continue;
goto out; goto out;
} }
if (cur_ret >= mtd->bitflip_threshold && if (cur_ret >= mtd->bitflip_threshold)
mapping_block_in_range(block, &start, &end)) mtk_bmt_remap_block(block, cur_block, mtd->erasesize);
bmtd.ops->remap_block(block, cur_block, mtd->erasesize);
ops->retlen += cur_ops.retlen; ops->retlen += cur_ops.retlen;
ops->oobretlen += cur_ops.oobretlen; ops->oobretlen += cur_ops.oobretlen;
@ -191,8 +200,8 @@ mtk_bmt_write(struct mtd_info *mtd, loff_t to,
ops->len - ops->retlen); ops->len - ops->retlen);
ret = bmtd._write_oob(mtd, cur_to, &cur_ops); ret = bmtd._write_oob(mtd, cur_to, &cur_ops);
if (ret < 0) { if (ret < 0) {
bmtd.ops->remap_block(block, cur_block, offset); if (mtk_bmt_remap_block(block, cur_block, offset) &&
if (retry_count++ < 10) retry_count++ < 10)
continue; continue;
return ret; return ret;
@ -239,8 +248,8 @@ mtk_bmt_mtd_erase(struct mtd_info *mtd, struct erase_info *instr)
mapped_instr.addr = (loff_t)block << bmtd.blk_shift; mapped_instr.addr = (loff_t)block << bmtd.blk_shift;
ret = bmtd._erase(mtd, &mapped_instr); ret = bmtd._erase(mtd, &mapped_instr);
if (ret) { if (ret) {
bmtd.ops->remap_block(orig_block, block, 0); if (mtk_bmt_remap_block(orig_block, block, 0) &&
if (retry_count++ < 10) retry_count++ < 10)
continue; continue;
instr->fail_addr = start_addr; instr->fail_addr = start_addr;
break; break;
@ -263,8 +272,8 @@ retry:
block = bmtd.ops->get_mapping_block(orig_block); block = bmtd.ops->get_mapping_block(orig_block);
ret = bmtd._block_isbad(mtd, (loff_t)block << bmtd.blk_shift); ret = bmtd._block_isbad(mtd, (loff_t)block << bmtd.blk_shift);
if (ret) { if (ret) {
bmtd.ops->remap_block(orig_block, block, bmtd.blk_size); if (mtk_bmt_remap_block(orig_block, block, bmtd.blk_size) &&
if (retry_count++ < 10) retry_count++ < 10)
goto retry; goto retry;
} }
return ret; return ret;
@ -280,7 +289,7 @@ mtk_bmt_block_markbad(struct mtd_info *mtd, loff_t ofs)
if (block < 0) if (block < 0)
return -EIO; return -EIO;
bmtd.ops->remap_block(orig_block, block, bmtd.blk_size); mtk_bmt_remap_block(orig_block, block, bmtd.blk_size);
return bmtd._block_markbad(mtd, (loff_t)block << bmtd.blk_shift); return bmtd._block_markbad(mtd, (loff_t)block << bmtd.blk_shift);
} }
@ -317,7 +326,7 @@ static int mtk_bmt_debug_mark_bad(void *data, u64 val)
if (cur_block < 0) if (cur_block < 0)
return -EIO; return -EIO;
bmtd.ops->remap_block(block, cur_block, bmtd.blk_size); mtk_bmt_remap_block(block, cur_block, bmtd.blk_size);
return 0; return 0;
} }

2
target/linux/generic/files/drivers/mtd/nand/mtk_bmt_bbt.c
View file

@ -93,7 +93,7 @@ static bool remap_block_bbt(u16 block, u16 mapped_blk, int copy_len)
if (copy_len > 0) if (copy_len > 0)
bbt_nand_copy(new_blk, mapped_blk, copy_len); bbt_nand_copy(new_blk, mapped_blk, copy_len);
return false; return true;
} }
static void static void