GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-15 19:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mtd: spi-nor-core: Call mtd_erase_callback() from spi_nor_erase()

Browse source 
The spi_nor_erase() function does not call mtd_erase_callback() as it
should.

The mtdpart code currently implements the subtraction of partition
offset in mtd_erase_callback().

This results in partition offset being added prior calling
spi_nor_erase(), but not subtracted back on return. The result is that
the `mtd erase` command does not erase the whole partition, only some of
it's blocks:

  => mtd erase "Rescue system"
  Erasing 0x00000000 ... 0x006fffff (1792 eraseblock(s))
  jedec_spi_nor spi-nor@0: at 0x100000, len 4096
  jedec_spi_nor spi-nor@0: at 0x201000, len 4096
  jedec_spi_nor spi-nor@0: at 0x302000, len 4096
  jedec_spi_nor spi-nor@0: at 0x403000, len 4096
  jedec_spi_nor spi-nor@0: at 0x504000, len 4096
  jedec_spi_nor spi-nor@0: at 0x605000, len 4096
  jedec_spi_nor spi-nor@0: at 0x706000, len 4096

This is obviously wrong.

Add proper calling of mtd_erase_callback() into the spi_nor_erase()
function.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reported-by: Masami Hiramatsu <masami.hiramatsu@linaro.org>
Tested-by: Masami Hiramatsu <masami.hiramatsu@linaro.org>
This commit is contained in:
Marek Behún 2021-10-05 15:56:03 +02:00 • committed by Jagan Teki
parent 7398c1b758
commit ff0000b47d
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/mtd/spi/spi-nor-core.c
View file

@ -908,6 +908,7 @@ static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr)
static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
{ {
struct spi_nor *nor = mtd_to_spi_nor(mtd); struct spi_nor *nor = mtd_to_spi_nor(mtd);
bool addr_known = false;
u32 addr, len, rem; u32 addr, len, rem;
int ret, err; int ret, err;
@ -915,12 +916,17 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
(long long)instr->len); (long long)instr->len);
div_u64_rem(instr->len, mtd->erasesize, &rem); div_u64_rem(instr->len, mtd->erasesize, &rem);
if (rem) if (rem) {
return -EINVAL; ret = -EINVAL;
goto erase_err_callback;
}
addr = instr->addr; addr = instr->addr;
len = instr->len; len = instr->len;
instr->state = MTD_ERASING;
addr_known = true;
while (len) { while (len) {
WATCHDOG_RESET(); WATCHDOG_RESET();
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
@ -944,6 +950,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
goto erase_err; goto erase_err;
} }
addr_known = false;
erase_err: erase_err:
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
err = clean_bar(nor); err = clean_bar(nor);
@ -954,6 +961,15 @@ erase_err:
if (!ret) if (!ret)
ret = err; ret = err;
erase_err_callback:
if (ret) {
instr->fail_addr = addr_known ? addr : MTD_FAIL_ADDR_UNKNOWN;
instr->state = MTD_ERASE_FAILED;
} else {
instr->state = MTD_ERASE_DONE;
}
mtd_erase_callback(instr);
return ret; return ret;
} }