kernel/git/stable/linux.git/drivers/mtd/chips, branch linux-2.6.37.y

mtd: fix race in cfi_cmdset_0001 driver

2011-03-23T19:49:53+00:00

commit ecf3fde07c8dcb92a1bf3fbdfe70905d85cd00e1 upstream. As inval_cache_and_wait_for_operation() drop and reclaim the lock to invalidate the cache, some other thread may suspend the operation before reaching the for(;;) loop. Therefore the loop must start with checking the chip->state before reading status from the chip. Signed-off-by: Joakim Tjernlund Acked-by: Michael Cashwell Acked-by: Stefan Bigler Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman

mtd: jedec_probe: initialise make sector erase command variable

2011-03-23T19:49:51+00:00

commit ceabebb2bd2672f709e4454e16bc6042732e2dfe upstream. In the commit 08968041bef437ec363623cd3218c2b083537ada (mtd: cfi_cmdset_0002: make sector erase command variable) introdused a field sector_erase_cmd. In the same commit initialisation of cfi->sector_erase_cmd made in cfi_chip_setup() (file drivers/mtd/chips/cfi_probe.c), so the CFI chip has no problem: ... cfi->cfi_mode = CFI_MODE_CFI; cfi->sector_erase_cmd = CMD(0x30); ... But for the JEDEC chips this initialisation is not carried out, so the JEDEC chips have sector_erase_cmd == 0. This patch adds the missing initialisation. Signed-off-by: Antony Pavlov Acked-by: Guillaume LECERF Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman

mtd: jedec_probe: Change variable name from cfi_p to cfi

2011-03-23T19:49:51+00:00

commit efba2e313ea1b1bd69a7c4659263becf43bb1adc upstream. In the following commit, we'll need to use the CMD() macro in order to fix the initialisation of the sector_erase_cmd field. That requires the local variable to be called 'cfi', so change it first in a simple patch. Signed-off-by: Antony Pavlov Acked-by: Guillaume LECERF Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2010-10-30T11:35:11+00:00

Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse

Revert "mtd: cleanup Kconfig dependencies"

2010-10-26T10:42:51+00:00

This reverts commit 432dc821c90114f9b0e00f6752a700e937516ade. The individual CFI geometry options were carefully set up to get sane default values if the CFI_ADV_OPTIONS wasn't set, and it wasn't appropriate to move them into an if/endif block. Signed-off-by: David Woodhouse

mtd: cfi_cmdset_0002: make sector erase command variable

2010-10-26T10:39:17+00:00

Some old SST chips use 0x50 as sector erase command, instead of 0x30. Make this value variable to handle such chips. Signed-off-by: Guillaume LECERF Acked-by: Wolfram Sang Signed-off-by: David Woodhouse

mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips

2010-10-26T10:38:48+00:00

Add support for SST38VF640x chips in CFI mode. Signed-off-by: Guillaume LECERF Signed-off-by: yidong zhang Signed-off-by: David Woodhouse

mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode

2010-10-26T10:37:26+00:00

Signed-off-by: Guillaume LECERF Signed-off-by: David Woodhouse

mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one

2010-10-26T10:00:18+00:00

Signed-off-by: Guillaume LECERF Signed-off-by: David Woodhouse

mtd: cfi_cmdset_0002: code cleanups

2010-10-25T00:14:19+00:00

- remove disabled code (hasn't been touched since the beginning of git and should be reimplemented if really needed) - convert remaining c++-comments to plain c-style Signed-off-by: Wolfram Sang Acked-by: Guillaume LECERF Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse