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

Commit a126483e authored by Frieder Schrempf's avatar Frieder Schrempf Committed by Miquel Raynal
Browse files

mtd: spinand: Fix max_bad_eraseblocks_per_lun info in memorg 



The 1Gb Macronix chip can have a maximum of 20 bad blocks, while
the 2Gb version has twice as many blocks and therefore the maximum
number of bad blocks is 40.

The 4Gb GigaDevice GD5F4GQ4xA has twice as many blocks as its 2Gb
counterpart and therefore a maximum of 80 bad blocks.

Fixes: 377e517b ("mtd: nand: Add max_bad_eraseblocks_per_lun info to memorg")
Reported-by: default avatarEmil Lenngren <emil.lenngren@gmail.com>
Signed-off-by: default avatarFrieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 6fbc7275

drivers/mtd/nand/spi/gigadevice.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static const struct spinand_info gigadevice_spinand_table[] = { 
		     SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,

				     gd5fxgq4xa_ecc_get_status)),

	SPINAND_INFO("GD5F4GQ4xA", 0xF4,

		     NAND_MEMORG(1, 2048, 64, 64, 4096, 40, 1, 1, 1),

		     NAND_MEMORG(1, 2048, 64, 64, 4096, 80, 1, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

drivers/mtd/nand/spi/macronix.c

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int mx35lf1ge4ab_ecc_get_status(struct spinand_device *spinand, 


static const struct spinand_info macronix_spinand_table[] = {

	SPINAND_INFO("MX35LF1GE4AB", 0x12,

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 40, 1, 1, 1),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(4, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,
@@ -109,7 +109,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     mx35lf1ge4ab_ecc_get_status)),

	SPINAND_INFO("MX35LF2GE4AB", 0x22,

		     NAND_MEMORG(1, 2048, 64, 64, 2048, 20, 2, 1, 1),

		     NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 2, 1, 1),

		     NAND_ECCREQ(4, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,