X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fcfi.c;h=2235c85ce39f16e83eae9fac580952b0b2cef78f;hb=a7fb60dc7b23a78be0ad5876b0e76a0e76875d5c;hp=92b553b54bfeb56b52648047f6a180433cfe863f;hpb=3077f5845f197c5e21fc4ed917722297c74ef754;p=openocd

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 92b553b5..2235c85c 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -57,6 +57,7 @@ static const struct cfi_fixup cfi_0002_fixups[] = {
 	{CFI_MFR_SST, 0x00D7, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
 	{CFI_MFR_SST, 0x2780, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
 	{CFI_MFR_ATMEL, 0x00C8, cfi_fixup_atmel_reversed_erase_regions, NULL},
+   {CFI_MFR_FUJITSU, 0x22ea, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_555_2AA]},
 	{CFI_MFR_FUJITSU, 0x226b, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
 	{CFI_MFR_AMIC, 0xb31a, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_555_2AA]},
 	{CFI_MFR_MX, 0x225b, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_555_2AA]},
@@ -104,7 +105,6 @@ static __inline__ uint32_t flash_address(struct flash_bank *bank, int sector, ui
 		}
 		return bank->base + bank->sectors[sector].offset + offset * bank->bus_width;
 	}
-
 }
 
 static void cfi_command(struct flash_bank *bank, uint8_t cmd, uint8_t *cmd_buf)
@@ -232,6 +232,35 @@ static uint32_t cfi_query_u32(struct flash_bank *bank, int sector, uint32_t offs
 				data[(3 * bank->bus_width) - 1] << 16 | data[(4 * bank->bus_width) - 1] << 24;
 }
 
+static int cfi_reset(struct flash_bank *bank)
+{
+	struct cfi_flash_bank *cfi_info = bank->driver_priv;
+	int retval = ERROR_OK;
+
+	if ((retval = cfi_send_command(bank, 0xf0, flash_address(bank, 0, 0x0))) != ERROR_OK)
+	{
+		return retval;
+	}
+
+	if ((retval = cfi_send_command(bank, 0xff, flash_address(bank, 0, 0x0))) != ERROR_OK)
+	{
+		return retval;
+	}
+
+	if (cfi_info->manufacturer == 0x20 &&
+			(cfi_info->device_id == 0x227E || cfi_info->device_id == 0x7E))
+	{
+		/* Numonix M29W128G is cmd 0xFF intolerant - causes internal undefined state
+		 * so we send an extra 0xF0 reset to fix the bug */
+		if ((retval = cfi_send_command(bank, 0xf0, flash_address(bank, 0, 0x00))) != ERROR_OK)
+		{
+			return retval;
+		}
+	}
+
+	return retval;
+}
+
 static void cfi_intel_clear_status_register(struct flash_bank *bank)
 {
 	struct target *target = bank->target;
@@ -335,11 +364,7 @@ static int cfi_read_intel_pri_ext(struct flash_bank *bank)
 
 	if ((pri_ext->pri[0] != 'P') || (pri_ext->pri[1] != 'R') || (pri_ext->pri[2] != 'I'))
 	{
-		if ((retval = cfi_send_command(bank, 0xf0, flash_address(bank, 0, 0x0))) != ERROR_OK)
-		{
-			return retval;
-		}
-		if ((retval = cfi_send_command(bank, 0xff, flash_address(bank, 0, 0x0))) != ERROR_OK)
+		if ((retval = cfi_reset(bank)) != ERROR_OK)
 		{
 			return retval;
 		}
@@ -852,6 +877,17 @@ static int cfi_intel_protect(struct flash_bank *bank, int set, int first, int la
 	 */
 	if ((!set) && (!(pri_ext->feature_support & 0x20)))
 	{
+		/* FIX!!! this code path is broken!!!
+		 *
+		 * The correct approach is:
+		 *
+		 * 1. read out current protection status
+		 *
+		 * 2. override read out protection status w/unprotected.
+		 *
+		 * 3. re-protect what should be protected.
+		 *
+		 */
 		for (i = 0; i < bank->num_sectors; i++)
 		{
 			if (bank->sectors[i].is_protected == 1)
@@ -1966,11 +2002,7 @@ static int cfi_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
 	}
 
 	/* return to read array mode, so we can read from flash again for padding */
-	if ((retval = cfi_send_command(bank, 0xf0, flash_address(bank, 0, 0x0))) != ERROR_OK)
-	{
-		return retval;
-	}
-	if ((retval = cfi_send_command(bank, 0xff, flash_address(bank, 0, 0x0))) != ERROR_OK)
+	if ((retval = cfi_reset(bank)) != ERROR_OK)
 	{
 		return retval;
 	}
@@ -2004,11 +2036,7 @@ static int cfi_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
 	}
 
 	/* return to read array mode */
-	if ((retval = cfi_send_command(bank, 0xf0, flash_address(bank, 0, 0x0))) != ERROR_OK)
-	{
-		return retval;
-	}
-	return cfi_send_command(bank, 0xff, flash_address(bank, 0, 0x0));
+	return cfi_reset(bank);
 }
 
 static void cfi_fixup_atmel_reversed_erase_regions(struct flash_bank *bank, void *param)
@@ -2072,11 +2100,7 @@ static int cfi_query_string(struct flash_bank *bank, int address)
 
 	if ((cfi_info->qry[0] != 'Q') || (cfi_info->qry[1] != 'R') || (cfi_info->qry[2] != 'Y'))
 	{
-		if ((retval = cfi_send_command(bank, 0xf0, flash_address(bank, 0, 0x0))) != ERROR_OK)
-		{
-			return retval;
-		}
-		if ((retval = cfi_send_command(bank, 0xff, flash_address(bank, 0, 0x0))) != ERROR_OK)
+		if ((retval = cfi_reset(bank)) != ERROR_OK)
 		{
 			return retval;
 		}
@@ -2157,11 +2181,7 @@ static int cfi_probe(struct flash_bank *bank)
 
 	LOG_INFO("Flash Manufacturer/Device: 0x%04x 0x%04x", cfi_info->manufacturer, cfi_info->device_id);
 	/* switch back to read array mode */
-	if ((retval = cfi_send_command(bank, 0xf0, flash_address(bank, 0, 0x00))) != ERROR_OK)
-	{
-		return retval;
-	}
-	if ((retval = cfi_send_command(bank, 0xff, flash_address(bank, 0, 0x00))) != ERROR_OK)
+	if ((retval = cfi_reset(bank)) != ERROR_OK)
 	{
 		return retval;
 	}
@@ -2278,11 +2298,7 @@ static int cfi_probe(struct flash_bank *bank)
 		/* return to read array mode
 		 * we use both reset commands, as some Intel flashes fail to recognize the 0xF0 command
 		 */
-		if ((retval = cfi_send_command(bank, 0xf0, flash_address(bank, 0, 0x0))) != ERROR_OK)
-		{
-			return retval;
-		}
-		if ((retval = cfi_send_command(bank, 0xff, flash_address(bank, 0, 0x0))) != ERROR_OK)
+		if ((retval = cfi_reset(bank)) != ERROR_OK)
 		{
 			return retval;
 		}
@@ -2366,7 +2382,6 @@ static int cfi_auto_probe(struct flash_bank *bank)
 	return cfi_probe(bank);
 }
 
-
 static int cfi_intel_protect_check(struct flash_bank *bank)
 {
 	int retval;