mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs

PATCH New Holger Brunck 2 participants 5 messages Aug 8, 2012 – Aug 13, 2012 Memory technology devices (MTD)

lore

Share & tools

lore

Holger Brunck

author

2012-08-08 14:52 UTC #0 lore raw

PATCH 1/1 mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs

commit 54652991
Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips

fixes a problem for Numonyx P33/P30 flashes for 256-Mbit, but this leads to problems for smaller versions of this chip e.g. the 32Mbit version with deviceid 0x16 on mgcoge. So move the code for this work around to an own function and check previously manufacturer id and device id to not break support for other flashes where this work around is not needed.

Signed-off-by Holger Brunck <[email protected]>

Signed-off-by Heiko Schocher <[email protected]>

cc Stefan Roese <[email protected]>

cc Philippe De Muyter <[email protected]>

cc Gerlando Falauto <[email protected]>

---
 drivers/mtd/cfi_flash.c |   70 +++++++++++++++++++++++++++++++---------------
 1 files changed, 47 insertions(+), 23 deletions(-)

drivers/mtd/cfi_flash.c +47 ~~-23~~

index 35294bc..690748d 100644
@@ -1391,6 +1391,43 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
  */
 #ifdef CONFIG_SYS_FLASH_PROTECTION
 
+#define INTEL_COMPAT		0x89
+#define DEV_ID_NUMONYX_256MBIT	0x8922
+
+static int cfi_protect_bugfix(flash_info_t *info, long sector, int prot)
+{
+	if ((info->manufacturer_id == INTEL_COMPAT) &&
+		(info->device_id == DEV_ID_NUMONYX_256MBIT)) {
+		/*
+		 * see errata called
+		 * "Numonyx Axcell P33/P30 Specification Update" :)
+		 */
+		flash_write_cmd(info, sector, 0, FLASH_CMD_READ_ID);
+		if (!flash_isequal(info, sector, FLASH_OFFSET_PROTECT,
+				   prot)) {
+			/*
+			 * cmd must come before FLASH_CMD_PROTECT + 20us
+			 * Disable interrupts which might cause a timeout here.
+			 */
+			int flag = disable_interrupts();
+			unsigned short cmd;
+
+			if (prot)
+				cmd = FLASH_CMD_PROTECT_SET;
+			else
+				cmd = FLASH_CMD_PROTECT_CLEAR;
+				flash_write_cmd(info, sector, 0,
+					  FLASH_CMD_PROTECT);
+			flash_write_cmd(info, sector, 0, cmd);
+			/* re-enable interrupts if necessary */
+			if (flag)
+				enable_interrupts();
+		}
+		return 1;
+	}
+	return 0;
+}
+
 int flash_real_protect (flash_info_t * info, long sector, int prot)
 {
 	int retcode = 0;

@@ -1399,31 +1436,18 @@ int flash_real_protect (flash_info_t * info, long sector, int prot)
 		case CFI_CMDSET_INTEL_PROG_REGIONS:
 		case CFI_CMDSET_INTEL_STANDARD:
 		case CFI_CMDSET_INTEL_EXTENDED:
-			/*
-			 * see errata called
-			 * "Numonyx Axcell P33/P30 Specification Update" :)
-			 */
-			flash_write_cmd (info, sector, 0, FLASH_CMD_READ_ID);
-			if (!flash_isequal (info, sector, FLASH_OFFSET_PROTECT,
-					    prot)) {
-				/*
-				 * cmd must come before FLASH_CMD_PROTECT + 20us
-				 * Disable interrupts which might cause a timeout here.
-				 */
-				int flag = disable_interrupts ();
-				unsigned short cmd;
-
+			if (!cfi_protect_bugfix(info, sector, prot)) {
+				flash_write_cmd(info, sector, 0,
+					 FLASH_CMD_CLEAR_STATUS);
+				flash_write_cmd(info, sector, 0,
+					FLASH_CMD_PROTECT);
 				if (prot)
-					cmd = FLASH_CMD_PROTECT_SET;
+					flash_write_cmd(info, sector, 0,
+						FLASH_CMD_PROTECT_SET);
 				else
-					cmd = FLASH_CMD_PROTECT_CLEAR;
-
-				flash_write_cmd (info, sector, 0,
-						  FLASH_CMD_PROTECT);
-				flash_write_cmd (info, sector, 0, cmd);
-				/* re-enable interrupts if necessary */
-				if (flag)
-					enable_interrupts ();
+					flash_write_cmd(info, sector, 0,
+						FLASH_CMD_PROTECT_CLEAR);
+
 			}
 			break;
 		case CFI_CMDSET_AMD_EXTENDED:

Signature · 1 line

1.7.1

Stefan Roese

2012-08-09 06:09 UTC #1 lore raw

PATCH 1/1 mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs

Hi Holger,

thanks for this patch. I do have a minor comment though below.

Quoted 23 lines · Holger Brunck

commit 54652991
Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips
fixes a problem for Numonyx P33/P30 flashes for 256-Mbit, but this leads to problems for smaller versions of this chip e.g. the 32Mbit version with deviceid 0x16 on mgcoge. So move the code for this work around to an own function and check previously manufacturer id and device id to not break support for other flashes where this work around is not needed.
Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Heiko Schocher <[email protected]>
cc Stefan Roese <[email protected]>
cc Philippe De Muyter <[email protected]>
cc Gerlando Falauto <[email protected]>
---
 drivers/mtd/cfi_flash.c |   70 +++++++++++++++++++++++++++++++---------------
 1 files changed, 47 insertions(+), 23 deletions(-)
drivers/mtd/cfi_flash.c +0 -0
index 35294bc..690748d 100644

drivers/mtd/cfi_flash.c int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) · line 1395

Quoted 5 lines

drivers/mtd/cfi_flash.c +2 -0

@@ -1391,6 +1391,43 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
  */
 #ifdef CONFIG_SYS_FLASH_PROTECTION
 
+#define INTEL_COMPAT		0x89
+#define DEV_ID_NUMONYX_256MBIT	0x8922

Adding defines in the middle of the source is frowned upon.

Why don't you use INTEL_MANUFACT from flash.h instead. And add the device id in this header as well? I would prefer this.

Thanks,
Stefan

Holger Brunck

author

2012-08-09 07:57 UTC #2 lore raw

PATCH 1/1 mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs

Hi Stefan,

Quoted 27 lines · Stefan Roese

Quoted 26 lines · Holger Brunck
commit 54652991
Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips
fixes a problem for Numonyx P33/P30 flashes for 256-Mbit, but this leads to problems for smaller versions of this chip e.g. the 32Mbit version with deviceid 0x16 on mgcoge. So move the code for this work around to an own function and check previously manufacturer id and device id to not break support for other flashes where this work around is not needed.
Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Heiko Schocher <[email protected]>
cc Stefan Roese <[email protected]>
cc Philippe De Muyter <[email protected]>
cc Gerlando Falauto <[email protected]>
---
 drivers/mtd/cfi_flash.c |   70 +++++++++++++++++++++++++++++++---------------
 1 files changed, 47 insertions(+), 23 deletions(-)
drivers/mtd/cfi_flash.c +0 -0
index 35294bc..690748d 100644
@@ -1391,6 +1391,43 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
  */
 #ifdef CONFIG_SYS_FLASH_PROTECTION
 

Quoted 8 lines

drivers/mtd/cfi_flash.c int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) · line 1395
Quoted 2 lines
drivers/mtd/cfi_flash.c +2 -0
+#define INTEL_COMPAT		0x89
+#define DEV_ID_NUMONYX_256MBIT	0x8922
Adding defines in the middle of the source is frowned upon.
Why don't you use INTEL_MANUFACT from flash.h instead. And add the device id in this header as well? I would prefer this.

