projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe66534
)
mtd: spi-nor: sfdp: Fix wrong erase type bitmask for overlaid region
author
Takahiro Kuwano
<Takahiro.Kuwano@infineon.com>
Fri, 2 Oct 2020 05:17:59 +0000
(14:17 +0900)
committer
Tudor Ambarus
<tudor.ambarus@microchip.com>
Fri, 5 Feb 2021 12:56:17 +0000
(14:56 +0200)
At the time spi_nor_region_check_overlay() is called, the erase types are
sorted in ascending order of erase size. The 'erase_type' should be masked
with 'BIT(erase[i].idx)' instead of 'BIT(i)'.
Fixes:
b038e8e3be72
("mtd: spi-nor: parse SFDP Sector Map Parameter Table")
Cc: stable@vger.kernel.org
Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
[ta: Add Fixes tag and Cc to stable]
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link:
https://lore.kernel.org/r/fd90c40d5b626a1319a78fc2bcee79a8871d4d57.1601612872.git.Takahiro.Kuwano@infineon.com
drivers/mtd/spi-nor/sfdp.c
patch
|
blob
|
history
diff --git
a/drivers/mtd/spi-nor/sfdp.c
b/drivers/mtd/spi-nor/sfdp.c
index
6ee7719
..
b3d44bd
100644
(file)
--- a/
drivers/mtd/spi-nor/sfdp.c
+++ b/
drivers/mtd/spi-nor/sfdp.c
@@
-788,7
+788,7
@@
spi_nor_region_check_overlay(struct spi_nor_erase_region *region,
int i;
for (i = 0; i < SNOR_ERASE_TYPE_MAX; i++) {
- if (!(erase
_type & BIT(i
)))
+ if (!(erase
[i].size && erase_type & BIT(erase[i].idx
)))
continue;
if (region->size & erase[i].size_mask) {
spi_nor_region_mark_overlay(region);