diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-12-13 20:41:22 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-12-13 20:41:22 +0000 |
| commit | 5afedc67e2fa7ad440516a64534acc28f3a61500 (patch) | |
| tree | d81525cfd46a61ef1c060ac15c317cfd64c1a7dc /target/linux/generic/patches-3.0 | |
| parent | 470b1f471a745eab6765fdf1edea3e882d682f9e (diff) | |
| download | master-31e0f0ae-5afedc67e2fa7ad440516a64534acc28f3a61500.tar.gz master-31e0f0ae-5afedc67e2fa7ad440516a64534acc28f3a61500.tar.bz2 master-31e0f0ae-5afedc67e2fa7ad440516a64534acc28f3a61500.zip | |
generic: disable 'small sector' erase in m25p80 driver
This fixes the issues with the jffs2 images on various boards. Using
JFFS2 on devices with 4KiB erase sectors is not safe:
http://lists.infradead.org/pipermail/linux-mtd/2011-June/036591.html
SVN-Revision: 29521
Diffstat (limited to 'target/linux/generic/patches-3.0')
| -rw-r--r-- | target/linux/generic/patches-3.0/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.0/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch new file mode 100644 index 0000000000..cc78d91f63 --- /dev/null +++ b/target/linux/generic/patches-3.0/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch @@ -0,0 +1,41 @@ +--- a/drivers/mtd/devices/Kconfig ++++ b/drivers/mtd/devices/Kconfig +@@ -102,6 +102,14 @@ config M25PXX_USE_FAST_READ + help + This option enables FAST_READ access supported by ST M25Pxx. + ++config M25PXX_PREFER_SMALL_SECTOR_ERASE ++ bool "Prefer small sector erase" ++ depends on MTD_M25P80 ++ default y ++ help ++ This option enables use of the small erase sectors if that is ++ supported by the flash chip. ++ + config MTD_SST25L + tristate "Support SST25L (non JEDEC) SPI Flash chips" + depends on SPI_MASTER +--- a/drivers/mtd/devices/m25p80.c ++++ b/drivers/mtd/devices/m25p80.c +@@ -83,6 +83,12 @@ + + #define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16) + ++#ifdef CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE ++#define PREFER_SMALL_SECTOR_ERASE 1 ++#else ++#define PREFER_SMALL_SECTOR_ERASE 0 ++#endif ++ + /****************************************************************************/ + + struct m25p { +@@ -924,7 +930,7 @@ static int __devinit m25p_probe(struct s + flash->mtd.write = m25p80_write; + + /* prefer "small sector" erase if possible */ +- if (info->flags & SECT_4K) { ++ if (PREFER_SMALL_SECTOR_ERASE && (info->flags & SECT_4K)) { + flash->erase_opcode = OPCODE_BE_4K; + flash->mtd.erasesize = 4096; + } else if (info->flags & SECT_4K_PMC) { |