agreed, I'll prepare a v2. Thanks.

Regards
Holger

Holger Brunck

author

2012-08-09 08:22 UTC #3 lore raw

PATCH v2 1/1 mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs

In reply to Holger Brunck

commit 54652991
Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips

Signed-off-by Holger Brunck <[email protected]>

Signed-off-by Heiko Schocher <[email protected]>

cc Stefan Roese <[email protected]>

cc Philippe De Muyter <[email protected]>

cc Gerlando Falauto <[email protected]>

---
changes for v2:
- use existing INTEL_MANUFACT from flash.h and add device id for NUMONYX_256MBIT

 drivers/mtd/cfi_flash.c |   67 ++++++++++++++++++++++++++++++----------------
 include/flash.h         |    1 +
 2 files changed, 45 insertions(+), 23 deletions(-)

drivers/mtd/cfi_flash.c +44 ~~-23~~

index 35294bc..75acaf6 100644
@@ -1391,6 +1391,40 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
  */
 #ifdef CONFIG_SYS_FLASH_PROTECTION
 
+static int cfi_protect_bugfix(flash_info_t *info, long sector, int prot)
+{
+	if ((info->manufacturer_id == (uchar)INTEL_MANUFACT) &&
+		(info->device_id == NUMONYX_256MBIT)) {
+		/*
+		 * see errata called
+		 * "Numonyx Axcell P33/P30 Specification Update" :)
+		 */
+		flash_write_cmd(info, sector, 0, FLASH_CMD_READ_ID);
+		if (!flash_isequal(info, sector, FLASH_OFFSET_PROTECT,
+				   prot)) {
+			/*
+			 * cmd must come before FLASH_CMD_PROTECT + 20us
+			 * Disable interrupts which might cause a timeout here.
+			 */
+			int flag = disable_interrupts();
+			unsigned short cmd;
+
+			if (prot)
+				cmd = FLASH_CMD_PROTECT_SET;
+			else
+				cmd = FLASH_CMD_PROTECT_CLEAR;
+				flash_write_cmd(info, sector, 0,
+					  FLASH_CMD_PROTECT);
+			flash_write_cmd(info, sector, 0, cmd);
+			/* re-enable interrupts if necessary */
+			if (flag)
+				enable_interrupts();
+		}
+		return 1;
+	}
+	return 0;
+}
+
 int flash_real_protect (flash_info_t * info, long sector, int prot)
 {
 	int retcode = 0;

@@ -1399,31 +1433,18 @@ int flash_real_protect (flash_info_t * info, long sector, int prot)
 		case CFI_CMDSET_INTEL_PROG_REGIONS:
 		case CFI_CMDSET_INTEL_STANDARD:
 		case CFI_CMDSET_INTEL_EXTENDED:
-			/*
-			 * see errata called
-			 * "Numonyx Axcell P33/P30 Specification Update" :)
-			 */
-			flash_write_cmd (info, sector, 0, FLASH_CMD_READ_ID);
-			if (!flash_isequal (info, sector, FLASH_OFFSET_PROTECT,
-					    prot)) {
-				/*
-				 * cmd must come before FLASH_CMD_PROTECT + 20us
-				 * Disable interrupts which might cause a timeout here.
-				 */
-				int flag = disable_interrupts ();
-				unsigned short cmd;
-
+			if (!cfi_protect_bugfix(info, sector, prot)) {
+				flash_write_cmd(info, sector, 0,
+					 FLASH_CMD_CLEAR_STATUS);
+				flash_write_cmd(info, sector, 0,
+					FLASH_CMD_PROTECT);
 				if (prot)
-					cmd = FLASH_CMD_PROTECT_SET;
+					flash_write_cmd(info, sector, 0,
+						FLASH_CMD_PROTECT_SET);
 				else
-					cmd = FLASH_CMD_PROTECT_CLEAR;
-
-				flash_write_cmd (info, sector, 0,
-						  FLASH_CMD_PROTECT);
-				flash_write_cmd (info, sector, 0, cmd);
-				/* re-enable interrupts if necessary */
-				if (flag)
-					enable_interrupts ();
+					flash_write_cmd(info, sector, 0,
+						FLASH_CMD_PROTECT_CLEAR);
+
 			}
 			break;
 		case CFI_CMDSET_AMD_EXTENDED:

include/flash.h +1 -0

index 0ca70d9..e614d07 100644
@@ -348,6 +348,7 @@ extern flash_info_t *flash_get_info(ulong base);
 #define TOSH_ID_FVT160	0xC2		/* TC58FVT160 ID (16 M, top )		*/
 #define TOSH_ID_FVB160	0x43		/* TC58FVT160 ID (16 M, bottom )	*/
 #define PHILIPS_LPC2292 0x0401FF13  /* LPC2292 internal FLASH			*/
+#define NUMONYX_256MBIT	0x8922		/* Numonyx P33/30 256MBit 65nm	*/
 
 /*-----------------------------------------------------------------------
  * Internal FLASH identification codes

Signature · 1 line

1.7.1

Stefan Roese

2012-08-13 12:47 UTC #4 lore raw

PATCH v2 1/1 mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs

Quoted 9 lines · Holger Brunck

commit 54652991
Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips
fixes a problem for Numonyx P33/P30 flashes for 256-Mbit, but this leads to problems for smaller versions of this chip e.g. the 32Mbit version with deviceid 0x16 on mgcoge. So move the code for this work around to an own function and check previously manufacturer id and device id to not break other flashes which don't need this work around.

Quoted 5 lines

Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Heiko Schocher <[email protected]>
cc Stefan Roese <[email protected]>
cc Philippe De Muyter <[email protected]>
cc Gerlando Falauto <[email protected]>

Applied to u-boot-cfi-flash/master. 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