| Message ID | 9fbf3664ce00f8b07867f1011834015f21d162a5.1707388458.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mtd: maps: physmap-core: fix flash size larger than 32-bit | expand |
On Thu, 2024-02-08 at 10:34:18 UTC, Baruch Siach wrote: > mtd-ram can potentially be larger than 4GB. get_bitmask_order() uses > fls() that is not guaranteed to work with values larger than 32-bit. > Specifically on aarch64 fls() returns 0 when all 32 LSB bits are clear. > Use fls64() instead. > > Fixes: ba32ce95cbd987 ("mtd: maps: Merge gpio-addr-flash.c into physmap-core.c") > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks. Miquel
diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c index 746a27d15d44..96eb2e782c38 100644 --- a/drivers/mtd/maps/physmap-core.c +++ b/drivers/mtd/maps/physmap-core.c @@ -518,7 +518,7 @@ static int physmap_flash_probe(struct platform_device *dev) if (!info->maps[i].phys) info->maps[i].phys = res->start; - info->win_order = get_bitmask_order(resource_size(res)) - 1; + info->win_order = fls64(resource_size(res)) - 1; info->maps[i].size = BIT(info->win_order + (info->gpios ? info->gpios->ndescs : 0));
mtd-ram can potentially be larger than 4GB. get_bitmask_order() uses fls() that is not guaranteed to work with values larger than 32-bit. Specifically on aarch64 fls() returns 0 when all 32 LSB bits are clear. Use fls64() instead. Fixes: ba32ce95cbd987 ("mtd: maps: Merge gpio-addr-flash.c into physmap-core.c") Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- drivers/mtd/maps/physmap-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)