Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13ce77f4 authored by Anatolij Gustschin's avatar Anatolij Gustschin Committed by David Woodhouse
Browse files

mtd: cfi: fix writebufsize initialization 



When initializing mtd->writebufsize, we must take into account
possible flash chip interleaving. Wrong writebufsize initialization
caused UBIFS recovery issues resulting in unmountable UBIFS file
system on NOR flash partitions.

Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
Acked-by: default avatarGuillaume LECERF <glecerf@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent d8f90b2c

drivers/mtd/chips/cfi_cmdset_0001.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary) 
	mtd->flags   = MTD_CAP_NORFLASH;

	mtd->name    = map->name;

	mtd->writesize = 1;

	mtd->writebufsize = 1 << cfi->cfiq->MaxBufWriteSize;

	mtd->writebufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;



	mtd->reboot_notifier.notifier_call = cfi_intelext_reboot;

drivers/mtd/chips/cfi_cmdset_0002.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) 
	mtd->flags   = MTD_CAP_NORFLASH;

	mtd->name    = map->name;

	mtd->writesize = 1;

	mtd->writebufsize = 1 << cfi->cfiq->MaxBufWriteSize;

	mtd->writebufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;



	DEBUG(MTD_DEBUG_LEVEL3, "MTD %s(): write buffer size %d\n",

		__func__, mtd->writebufsize);

drivers/mtd/chips/cfi_cmdset_0020.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map) 
	mtd->resume = cfi_staa_resume;

	mtd->flags = MTD_CAP_NORFLASH & ~MTD_BIT_WRITEABLE;

	mtd->writesize = 8; /* FIXME: Should be 0 for STMicro flashes w/out ECC */

	mtd->writebufsize = 1 << cfi->cfiq->MaxBufWriteSize;

	mtd->writebufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;

	map->fldrv = &cfi_staa_chipdrv;

	__module_get(THIS_MODULE);

	mtd->name = map->name;