flash: stop caching protection state

[openocd.git] / src / flash / nor / cfi.c

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 5f7ed1e2ee4823f8ae8673e94da2b68f1c2779fd..4ef41b9ad72f6dcf437400841a10e28877225405 100644 (file)
--- 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  *
@@ -244,7 +245,7 @@ static void cfi_intel_clear_status_register(struct flash_bank *bank)
        cfi_send_command(bank, 0x50, flash_address(bank, 0, 0x0));
 }
 
-uint8_t cfi_intel_wait_status_busy(struct flash_bank *bank, int timeout)
+static uint8_t cfi_intel_wait_status_busy(struct flash_bank *bank, int timeout)
 {
        uint8_t status;
 
@@ -285,7 +286,7 @@ uint8_t cfi_intel_wait_status_busy(struct flash_bank *bank, int timeout)
        return status;
 }
 
-int cfi_spansion_wait_status_busy(struct flash_bank *bank, int timeout)
+static int cfi_spansion_wait_status_busy(struct flash_bank *bank, int timeout)
 {
        uint8_t status, oldstatus;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
@@ -598,12 +599,8 @@ FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       uint16_t chip_width, bus_width;
-       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[3], bus_width);
-       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[4], chip_width);
-
-       if ((chip_width > CFI_MAX_CHIP_WIDTH)
-                       || (bus_width > CFI_MAX_BUS_WIDTH))
+       if ((bank->chip_width > CFI_MAX_CHIP_WIDTH)
+                       || (bank->bus_width > CFI_MAX_BUS_WIDTH))
        {
                LOG_ERROR("chip and bus width have to specified in bytes");
                return ERROR_FLASH_BANK_INVALID;
@@ -855,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)
@@ -891,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;
        }
 
@@ -901,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 */
@@ -1120,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)
@@ -1145,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)
@@ -1166,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,
@@ -1448,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)
@@ -1810,7 +1817,7 @@ static int cfi_write_words(struct flash_bank *bank, uint8_t *word, uint32_t word
        return ERROR_FLASH_OPERATION_FAILED;
 }
 
-int cfi_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int cfi_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
        struct target *target = bank->target;