Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: f0501e81fbaa ("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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20221018091129.280026-1-linus.walleij@linaro.org

authored by

Linus Walleij and committed by
Miquel Raynal
05e258c6 ce107713

+2 -2
+2 -2
drivers/mtd/parsers/bcm47xxpart.c
··· 233 233 } 234 234 235 235 /* Read middle of the block */ 236 - err = mtd_read(master, offset + 0x8000, 0x4, &bytes_read, 236 + err = mtd_read(master, offset + (blocksize / 2), 0x4, &bytes_read, 237 237 (uint8_t *)buf); 238 238 if (err && !mtd_is_bitflip(err)) { 239 239 pr_err("mtd_read error while parsing (offset: 0x%X): %d\n", 240 - offset + 0x8000, err); 240 + offset + (blocksize / 2), err); 241 241 continue; 242 242 } 243 243