Patchwork [MTD] CHIPS: buffer size adjustment for M29EW Numonyx devices

login
register
mail settings
Submitter massimo cirillo
Date Aug. 28, 2009, 8:05 a.m.
Message ID <62cbdcd90908280105w73941da1p211b1b9248bbd275@mail.gmail.com>
Download mbox | patch
Permalink /patch/32349/
State New
Headers show

Comments

massimo cirillo - Aug. 28, 2009, 8:05 a.m.
From: Massimo Cirillo <maxcir@gmail.com>

Please, consider this new version of the patch, that leaves unchanged
the cfi->id value for AMD devices.

Signed-off-by: Massimo Cirillo <maxcir@gmail.com>
---
--



2009/8/27 massimo cirillo <maxcir@gmail.com>:
> From: Massimo Cirillo <maxcir@gmail.com>
>
> The buffer size fot M29EW Numonyx flash devices used in 8bit configuration
> is 256 bytes sized, while the CFI contains a wrong value (1024 bytes).
> The following patch fixes this hardware bug.
> The following patch applies to 2.6.30 kernel.
>
> Signed-off-by: Massimo Cirillo <maxcir@gmail.com>
> ---
> diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
> old mode 100644
> new mode 100755
> index e63e674..1281920
> --- a/drivers/mtd/chips/cfi_probe.c
> +++ b/drivers/mtd/chips/cfi_probe.c
> @@ -158,6 +158,9 @@ static int __xipram cfi_chip_setup(struct map_info *map,
>        __u32 base = 0;
>        int num_erase_regions = cfi_read_query(map, base + (0x10 + 28)*ofs_factor);
>        int i;
> +       int extendedId1 = 0;
> +       int extendedId2 = 0;
> +       int extendedId3 = 0;
>
>        xip_enable(base, map, cfi);
>  #ifdef DEBUG_CFI
> @@ -196,23 +199,39 @@ static int __xipram cfi_chip_setup(struct map_info *map,
>        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 |
> +       if ((cfi->mfr == CFI_MFR_NMX || cfi->mfr == CFI_MFR_ST ||
> +               cfi->mfr == CFI_MFR_AMD) && ((cfi->id & 0xff) == 0x7e)
> +               && (le16_to_cpu(cfi->cfiq->P_ID) == 0x0002)) {
> +               extendedId1 = cfi_read_query16(map, base + 0x1 * ofs_factor);
> +               extendedId2 = cfi_read_query16(map, base + 0xe * ofs_factor);
> +               extendedId3 = cfi_read_query16(map, base + 0xf * ofs_factor);
> +               /* compatibility with previous versions */
> +               cfi->id = cfi_read_query(map, base + 0xe * ofs_factor) << 8 |
>                          cfi_read_query(map, base + 0xf * ofs_factor);
> +       }
>
>        /* Put it back into Read Mode */
>        cfi_qry_mode_off(base, map, cfi);
>        xip_allowed(base, map);
> -
> -       /* Do any necessary byteswapping */
> +
> +       /* Do any necessary byteswapping */
>        cfi->cfiq->P_ID = le16_to_cpu(cfi->cfiq->P_ID);
> -
>        cfi->cfiq->P_ADR = le16_to_cpu(cfi->cfiq->P_ADR);
>        cfi->cfiq->A_ID = le16_to_cpu(cfi->cfiq->A_ID);
>        cfi->cfiq->A_ADR = le16_to_cpu(cfi->cfiq->A_ADR);
>        cfi->cfiq->InterfaceDesc = le16_to_cpu(cfi->cfiq->InterfaceDesc);
>        cfi->cfiq->MaxBufWriteSize = le16_to_cpu(cfi->cfiq->MaxBufWriteSize);
>
> +       /* If the device is a M29EW used in 8-bit mode, adjust buffer size */
> +       if ((cfi->cfiq->MaxBufWriteSize > 0x8) && (cfi->mfr == CFI_MFR_NMX ||
> +               cfi->mfr == CFI_MFR_ST) && (extendedId1 == 0x7E) &&
> +               (extendedId2 == 0x22 || extendedId2 == 0x23 || extendedId2 == 0x28) &&
> +               (extendedId3 == 0x01)) {
> +               cfi->cfiq->MaxBufWriteSize = 0x8;
> +               pr_warning("Adjusted buffer size on Numonyx flash M29EW family");
> +               pr_warning(" in 8 bit mode\n");
> +       }
> +
>  #ifdef DEBUG_CFI
>        /* Dump the information therein */
>        print_cfi_ident(cfi->cfiq);
> @@ -228,6 +247,8 @@ static int __xipram cfi_chip_setup(struct map_info *map,
>  #endif
>        }
>
> +
> +
>        printk(KERN_INFO "%s: Found %d x%d devices at 0x%x in %d-bit bank\n",
>               map->name, cfi->interleave, cfi->device_type*8, base,
>               map->bankwidth*8);
> diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
> old mode 100644
> new mode 100755
> index 88d3d8f..43d6a77
> --- a/include/linux/mtd/cfi.h
> +++ b/include/linux/mtd/cfi.h
> @@ -522,6 +522,7 @@ struct cfi_fixup {
>  #define CFI_MFR_ATMEL 0x001F
>  #define CFI_MFR_SAMSUNG 0x00EC
>  #define CFI_MFR_ST  0x0020     /* STMicroelectronics */
> +#define CFI_MFR_NMX 0x0089 /* Numonyx */
>
>  void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);
>
Artem Bityutskiy - Sept. 1, 2009, 9:03 a.m.
On Fri, 2009-08-28 at 10:05 +0200, massimo cirillo wrote:
> From: Massimo Cirillo <maxcir@gmail.com>
> 
> Please, consider this new version of the patch, that leaves unchanged
> the cfi->id value for AMD devices.
> 
> Signed-off-by: Massimo Cirillo <maxcir@gmail.com>

Please, resend a patch with proper descriptions, without indentation
problems (see int extendedId1) and without adding junk \n lines:

> +
> +

Patch

diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
old mode 100644
new mode 100755
index e63e674..e4c5790
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -158,6 +158,9 @@  static int __xipram cfi_chip_setup(struct map_info *map,
 	__u32 base = 0;
 	int num_erase_regions = cfi_read_query(map, base + (0x10 + 28)*ofs_factor);
 	int i;
+    int extendedId1 = 0;
+    int extendedId2 = 0;
+    int extendedId3 = 0;

 	xip_enable(base, map, cfi);
 #ifdef DEBUG_CFI
@@ -195,6 +198,15 @@  static int __xipram cfi_chip_setup(struct map_info *map,
 	cfi->mfr = cfi_read_query16(map, base);
 	cfi->id = cfi_read_query16(map, base + ofs_factor);

+	/* Get device ID cycle 1,2,3 for Numonyx/ST devices */
+	if ((cfi->mfr == CFI_MFR_NMX || cfi->mfr == CFI_MFR_ST)
+		&& ((cfi->id & 0xff) == 0x7e)
+		&& (le16_to_cpu(cfi->cfiq->P_ID) == 0x0002)) {
+		extendedId1 = cfi_read_query16(map, base + 0x1 * ofs_factor);
+		extendedId2 = cfi_read_query16(map, base + 0xe * ofs_factor);
+		extendedId3 = cfi_read_query16(map, base + 0xf * 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 |
@@ -203,16 +215,25 @@  static int __xipram cfi_chip_setup(struct map_info *map,
 	/* Put it back into Read Mode */
 	cfi_qry_mode_off(base, map, cfi);
 	xip_allowed(base, map);
-
-	/* Do any necessary byteswapping */
+
+	/* Do any necessary byteswapping */
 	cfi->cfiq->P_ID = le16_to_cpu(cfi->cfiq->P_ID);
-
 	cfi->cfiq->P_ADR = le16_to_cpu(cfi->cfiq->P_ADR);
 	cfi->cfiq->A_ID = le16_to_cpu(cfi->cfiq->A_ID);
 	cfi->cfiq->A_ADR = le16_to_cpu(cfi->cfiq->A_ADR);
 	cfi->cfiq->InterfaceDesc = le16_to_cpu(cfi->cfiq->InterfaceDesc);
 	cfi->cfiq->MaxBufWriteSize = le16_to_cpu(cfi->cfiq->MaxBufWriteSize);

+	/* If the device is a M29EW used in 8-bit mode, adjust buffer size */
+	if ((cfi->cfiq->MaxBufWriteSize > 0x8) && (cfi->mfr == CFI_MFR_NMX ||
+		cfi->mfr == CFI_MFR_ST) && (extendedId1 == 0x7E) &&
+		(extendedId2 == 0x22 || extendedId2 == 0x23 || extendedId2 == 0x28) &&
+		(extendedId3 == 0x01)) {
+		cfi->cfiq->MaxBufWriteSize = 0x8;
+		pr_warning("Adjusted buffer size on Numonyx flash M29EW family");
+		pr_warning("in 8 bit mode\n");
+    }
+
 #ifdef DEBUG_CFI
 	/* Dump the information therein */
 	print_cfi_ident(cfi->cfiq);
@@ -228,6 +249,8 @@  static int __xipram cfi_chip_setup(struct map_info *map,
 #endif
 	}

+
+
 	printk(KERN_INFO "%s: Found %d x%d devices at 0x%x in %d-bit bank\n",
 	       map->name, cfi->interleave, cfi->device_type*8, base,
 	       map->bankwidth*8);
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
old mode 100644
new mode 100755
index 88d3d8f..43d6a77
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -522,6 +522,7 @@  struct cfi_fixup {
 #define CFI_MFR_ATMEL 0x001F
 #define CFI_MFR_SAMSUNG 0x00EC
 #define CFI_MFR_ST  0x0020 	/* STMicroelectronics */
+#define CFI_MFR_NMX 0x0089 /* Numonyx */

 void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);