Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 15:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: cfi_cmdset_0002: Tone down warning messages about TopBottom CFI field

Browse Source 
Accept values of 2-5 for TopBottom, where the newly-added 4 and 5 values
mean a uniform layout. It does indicate WP layout but we don't handle that.

Also don't say "broken" when swapping erase regions in a top-boot chip.
That got retrospectively documented in the spec.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2010-05-14 01:35:54 +01:00
parent 564b84978d
commit 412da2f6e0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mtd/chips/cfi_cmdset_0002.c
View File

@ -390,14 +390,15 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
#endif #endif
bootloc = extp->TopBottom; bootloc = extp->TopBottom;
if ((bootloc != 2) && (bootloc != 3)) { if ((bootloc < 2) || (bootloc > 5)) {
printk(KERN_WARNING "%s: CFI does not contain boot " printk(KERN_WARNING "%s: CFI contains unrecognised boot "
"bank location. Assuming top.\n", map->name); "bank location (%d). Assuming bottom.\n",
bootloc, map->name);
bootloc = 2; bootloc = 2;
} }
if (bootloc == 3 && cfi->cfiq->NumEraseRegions > 1) { if (bootloc == 3 && cfi->cfiq->NumEraseRegions > 1) {
printk(KERN_WARNING "%s: Swapping erase regions for broken CFI table.\n", map->name); printk(KERN_WARNING "%s: Swapping erase regions for top-boot CFI table.\n", map->name);
for (i=0; i<cfi->cfiq->NumEraseRegions / 2; i++) { for (i=0; i<cfi->cfiq->NumEraseRegions / 2; i++) {
int j = (cfi->cfiq->NumEraseRegions-1)-i; int j = (cfi->cfiq->NumEraseRegions-1)-i;