* [PATCH 2/6] mtd: cfi_cmdset_0002: rename MANUFACTURER_* definitions to CFI_MFR_* and move them to cfi.h with similar definitions
2010-02-20 12:57 [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions Guillaume LECERF
@ 2010-02-20 12:57 ` Guillaume LECERF
2010-02-20 12:57 ` [PATCH 3/6] mtd: cfi_probe: enable Auto Select Mode for SST39VF160x/39VF320x chips Guillaume LECERF
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Guillaume LECERF @ 2010-02-20 12:57 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-mtd
Rename MANUFACTURER_MACRONIX and MANUFACTURER_SST definitions to CFI_MFR_{MACRONIX,SST} and
move them to include/linux/mtd/cfi.h, with similar definitions.
Signed-off-by: Guillaume Lecerf <glecerf@gmail.com>
---
drivers/mtd/chips/cfi_cmdset_0002.c | 12 +++++-------
include/linux/mtd/cfi.h | 12 +++++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 1fe27ea..3df6056 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -43,8 +43,6 @@
#define MAX_WORD_RETRIES 3
-#define MANUFACTURER_MACRONIX 0x00C2
-#define MANUFACTURER_SST 0x00BF
#define SST49LF004B 0x0060
#define SST49LF040B 0x0050
#define SST49LF008A 0x005a
@@ -166,7 +164,7 @@ static void fixup_amd_bootblock(struct mtd_info *mtd, void* param)
* This reduces the risk of false detection due to
* the 8-bit device ID.
*/
- (cfi->mfr == MANUFACTURER_MACRONIX)) {
+ (cfi->mfr == CFI_MFR_MACRONIX)) {
DEBUG(MTD_DEBUG_LEVEL1,
"%s: Macronix MX29LV400C with bottom boot block"
" detected\n", map->name);
@@ -284,7 +282,7 @@ static struct cfi_fixup cfi_fixup_table[] = {
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
#ifdef AMD_BOOTLOC_BUG
{ CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },
- { MANUFACTURER_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock, NULL },
+ { CFI_MFR_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock, NULL },
#endif
{ CFI_MFR_AMD, 0x0050, fixup_use_secsi, NULL, },
{ CFI_MFR_AMD, 0x0053, fixup_use_secsi, NULL, },
@@ -302,9 +300,9 @@ static struct cfi_fixup cfi_fixup_table[] = {
{ 0, 0, NULL, NULL }
};
static struct cfi_fixup jedec_fixup_table[] = {
- { MANUFACTURER_SST, SST49LF004B, fixup_use_fwh_lock, NULL, },
- { MANUFACTURER_SST, SST49LF040B, fixup_use_fwh_lock, NULL, },
- { MANUFACTURER_SST, SST49LF008A, fixup_use_fwh_lock, NULL, },
+ { CFI_MFR_SST, SST49LF004B, fixup_use_fwh_lock, NULL, },
+ { CFI_MFR_SST, SST49LF040B, fixup_use_fwh_lock, NULL, },
+ { CFI_MFR_SST, SST49LF008A, fixup_use_fwh_lock, NULL, },
{ 0, 0, NULL, NULL }
};
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index df89f42..6cb3e7b 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -518,11 +518,13 @@ struct cfi_fixup {
#define CFI_MFR_ANY 0xffff
#define CFI_ID_ANY 0xffff
-#define CFI_MFR_AMD 0x0001
-#define CFI_MFR_INTEL 0x0089
-#define CFI_MFR_ATMEL 0x001F
-#define CFI_MFR_SAMSUNG 0x00EC
-#define CFI_MFR_ST 0x0020 /* STMicroelectronics */
+#define CFI_MFR_AMD 0x0001
+#define CFI_MFR_ATMEL 0x001F
+#define CFI_MFR_INTEL 0x0089
+#define CFI_MFR_MACRONIX 0x00C2
+#define CFI_MFR_SAMSUNG 0x00EC
+#define CFI_MFR_SST 0x00BF
+#define CFI_MFR_ST 0x0020 /* STMicroelectronics */
void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/6] mtd: cfi_probe: enable Auto Select Mode for SST39VF160x/39VF320x chips
2010-02-20 12:57 [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions Guillaume LECERF
2010-02-20 12:57 ` [PATCH 2/6] mtd: cfi_cmdset_0002: rename MANUFACTURER_* definitions to CFI_MFR_* and move them to cfi.h with similar definitions Guillaume LECERF
@ 2010-02-20 12:57 ` Guillaume LECERF
2010-02-20 12:58 ` [PATCH 4/6] mtd: cfi_probe: add support for SST 0x0701 vendorname Guillaume LECERF
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Guillaume LECERF @ 2010-02-20 12:57 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-mtd
SST 39VF160x/39VF320x chips differ from the CFI specifications, they need
the 0xAA / 0x55 / 0x90 sequence to be sent to 0x5555 / 0x2AAA / 0x5555 to
enter Auto Select Mode.
Trying this sequence and testing for (cfi->mfr != CFI_MFR_SST) then fallback
to the standard sequence seems to work and to add no regressions.
Signed-off-by: Guillaume Lecerf <glecerf@gmail.com>
---
drivers/mtd/chips/cfi_probe.c | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
index e63e674..05207f7 100644
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -189,12 +189,31 @@ static int __xipram cfi_chip_setup(struct map_info *map,
* back into Read Mode, which is a nop in this case).
*/
cfi_send_gen_cmd(0xf0, 0, base, map, cfi, cfi->device_type, NULL);
- cfi_send_gen_cmd(0xaa, 0x555, base, map, cfi, cfi->device_type, NULL);
- cfi_send_gen_cmd(0x55, 0x2aa, base, map, cfi, cfi->device_type, NULL);
- cfi_send_gen_cmd(0x90, 0x555, base, map, cfi, cfi->device_type, NULL);
+
+ /* SST 39VF160x/39VF320x chips differ from the CFI specifications, they need
+ * the 0xAA / 0x55 / 0x90 sequence to be sent to 0x5555 / 0x2AAA / 0x5555 to
+ * enter Auto Select Mode.
+ * Trying this sequence and testing for (cfi->mfr != CFI_MFR_SST) then fallback
+ * to the standard sequence seems to work and to add no regressions.
+ */
+ cfi_send_gen_cmd(0xAA, 0x5555, base, map, cfi, cfi->device_type, NULL);
+ cfi_send_gen_cmd(0x55, 0x2AAA, base, map, cfi, cfi->device_type, NULL);
+ cfi_send_gen_cmd(0x90, 0x5555, base, map, cfi, cfi->device_type, NULL);
+
cfi->mfr = cfi_read_query16(map, base);
cfi->id = cfi_read_query16(map, base + ofs_factor);
+ if(cfi->mfr != CFI_MFR_SST) {
+ cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
+
+ cfi_send_gen_cmd(0xaa, 0x555, base, map, cfi, cfi->device_type, NULL);
+ cfi_send_gen_cmd(0x55, 0x2aa, base, map, cfi, cfi->device_type, NULL);
+ cfi_send_gen_cmd(0x90, 0x555, base, map, cfi, cfi->device_type, NULL);
+
+ cfi->mfr = cfi_read_query16(map, base);
+ cfi->id = cfi_read_query16(map, base + ofs_factor);
+ }
+
/* Get AMD/Spansion extended JEDEC ID */
if (cfi->mfr == CFI_MFR_AMD && (cfi->id & 0xff) == 0x7e)
cfi->id = cfi_read_query(map, base + 0xe * ofs_factor) << 8 |
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/6] mtd: cfi_probe: add support for SST 0x0701 vendorname
2010-02-20 12:57 [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions Guillaume LECERF
2010-02-20 12:57 ` [PATCH 2/6] mtd: cfi_cmdset_0002: rename MANUFACTURER_* definitions to CFI_MFR_* and move them to cfi.h with similar definitions Guillaume LECERF
2010-02-20 12:57 ` [PATCH 3/6] mtd: cfi_probe: enable Auto Select Mode for SST39VF160x/39VF320x chips Guillaume LECERF
@ 2010-02-20 12:58 ` Guillaume LECERF
2010-02-20 12:58 ` [PATCH 5/6] mtd: cfi_probe: use P_ID_* definitions instead of hardcoded values Guillaume LECERF
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Guillaume LECERF @ 2010-02-20 12:58 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-mtd
SST 39VF160x and 39VF320x chips use vendorname id 0x0701. Add support for them
in cfi_probe.c.
Signed-off-by: Guillaume Lecerf <glecerf@gmail.com>
---
drivers/mtd/chips/cfi_probe.c | 3 +++
include/linux/mtd/cfi.h | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
index 05207f7..9015b86 100644
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -288,6 +288,9 @@ static char *vendorname(__u16 vendor)
case P_ID_SST_PAGE:
return "SST Page Write";
+ case P_ID_SST_OLD:
+ return "SST 39VF160x/39VF320x";
+
case P_ID_INTEL_PERFORMANCE:
return "Intel Performance Code";
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 6cb3e7b..70de0d7 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -253,6 +253,7 @@ struct cfi_bri_query {
#define P_ID_MITSUBISHI_STD 0x0100
#define P_ID_MITSUBISHI_EXT 0x0101
#define P_ID_SST_PAGE 0x0102
+#define P_ID_SST_OLD 0x0701
#define P_ID_INTEL_PERFORMANCE 0x0200
#define P_ID_INTEL_DATA 0x0210
#define P_ID_RESERVED 0xffff
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/6] mtd: cfi_probe: use P_ID_* definitions instead of hardcoded values
2010-02-20 12:57 [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions Guillaume LECERF
` (2 preceding siblings ...)
2010-02-20 12:58 ` [PATCH 4/6] mtd: cfi_probe: add support for SST 0x0701 vendorname Guillaume LECERF
@ 2010-02-20 12:58 ` Guillaume LECERF
2010-02-20 12:58 ` [PATCH 6/6] mtd: cfi_cmdset_0002: add CFI detection for SST 39VF3201 chips Guillaume LECERF
2010-03-30 13:03 ` [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions Artem Bityutskiy
5 siblings, 0 replies; 7+ messages in thread
From: Guillaume LECERF @ 2010-02-20 12:58 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-mtd
Use P_ID_* definitions already in include/linux/mtd/cfi.h instead of the
hardcoded values. Make the code more readable.
Signed-off-by: Guillaume Lecerf <glecerf@gmail.com>
---
drivers/mtd/chips/gen_probe.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index e2dc964..991c457 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -242,17 +242,17 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)
/* We need these for the !CONFIG_MODULES case,
because symbol_get() doesn't work there */
#ifdef CONFIG_MTD_CFI_INTELEXT
- case 0x0001:
- case 0x0003:
- case 0x0200:
+ case P_ID_INTEL_EXT:
+ case P_ID_INTEL_STD:
+ case P_ID_INTEL_PERFORMANCE:
return cfi_cmdset_0001(map, primary);
#endif
#ifdef CONFIG_MTD_CFI_AMDSTD
- case 0x0002:
+ case P_ID_AMD_STD:
return cfi_cmdset_0002(map, primary);
#endif
#ifdef CONFIG_MTD_CFI_STAA
- case 0x0020:
+ case P_ID_ST_ADV:
return cfi_cmdset_0020(map, primary);
#endif
default:
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 6/6] mtd: cfi_cmdset_0002: add CFI detection for SST 39VF3201 chips
2010-02-20 12:57 [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions Guillaume LECERF
` (3 preceding siblings ...)
2010-02-20 12:58 ` [PATCH 5/6] mtd: cfi_probe: use P_ID_* definitions instead of hardcoded values Guillaume LECERF
@ 2010-02-20 12:58 ` Guillaume LECERF
2010-03-30 13:03 ` [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions Artem Bityutskiy
5 siblings, 0 replies; 7+ messages in thread
From: Guillaume LECERF @ 2010-02-20 12:58 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-mtd
SST 39VF0201 chips use the 0x0701 command set, fully compatible with the AMD one.
This patch adds support for detecting them in CFI mode.
Signed-off-by: Guillaume Lecerf <glecerf@gmail.com>
---
drivers/mtd/chips/cfi_cmdset_0002.c | 24 ++++++++++++++++++++++++
drivers/mtd/chips/gen_probe.c | 1 +
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 3df6056..ad5271b 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -43,6 +43,7 @@
#define MAX_WORD_RETRIES 3
+#define SST39VF3201 0x235b
#define SST49LF004B 0x0060
#define SST49LF040B 0x0050
#define SST49LF008A 0x005a
@@ -246,6 +247,19 @@ static void fixup_use_erase_chip(struct mtd_info *mtd, void *param)
}
/*
+ * SST 32VF3201 chips report 2 erase zones while they actually
+ * only have 1. Patch this on the fly.
+ */
+static void fixup_sst39vf3201_erase_zones(struct mtd_info *mtd, void *param)
+{
+ struct map_info *map = mtd->priv;
+ struct cfi_private *cfi = map->fldrv_priv;
+
+ cfi->cfiq->NumEraseRegions = 1;
+ pr_warning("%s: Bad SST39VF3201 CFI data, adjust from 2 to 1 erase region\n", mtd->name);
+}
+
+/*
* Some Atmel chips (e.g. the AT49BV6416) power-up with all sectors
* locked by default.
*/
@@ -303,6 +317,7 @@ static struct cfi_fixup jedec_fixup_table[] = {
{ CFI_MFR_SST, SST49LF004B, fixup_use_fwh_lock, NULL, },
{ CFI_MFR_SST, SST49LF040B, fixup_use_fwh_lock, NULL, },
{ CFI_MFR_SST, SST49LF008A, fixup_use_fwh_lock, NULL, },
+ { CFI_MFR_SST, SST39VF3201, fixup_sst39vf3201_erase_zones, NULL },
{ 0, 0, NULL, NULL }
};
@@ -352,6 +367,14 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
mtd->writesize = 1;
if (cfi->cfi_mode==CFI_MODE_CFI){
+ /*
+ * SST 39VF3201 chips do not have a real PRI.
+ */
+ if (cfi->mfr == CFI_MFR_SST && cfi->id == SST39VF3201) {
+ cfi->addr_unlock1 = 0x5555;
+ cfi->addr_unlock2 = 0x2AAA;
+ }
+ else {
unsigned char bootloc;
/*
* It's a real CFI chip, not one for which the probe
@@ -412,6 +435,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
/* Set the default CFI lock/unlock addresses */
cfi->addr_unlock1 = 0x555;
cfi->addr_unlock2 = 0x2aa;
+ }
} /* CFI mode */
else if (cfi->cfi_mode == CFI_MODE_JEDEC) {
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index 991c457..599c259 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -249,6 +249,7 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)
#endif
#ifdef CONFIG_MTD_CFI_AMDSTD
case P_ID_AMD_STD:
+ case P_ID_SST_OLD:
return cfi_cmdset_0002(map, primary);
#endif
#ifdef CONFIG_MTD_CFI_STAA
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions
2010-02-20 12:57 [PATCH 1/6] mtd: cfi_cmdset_0002: remove unused MANUFACTURER_{AMD, ATMEL} definitions Guillaume LECERF
` (4 preceding siblings ...)
2010-02-20 12:58 ` [PATCH 6/6] mtd: cfi_cmdset_0002: add CFI detection for SST 39VF3201 chips Guillaume LECERF
@ 2010-03-30 13:03 ` Artem Bityutskiy
5 siblings, 0 replies; 7+ messages in thread
From: Artem Bityutskiy @ 2010-03-30 13:03 UTC (permalink / raw)
To: Guillaume LECERF; +Cc: linux-mtd, David Woodhouse
On Sat, 2010-02-20 at 13:57 +0100, Guillaume LECERF wrote:
> Remove MANUFACTURER_AMD and MANUFACTURER_ATMEL definition from
> cfi_cmdset_0002.c as it is unused and a deplicate of CFI_MFR_{AMD,ATMEL}
> already in include/linux/mtd/cfi.h.
>
> Signed-off-by: Guillaume Lecerf <glecerf@gmail.com>
> ---
> drivers/mtd/chips/cfi_cmdset_0002.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
> index f3600e8..1fe27ea 100644
> --- a/drivers/mtd/chips/cfi_cmdset_0002.c
> +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
> @@ -43,8 +43,6 @@
>
> #define MAX_WORD_RETRIES 3
>
> -#define MANUFACTURER_AMD 0x0001
> -#define MANUFACTURER_ATMEL 0x001F
> #define MANUFACTURER_MACRONIX 0x00C2
> #define MANUFACTURER_SST 0x00BF
> #define SST49LF004B 0x0060
This patch series does not apply to the current mtd-2.6.git. Please,
take a look and re-send it.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
^ permalink raw reply [flat|nested] 7+ messages in thread