flash/nor: Do not update 'is_erased'

[fw/openocd] / src / flash / nor / mdr.c

diff --git a/src/flash/nor/mdr.c b/src/flash/nor/mdr.c
index c402e64e2fc3a7a1fd7f94f324e0e20488fbc3bd..f3c85525a1a315a0162a5da36b112a5b449de054 100644 (file)
--- a/src/flash/nor/mdr.c
+++ b/src/flash/nor/mdr.c
@@ -22,9 +22,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -64,7 +62,7 @@
 #define KEY            0x8AAA5551
 
 struct mdr_flash_bank {
-       int probed;
+       bool probed;
        unsigned int mem_type;
        unsigned int page_count;
        unsigned int sec_count;
@@ -81,18 +79,13 @@ FLASH_BANK_COMMAND_HANDLER(mdr_flash_bank_command)
        mdr_info = malloc(sizeof(struct mdr_flash_bank));
 
        bank->driver_priv = mdr_info;
-       mdr_info->probed = 0;
+       mdr_info->probed = false;
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[6], mdr_info->mem_type);
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[7], mdr_info->page_count);
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[8], mdr_info->sec_count);
        return ERROR_OK;
 }
 
-static int mdr_protect_check(struct flash_bank *bank)
-{
-       return ERROR_OK;
-}
-
 static int mdr_mass_erase(struct flash_bank *bank)
 {
        struct target *target = bank->target;
@@ -131,11 +124,12 @@ static int mdr_mass_erase(struct flash_bank *bank)
        return retval;
 }
 
-static int mdr_erase(struct flash_bank *bank, int first, int last)
+static int mdr_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
        struct mdr_flash_bank *mdr_info = bank->driver_priv;
-       int i, retval, retval2;
+       int retval, retval2;
        unsigned int j;
        uint32_t flash_cmd, cur_per_clock;
 
@@ -173,13 +167,14 @@ static int mdr_erase(struct flash_bank *bank, int first, int last)
        if (retval != ERROR_OK)
                goto reset_pg_and_lock;
 
-       if ((first == 0) && (last == (bank->num_sectors - 1))) {
+       if ((first == 0) && (last == (bank->num_sectors - 1)) &&
+               !mdr_info->mem_type) {
                retval = mdr_mass_erase(bank);
                goto reset_pg_and_lock;
        }
 
        unsigned int page_size = bank->size / mdr_info->page_count;
-       for (i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
                for (j = 0; j < mdr_info->sec_count; j++) {
                        retval = target_write_u32(target, FLASH_ADR, (i * page_size) | (j << 2));
                        if (retval != ERROR_OK)
@@ -202,7 +197,6 @@ static int mdr_erase(struct flash_bank *bank, int first, int last)
                        if (retval != ERROR_OK)
                                goto reset_pg_and_lock;
                }
-               bank->sectors[i].is_erased = 1;
        }
 
 reset_pg_and_lock:
@@ -218,11 +212,6 @@ reset_pg_and_lock:
        return retval;
 }
 
-static int mdr_protect(struct flash_bank *bank, int set, int first, int last)
-{
-       return ERROR_OK;
-}
-
 static int mdr_write_block(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t offset, uint32_t count)
 {
@@ -338,7 +327,7 @@ static int mdr_write(struct flash_bank *bank, const uint8_t *buffer,
        int rem = count % 4;
        if (rem) {
                new_buffer = malloc(count + rem);
-               if (new_buffer == NULL) {
+               if (!new_buffer) {
                        LOG_ERROR("odd number of bytes to write and no memory for padding buffer");
                        return ERROR_FAIL;
                }
@@ -468,8 +457,14 @@ reset_pg_and_lock:
                retval = retval2;
 
 free_buffer:
-       if (new_buffer)
-               free(new_buffer);
+       free(new_buffer);
+
+       /* read some bytes bytes to flush buffer in flash accelerator.
+        * See errata for 1986VE1T and 1986VE3. Error 0007 */
+       if ((retval == ERROR_OK) && (!mdr_info->mem_type)) {
+               uint32_t tmp;
+               target_checksum_memory(bank->target, bank->base, 64, &tmp);
+       }
 
        return retval;
 }
@@ -576,10 +571,7 @@ static int mdr_probe(struct flash_bank *bank)
        page_count = mdr_info->page_count;
        page_size = bank->size / page_count;
 
-       if (bank->sectors) {
-               free(bank->sectors);
-               bank->sectors = NULL;
-       }
+       free(bank->sectors);
 
        bank->num_sectors = page_count;
        bank->sectors = malloc(sizeof(struct flash_sector) * page_count);
@@ -591,7 +583,7 @@ static int mdr_probe(struct flash_bank *bank)
                bank->sectors[i].is_protected = 0;
        }
 
-       mdr_info->probed = 1;
+       mdr_info->probed = true;
 
        return ERROR_OK;
 }
@@ -604,27 +596,26 @@ static int mdr_auto_probe(struct flash_bank *bank)
        return mdr_probe(bank);
 }
 
-static int get_mdr_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_mdr_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        struct mdr_flash_bank *mdr_info = bank->driver_priv;
-       snprintf(buf, buf_size, "MDR32Fx - %s",
-                mdr_info->mem_type ? "info memory" : "main memory");
+       command_print_sameline(cmd, "MDR32Fx - %s",
+                       mdr_info->mem_type ? "info memory" : "main memory");
 
        return ERROR_OK;
 }
 
-struct flash_driver mdr_flash = {
+const struct flash_driver mdr_flash = {
        .name = "mdr",
        .usage = "flash bank <name> mdr <base> <size> 0 0 <target#> <type> <page_count> <sec_count>\n"
        "<type>: 0 for main memory, 1 for info memory",
        .flash_bank_command = mdr_flash_bank_command,
        .erase = mdr_erase,
-       .protect = mdr_protect,
        .write = mdr_write,
        .read = mdr_read,
        .probe = mdr_probe,
        .auto_probe = mdr_auto_probe,
        .erase_check = default_flash_blank_check,
-       .protect_check = mdr_protect_check,
        .info = get_mdr_info,
+       .free_driver_priv = default_flash_free_driver_priv,
 };