Skip to contentSkip to conversation

CFI: synchronize command offsets with Linux CFI driver

PATCH New Bartlomiej Sieka 3 participants 5 messages Dec 11, 2007 – Dec 21, 2007 Memory technology devices (MTD)

lore
Share & tools
lore

Bartlomiej Sieka

author
#0 lore raw

PATCH 1/1 CFI: synchronize command offsets with Linux CFI driver

Fixes non-working CFI Flash on the Inka4x0 board.

Signed-off-by Bartlomiej Sieka <[email protected]>

---
This patch differs from what is being done by the Linux CFI driver in that it uses 0x05 as the interface code for x16/x32 chips, per "Common Flash Memory Interface Publication 100" dated December 1.

Tested on the following Flash chips:
x8 (interface 0x00) in 8 bit mode
x8/x16 (interface 0x02) in 8 bit mode
x8/x16 (interface 0x02) in 16 bit mode

The patch should be applied on top of commit 81b20ccc2d795ae9a1199db5a50ad9c28d1e4d22 in the u-boot-cfi-flash repo.

drivers/mtd/cfi_flash.c +20 -3
index 66754cd..b748a9f 100644
@@ -1231,9 +1231,26 @@ static int flash_detect_cfi (flash_info_t * info)
 					debug ("port %d bits chip %d bits\n",
 						info->portwidth << CFI_FLASH_SHIFT_WIDTH,
 						info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
-					/* this probably only works if info->interface == FLASH_CFI_X8X16 */
-					info->addr_unlock1 = (info->portwidth == FLASH_CFI_8BIT) ? 0xAAA : 0x555;
-					info->addr_unlock2 = (info->portwidth == FLASH_CFI_8BIT) ? 0x555 : 0x2AA;
+
+					/* calculate command offsets as in the Linux driver */
+					info->addr_unlock1 = 0x555;
+					info->addr_unlock2 = 0x2aa;
+
+					/*
+					 * modify the unlock address if we are
+					 * in compatibility mode
+					 */
+					if (	/* x8/x16 in x8 mode */
+						((info->chipwidth == FLASH_CFI_BY8) &&
+							(info->interface == FLASH_CFI_X8X16)) ||
+						/* x16/x32 in x16 mode */
+						((info->chipwidth == FLASH_CFI_BY16) &&
+							(info->interface == FLASH_CFI_X16X32)))
+					{
+						info->addr_unlock1 = 0xaaa;
+						info->addr_unlock2 = 0x555;
+					}
+ 
 					info->name = "CFI conformant";
 					return 1;
 				}
