X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fcfi.c;h=4ef41b9ad72f6dcf437400841a10e28877225405;hb=737c9b6258c6e68714ae264ff36126eb5d382d6a;hp=a64d78f5576dae88e7b08ed622dfefa0276fba59;hpb=b886049c74de147b1ce6f7f0173ecd71323c5c64;p=openocd.git

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index a64d78f557..4ef41b9ad7 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -3,6 +3,7 @@
  *   Dominic.Rath@gmx.de                                                   *
  *   Copyright (C) 2009 Michael Schwingen                                  *
  *   michael@schwingen.org                                                 *
+ *   Copyright (C) 2010 Øyvind Harboe <oyvind.harboe@zylin.com>            *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -851,6 +852,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)
@@ -887,6 +899,7 @@ static int cfi_protect(struct flash_bank *bank, int set, int first, int last)
 
 	if ((first < 0) || (last < first) || (last >= bank->num_sectors))
 	{
+		LOG_ERROR("Invalid sector range");
 		return ERROR_FLASH_SECTOR_INVALID;
 	}
 
@@ -897,14 +910,12 @@ static int cfi_protect(struct flash_bank *bank, int set, int first, int last)
 	{
 		case 1:
 		case 3:
-			cfi_intel_protect(bank, set, first, last);
+			return cfi_intel_protect(bank, set, first, last);
 			break;
 		default:
 			LOG_ERROR("protect: cfi primary command set %i unsupported", cfi_info->pri_id);
-			break;
+			return ERROR_FAIL;
 	}
-
-	return ERROR_OK;
 }
 
 /* FIXME Replace this by a simple memcpy() - still unsure about sideeffects */
@@ -1116,7 +1127,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer, uint3
 	/* Get a workspace buffer for the data to flash starting with 32k size.
 	   Half size until buffer would be smaller 256 Bytem then fail back */
 	/* FIXME Why 256 bytes, why not 32 bytes (smallest flash write page */
-	while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK)
+	while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK)
 	{
 		buffer_size /= 2;
 		if (buffer_size <= 256)
@@ -1141,7 +1152,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer, uint3
 	busy_pattern_val  = cfi_command_val(bank, 0x80);
 	error_pattern_val = cfi_command_val(bank, 0x7e);
 
-	LOG_INFO("Using target buffer at 0x%08" PRIx32 " and of size 0x%04" PRIx32, source->address, buffer_size);
+	LOG_DEBUG("Using target buffer at 0x%08" PRIx32 " and of size 0x%04" PRIx32, source->address, buffer_size);
 
 	/* Programming main loop */
 	while (count > 0)
@@ -1162,7 +1173,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer, uint3
 		buf_set_u32(reg_params[5].value, 0, 32, busy_pattern_val);
 		buf_set_u32(reg_params[6].value, 0, 32, error_pattern_val);
 
-		LOG_INFO("Write 0x%04" PRIx32 " bytes to flash at 0x%08" PRIx32 , thisrun_count, address);
+		LOG_DEBUG("Write 0x%04" PRIx32 " bytes to flash at 0x%08" PRIx32 , thisrun_count, address);
 
 		/* Execute algorithm, assume breakpoint for last instruction */
 		retval = target_run_algorithm(target, 0, NULL, 7, reg_params,
@@ -1444,7 +1455,7 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer, ui
 	}
 	/* the following code still assumes target code is fixed 24*4 bytes */
 
-	while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK)
+	while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK)
 	{
 		buffer_size /= 2;
 		if (buffer_size <= 256)