diff options
| author |   Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-05-24 20:50:18 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-24 20:50:18 +0200 |
| commit | 3a3ab48c68de656736f091c6ed768fa8c110a7ab (patch) | |
| tree | 236d8fd4f1ce2ef32226689d254263c9c8d88219 /include/linux/mtd | |
| parent | [MTD] cfi_cmdset_0002: Fix broken status check (diff) | |
| download | linux-dev-3a3ab48c68de656736f091c6ed768fa8c110a7ab.tar.xz linux-dev-3a3ab48c68de656736f091c6ed768fa8c110a7ab.zip | |
[MTD] Make map_word_ff ware of the flash buswidth
map_word_ff() was setting the mapword to ~0UL regardless of the
buswidth of the mapped flash chip. The read_map functions are
buswidth aware and therefor the map_word_equal function failed.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/map.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index 115b14a634da..dd36d9433f00 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h @@ -1,6 +1,6 @@ /* Overhauled routines for dealing with different mmap regions of flash */ -/* $Id: map.h,v 1.48 2005/02/16 15:54:59 nico Exp $ */ +/* $Id: map.h,v 1.49 2005/05/24 18:45:15 gleixner Exp $ */ #ifndef __LINUX_MTD_MAP_H__ #define __LINUX_MTD_MAP_H__ @@ -340,13 +340,22 @@ static inline map_word map_word_load_partial(struct map_info *map, map_word orig return orig; } +#if BITS_PER_LONG < 64 +#define MAP_FF_LIMIT 4 +#else +#define MAP_FF_LIMIT 8 +#endif + static inline map_word map_word_ff(struct map_info *map) { map_word r; int i; - - for (i=0; i<map_words(map); i++) { - r.x[i] = ~0UL; + + if (map_bank_width(map) < MAP_FF_LIMIT) { + r.x[0] = (1 << (8*map_bank_width(map))) - 1; + } else { + for (i=0; i<map_words(map); i++) + r.x[i] = ~0UL; } return r; } |