include/flash.h +1 -0
index 6e252cc..2ed1e20 100644
@@ -80,6 +80,7 @@ typedef struct {
 #define FLASH_CFI_X8		0x00
 #define FLASH_CFI_X16		0x01
 #define FLASH_CFI_X8X16		0x02
+#define FLASH_CFI_X16X32	0x05
 
 /* convert between bit value and numeric value */
 #define CFI_FLASH_SHIFT_WIDTH	3
#1 lore raw

PATCH 1/1 CFI: synchronize command offsets with Linux CFI driver

Quoted 37 lines · Bartlomiej Sieka

Fixes non-working CFI Flash on the Inka4x0 board.

Signed-off-by Bartlomiej Sieka <[email protected]>

---
This patch differs from what is being done by the Linux CFI driver in that it uses 0x05 as the interface code for x16/x32 chips, per "Common Flash Memory Interface Publication 100" dated December 1.

Tested on the following Flash chips:
x8 (interface 0x00) in 8 bit mode
x8/x16 (interface 0x02) in 8 bit mode
x8/x16 (interface 0x02) in 16 bit mode

The patch should be applied on top of commit 81b20ccc2d795ae9a1199db5a50ad9c28d1e4d22 in the u-boot-cfi-flash repo.

drivers/mtd/cfi_flash.c +0 -2
index 66754cd..b748a9f 100644
@@ -1231,9 +1231,26 @@ static int flash_detect_cfi (flash_info_t * info)
 					debug ("port %d bits chip %d bits\n",
 						info->portwidth << CFI_FLASH_SHIFT_WIDTH,
 						info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
-					/* this probably only works if info->interface == FLASH_CFI_X8X16 */
-					info->addr_unlock1 = (info->portwidth == FLASH_CFI_8BIT) ? 0xAAA :

0x555; - info->addr_unlock2 = (info->portwidth == FLASH_CFI_8BIT) ?
0x555 : 0x2AA; +

drivers/mtd/cfi_flash.c +9 -0
+					/* calculate command offsets as in the Linux driver */
+					info->addr_unlock1 = 0x555;
+					info->addr_unlock2 = 0x2aa;
+
+					/*
+					 * modify the unlock address if we are
+					 * in compatibility mode
+					 */
+					if (	/* x8/x16 in x8 mode */

drivers/mtd/cfi_flash.c static int flash_detect_cfi (flash_info_t * info) · line 1253

Quoted 10 lines
drivers/mtd/cfi_flash.c +10 -0
+						((info->chipwidth == FLASH_CFI_BY8) &&
+							(info->interface == FLASH_CFI_X8X16)) ||
+						/* x16/x32 in x16 mode */
+						((info->chipwidth == FLASH_CFI_BY16) &&
+							(info->interface == FLASH_CFI_X16X32)))
+					{
+						info->addr_unlock1 = 0xaaa;
+						info->addr_unlock2 = 0x555;
+					}
+

Why not like this:

					if (((info->chipwidth == FLASH_CFI_BY8) &&
					     (info->interface == FLASH_CFI_X8X16)) ||
					    ((info->chipwidth == FLASH_CFI_BY16) &&
					     (info->interface == FLASH_CFI_X16X32))) {
						/*
						 * Compatibility mode:
						 * x8/x16 in x8 mode or
						 * x16/x32 in x16 mode
						 */
						info->addr_unlock1 = 0xaaa;
						info->addr_unlock2 = 0x555;
					} else {
						/* default */
						info->addr_unlock1 = 0x555;
						info->addr_unlock2 = 0x2aa;
					}

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

author
#2 lore raw

PATCH 1/1 CFI: synchronize command offsets with Linux CFI driver

Stefan Roese wrote:
[...]

Quoted 34 lines
Quoted 21 lines
drivers/mtd/cfi_flash.c +0 -2
index 66754cd..b748a9f 100644
@@ -1231,9 +1231,26 @@ static int flash_detect_cfi (flash_info_t * info)
 					debug ("port %d bits chip %d bits\n",
 						info->portwidth << CFI_FLASH_SHIFT_WIDTH,
 						info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
-					/* this probably only works if info->interface == FLASH_CFI_X8X16 */
-					info->addr_unlock1 = (info->portwidth == FLASH_CFI_8BIT) ? 0xAAA :

0x555; - info->addr_unlock2 = (info->portwidth == FLASH_CFI_8BIT) ?
0x555 : 0x2AA; +

drivers/mtd/cfi_flash.c +9 -0
+					/* calculate command offsets as in the Linux driver */
+					info->addr_unlock1 = 0x555;
+					info->addr_unlock2 = 0x2aa;
+
+					/*
+					 * modify the unlock address if we are
+					 * in compatibility mode
+					 */
+					if (	/* x8/x16 in x8 mode */

drivers/mtd/cfi_flash.c static int flash_detect_cfi (flash_info_t * info) · line 1253

Quoted 10 lines
drivers/mtd/cfi_flash.c +10 -0
+						((info->chipwidth == FLASH_CFI_BY8) &&
+							(info->interface == FLASH_CFI_X8X16)) ||
+						/* x16/x32 in x16 mode */
+						((info->chipwidth == FLASH_CFI_BY16) &&
+							(info->interface == FLASH_CFI_X16X32)))
+					{
+						info->addr_unlock1 = 0xaaa;
+						info->addr_unlock2 = 0x555;
+					}
+

Why not like this:

Quoted 16 lines
					if (((info->chipwidth == FLASH_CFI_BY8) &&
					     (info->interface == FLASH_CFI_X8X16)) ||
					    ((info->chipwidth == FLASH_CFI_BY16) &&
					     (info->interface == FLASH_CFI_X16X32))) {
						/*
						 * Compatibility mode:
						 * x8/x16 in x8 mode or
						 * x16/x32 in x16 mode
						 */
						info->addr_unlock1 = 0xaaa;
						info->addr_unlock2 = 0x555;
					} else {
						/* default */
						info->addr_unlock1 = 0x555;
						info->addr_unlock2 = 0x2aa;
					}

I copied the code from Linux CFI driver and kept it as is (modulo #define names). I'm fine with either of the two forms, although I think that there is some benefit in keeping borrowed code as intact as possible.

Regards,
Bartlomiej

#3 lore raw

PATCH 1/1 CFI: synchronize command offsets with Linux CFI driver

Quoted 19 lines · Bartlomiej Sieka
Quoted 18 lines

Why not like this:

					if (((info->chipwidth == FLASH_CFI_BY8) &&
					     (info->interface == FLASH_CFI_X8X16)) ||
					    ((info->chipwidth == FLASH_CFI_BY16) &&
					     (info->interface == FLASH_CFI_X16X32))) {
						/*
						 * Compatibility mode:
						 * x8/x16 in x8 mode or
						 * x16/x32 in x16 mode
						 */
						info->addr_unlock1 = 0xaaa;
						info->addr_unlock2 = 0x555;
					} else {
						/* default */
						info->addr_unlock1 = 0x555;
						info->addr_unlock2 = 0x2aa;
					}
Quoted 2 lines

I copied the code from Linux CFI driver and kept it as is (modulo #define names).

Ahh, I see. Even this ugly "{" in the next line is present in the Linux code.

Quoted 2 lines

I'm fine with either of the two forms, although I think
that there is some benefit in keeping borrowed code as intact as possible.

Right. So if nobody else protests here, I'll add your original version to the cfi repo soon.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

#4 lore raw

PATCH 1/1 CFI: synchronize command offsets with Linux CFI driver

In reply to Bartlomiej Sieka

Hi,

I have a little problem while detecting the manufacturer and device IDs
on a Spansion/AMD S29GL256N. It's a x8/x16 flash and set to run in x8 mode. When u-boot is trying to do the unlock sequence and retrieve the manufacturer and device IDs, since info->portwidth is still 2, it's writing to addrs 0x1554, 0xAAA, 0x1554 instead of addrs 0xaaa, 0x555, 0xaaa. I modified the code to temporary set info->portwidth to 1 before doing the unlock seq and retrieving the manufacturer & device IDs and then restore it back, then the ID retrievals work. Does anyone see the same problem as I do?

Thanks
Donald

Quoted 80 lines · Bartlomiej Sieka

Fixes non-working CFI Flash on the Inka4x0 board.

Signed-off-by Bartlomiej Sieka <[email protected]>

---
This patch differs from what is being done by the Linux CFI driver in that it
uses 0x05 as the interface code for x16/x32 chips, per "Common Flash Memory
Interface Publication 100" dated December 1.

Tested on the following Flash chips:
x8 (interface 0x00) in 8 bit mode
x8/x16 (interface 0x02) in 8 bit mode x8/x16 (interface 0x02) in 16 bit mode

The patch should be applied on top of commit 81b20ccc2d795ae9a1199db5a50ad9c28d1e4d22 in the u-boot-cfi-flash repo.

drivers/mtd/cfi_flash.c +20 -3
index 66754cd..b748a9f 100644
@@ -1231,9 +1231,26 @@ static int flash_detect_cfi (flash_info_t * info)
 					debug ("port %d bits chip %d bits\n",
 						info->portwidth << CFI_FLASH_SHIFT_WIDTH,
 						info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
-					/* this probably only works if info->interface == FLASH_CFI_X8X16 */
-					info->addr_unlock1 = (info->portwidth == FLASH_CFI_8BIT) ? 0xAAA :
 0x555;
-					info->addr_unlock2 = (info->portwidth == FLASH_CFI_8BIT) ? 0x555 :
 0x2AA;
+
+					/* calculate command offsets as in the Linux driver */
+					info->addr_unlock1 = 0x555;
+					info->addr_unlock2 = 0x2aa;
+
+					/*
+					 * modify the unlock address if we are
+					 * in compatibility mode
+					 */
+					if (	/* x8/x16 in x8 mode */
+						((info->chipwidth == FLASH_CFI_BY8) &&
+							(info->interface == FLASH_CFI_X8X16)) ||
+						/* x16/x32 in x16 mode */
+						((info->chipwidth == FLASH_CFI_BY16) &&
+							(info->interface == FLASH_CFI_X16X32)))
+					{
+						info->addr_unlock1 = 0xaaa;
+						info->addr_unlock2 = 0x555;
+					}
+ 
 					info->name = "CFI conformant";
drivers/mtd/cfi_flash.c +0 -0
 					return 1;
 				}
include/flash.h +1 -1
index 6e252cc..2ed1e20 100644
@@ -80,6 +80,7 @@ typedef struct {
 #define FLASH_CFI_X8		0x00
 #define FLASH_CFI_X16		0x01
 #define FLASH_CFI_X8X16		0x02
+#define FLASH_CFI_X16X32	0x05
 
 /* convert between bit value and numeric value */
 #define CFI_FLASH_SHIFT_WIDTH	3
 
-------------------------------------------------------------------------

SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users

Signature · 2 lines
View this message in context: http://www.nabble.com/-PATCH--CFI%3A-synchronize-command-offsets-with-Linux-CFI-driver-tp14273476p14451676.html
Sent from the Uboot - Users mailing list archive at Nabble.com.