Commit 05e258c6 authored by Linus Walleij's avatar Linus Walleij Committed by Miquel Raynal

mtd: parsers: bcm47xxpart: Fix halfblock reads

There is some code in the parser that tries to read 0x8000
bytes into a block to "read in the middle" of the block. Well
that only works if the block is also 0x10000 bytes all the time,
else we get these parse errors as we reach the end of the flash:

spi-nor spi0.0: mx25l1606e (2048 Kbytes)
mtd_read error while parsing (offset: 0x200000): -22
mtd_read error while parsing (offset: 0x201000): -22
(...)

Fix the code to do what I think was intended.

Cc: stable@vger.kernel.org
Fixes: f0501e81 ("mtd: bcm47xxpart: alternative MAGIC for board_data partition")
Cc: Rafał Miłecki <zajec5@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20221018091129.280026-1-linus.walleij@linaro.org
parent ce107713
...@@ -233,11 +233,11 @@ static int bcm47xxpart_parse(struct mtd_info *master, ...@@ -233,11 +233,11 @@ static int bcm47xxpart_parse(struct mtd_info *master,
} }
/* Read middle of the block */ /* Read middle of the block */
err = mtd_read(master, offset + 0x8000, 0x4, &bytes_read, err = mtd_read(master, offset + (blocksize / 2), 0x4, &bytes_read,
(uint8_t *)buf); (uint8_t *)buf);
if (err && !mtd_is_bitflip(err)) { if (err && !mtd_is_bitflip(err)) {
pr_err("mtd_read error while parsing (offset: 0x%X): %d\n", pr_err("mtd_read error while parsing (offset: 0x%X): %d\n",
offset + 0x8000, err); offset + (blocksize / 2), err);
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment