Commit 99a125f8 authored by Chris Packham's avatar Chris Packham Committed by Miquel Raynal

mtd: cfi_cmdset_0002: dynamically determine the max sectors

Because PPB unlocking unlocks the whole chip cfi_ppb_unlock() needs to
remember the locked status for each sector so it can re-lock the
unaddressed sectors. Dynamically calculate the maximum number of sectors
rather than using a hardcoded value that is too small for larger chips.

Tested with Spansion S29GL01GS11TFI flash device.
Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: default avatarStefan Roese <sr@denx.de>
Acked-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent a188339c
...@@ -2533,8 +2533,6 @@ struct ppb_lock { ...@@ -2533,8 +2533,6 @@ struct ppb_lock {
int locked; int locked;
}; };
#define MAX_SECTORS 512
#define DO_XXLOCK_ONEBLOCK_LOCK ((void *)1) #define DO_XXLOCK_ONEBLOCK_LOCK ((void *)1)
#define DO_XXLOCK_ONEBLOCK_UNLOCK ((void *)2) #define DO_XXLOCK_ONEBLOCK_UNLOCK ((void *)2)
#define DO_XXLOCK_ONEBLOCK_GETLOCK ((void *)3) #define DO_XXLOCK_ONEBLOCK_GETLOCK ((void *)3)
...@@ -2633,6 +2631,7 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs, ...@@ -2633,6 +2631,7 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
int i; int i;
int sectors; int sectors;
int ret; int ret;
int max_sectors;
/* /*
* PPB unlocking always unlocks all sectors of the flash chip. * PPB unlocking always unlocks all sectors of the flash chip.
...@@ -2640,7 +2639,11 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs, ...@@ -2640,7 +2639,11 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
* first check the locking status of all sectors and save * first check the locking status of all sectors and save
* it for future use. * it for future use.
*/ */
sect = kcalloc(MAX_SECTORS, sizeof(struct ppb_lock), GFP_KERNEL); max_sectors = 0;
for (i = 0; i < mtd->numeraseregions; i++)
max_sectors += regions[i].numblocks;
sect = kcalloc(max_sectors, sizeof(struct ppb_lock), GFP_KERNEL);
if (!sect) if (!sect)
return -ENOMEM; return -ENOMEM;
...@@ -2689,9 +2692,9 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs, ...@@ -2689,9 +2692,9 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
} }
sectors++; sectors++;
if (sectors >= MAX_SECTORS) { if (sectors >= max_sectors) {
printk(KERN_ERR "Only %d sectors for PPB locking supported!\n", printk(KERN_ERR "Only %d sectors for PPB locking supported!\n",
MAX_SECTORS); max_sectors);
kfree(sect); kfree(sect);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment