Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Nicolas Pitre nico at cam.org don't ignore bad options passed to the "nand write...
[openocd.git] / src / flash / stellaris.c
diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index 57049faa29ec2b949cea6cc970b1b4f25e8db3c4..657d62f941e8490446eb5f362b5c52b090e77f51 100644 (file)
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2006 by Magnus Lundin                                   *
  *   lundin@mlu.mine.nu                                                    *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   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  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -19,7 +22,7 @@
  ***************************************************************************/
 
 /***************************************************************************
-* STELLARIS is tested on LM3S811
+* STELLARIS is tested on LM3S811, LM3S6965
 ***************************************************************************/
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -306,16 +309,17 @@ int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size)
        buf += printed;
        buf_size -= printed;
 
-       printed = snprintf(buf, buf_size, "did1: 0x%8.8x, arch: 0x%4.4x, eproc: %s, ramsize:%ik,  flashsize: %ik\n", 
+       printed = snprintf(buf, buf_size, "did1: 0x%8.8x, arch: 0x%4.4x, eproc: %s, ramsize:%ik, flashsize: %ik\n", 
         stellaris_info->did1, stellaris_info->did1, "ARMV7M", (1+((stellaris_info->dc0>>16) & 0xFFFF))/4, (1+(stellaris_info->dc0 & 0xFFFF))*2);
        buf += printed;
        buf_size -= printed;
 
-       printed = snprintf(buf, buf_size, "master clock(estimated): %ikHz,  rcc is 0x%x \n", stellaris_info->mck_freq / 1000, stellaris_info->rcc);
+       printed = snprintf(buf, buf_size, "master clock(estimated): %ikHz, rcc is 0x%x \n", stellaris_info->mck_freq / 1000, stellaris_info->rcc);
        buf += printed;
        buf_size -= printed;
 
-       if (stellaris_info->num_lockbits>0) {           
+       if (stellaris_info->num_lockbits>0)
+       {
                printed = snprintf(buf, buf_size, "pagesize: %i, lockbits: %i 0x%4.4x, pages in lock region: %i \n", stellaris_info->pagesize, stellaris_info->num_lockbits, stellaris_info->lockbits,stellaris_info->num_pages/stellaris_info->num_lockbits);
                buf += printed;
                buf_size -= printed;
@@ -409,7 +413,7 @@ u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
        while (((status = stellaris_get_flash_status(bank)) & waitbits) && (timeout-- > 0))
        {
                LOG_DEBUG("status: 0x%x", status);
-               usleep(1000);
+               alive_sleep(1);
        }
        
        /* Flash errors are reflected in the FLASH_CRIS register */
@@ -519,6 +523,7 @@ int stellaris_protect_check(struct flash_bank_s *bank)
 
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -548,6 +553,7 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -580,10 +586,10 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
        target_write_u32(target, FLASH_CIM, 0);
        target_write_u32(target, FLASH_MISC, PMISC|AMISC);
        
-       for (banknr=first;banknr<=last;banknr++)
+       for (banknr = first; banknr <= last; banknr++)
        {
                /* Address is first word in page */
-               target_write_u32(target, FLASH_FMA, banknr*stellaris_info->pagesize);
+               target_write_u32(target, FLASH_FMA, banknr * stellaris_info->pagesize);
                /* Write erase command */
                target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_ERASE);
                /* Wait until erase complete */
@@ -618,6 +624,7 @@ int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last)
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
        
@@ -730,19 +737,19 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
        working_area_t *source;
        working_area_t *write_algorithm;
        u32 address = bank->base + offset;
-       reg_param_t reg_params[8];
+       reg_param_t reg_params[3];
        armv7m_algorithm_t armv7m_info;
-       int retval;
+       int retval = ERROR_OK;
        
        LOG_DEBUG("(bank=%p buffer=%p offset=%08X wcount=%08X)",
                        bank, buffer, offset, wcount);
 
        /* flash write code */
        if (target_alloc_working_area(target, sizeof(stellaris_write_code), &write_algorithm) != ERROR_OK)
-               {
-                       LOG_WARNING("no working area available, can't do block memory writes");
-                       return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-               };
+       {
+               LOG_WARNING("no working area available, can't do block memory writes");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       };
 
        target_write_buffer(target, write_algorithm->address, sizeof(stellaris_write_code), stellaris_write_code);
 
@@ -769,12 +776,7 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
        init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
        init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
        init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);
-       init_reg_param(&reg_params[3], "r3", 32, PARAM_OUT);
-       init_reg_param(&reg_params[4], "r4", 32, PARAM_OUT);
-       init_reg_param(&reg_params[5], "r5", 32, PARAM_OUT);
-       init_reg_param(&reg_params[6], "r6", 32, PARAM_OUT);
-       init_reg_param(&reg_params[7], "r7", 32, PARAM_OUT);
-
+       
        while (wcount > 0)
        {
                u32 thisrun_count = (wcount > (buffer_size / 4)) ? (buffer_size / 4) : wcount;
@@ -784,16 +786,13 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                buf_set_u32(reg_params[0].value, 0, 32, source->address);
                buf_set_u32(reg_params[1].value, 0, 32, address);
                buf_set_u32(reg_params[2].value, 0, 32, 4*thisrun_count);
-               LOG_WARNING("Algorithm flash write  %i words to 0x%x, %i remaining",thisrun_count,address, wcount);
-               LOG_DEBUG("Algorithm flash write  %i words to 0x%x, %i remaining",thisrun_count,address, wcount);
+               LOG_INFO("Algorithm flash write %i words to 0x%x, %i remaining", thisrun_count, address, wcount);
+               LOG_DEBUG("Algorithm flash write %i words to 0x%x, %i remaining", thisrun_count, address, wcount);
                if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, write_algorithm->address, write_algorithm->address + sizeof(stellaris_write_code)-10, 10000, &armv7m_info)) != ERROR_OK)
                {
                        LOG_ERROR("error executing stellaris flash write algorithm");
-                       target_free_working_area(target, source);
-                       destroy_reg_param(&reg_params[0]);
-                       destroy_reg_param(&reg_params[1]);
-                       destroy_reg_param(&reg_params[2]);
-                       return ERROR_FLASH_OPERATION_FAILED;
+                       retval = ERROR_FLASH_OPERATION_FAILED;
+                       break;
                }
        
                buffer += thisrun_count * 4;
@@ -807,13 +806,8 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
        destroy_reg_param(&reg_params[2]);
-       destroy_reg_param(&reg_params[3]);
-       destroy_reg_param(&reg_params[4]);
-       destroy_reg_param(&reg_params[5]);
-       destroy_reg_param(&reg_params[6]);
-       destroy_reg_param(&reg_params[7]);
        
-       return ERROR_OK;
+       return retval;
 }
 
 int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
@@ -821,11 +815,15 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
        target_t *target = bank->target;
        u32 address = offset;
-       u32 flash_cris,flash_fmc;
+       u32 flash_cris, flash_fmc;
+       u32 words_remaining = (count / 4);
+       u32 bytes_remaining = (count & 0x00000003);
+       u32 bytes_written = 0;
        u32 retval;
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -843,7 +841,7 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
-       if((offset & 3) || (count & 3))
+       if (offset & 0x3)
        {
                LOG_WARNING("offset size must be word aligned");
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
@@ -855,17 +853,16 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
        /* Configure the flash controller timing */     
        stellaris_read_clock_info(bank);        
        stellaris_set_flash_mode(bank, 0);
-
        
        /* Clear and disable flash programming interrupts */
        target_write_u32(target, FLASH_CIM, 0);
        target_write_u32(target, FLASH_MISC, PMISC|AMISC);
 
        /* multiple words to be programmed? */
-       if (count > 0) 
+       if (words_remaining > 0) 
        {
                /* try using a block write */
-               if ((retval = stellaris_write_block(bank, buffer, offset, count/4)) != ERROR_OK)
+               if ((retval = stellaris_write_block(bank, buffer, offset, words_remaining)) != ERROR_OK)
                {
                        if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
                        {
@@ -884,15 +881,17 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
                }
                else
                {
-                       buffer += count * 4;
-                       address += count * 4;
-                       count = 0;
+                       buffer += words_remaining * 4;
+                       address += words_remaining * 4;
+                       words_remaining = 0;
                }
        }
        
-       while(count>0)
+       while (words_remaining > 0)
        {
-               if (!(address & 0xff)) LOG_DEBUG("0x%x", address);
+               if (!(address & 0xff))
+                       LOG_DEBUG("0x%x", address);
+               
                /* Program one word */
                target_write_u32(target, FLASH_FMA, address);
                target_write_buffer(target, FLASH_FMD, 4, buffer);
@@ -902,13 +901,41 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
                do
                {
                        target_read_u32(target, FLASH_FMC, &flash_fmc);
-               }
-               while(flash_fmc & FMC_WRITE);
+               } while (flash_fmc & FMC_WRITE);
+               
                buffer += 4;
                address += 4;
-               count -= 4;
+               words_remaining--;
        }
-       /* Check acess violations */
+       
+       if (bytes_remaining)
+       {
+               u8 last_word[4] = {0xff, 0xff, 0xff, 0xff};
+               int i = 0;
+                               
+               while(bytes_remaining > 0)
+               {
+                       last_word[i++] = *(buffer + bytes_written); 
+                       bytes_remaining--;
+                       bytes_written++;
+               }
+               
+               if (!(address & 0xff))
+                       LOG_DEBUG("0x%x", address);
+               
+               /* Program one word */
+               target_write_u32(target, FLASH_FMA, address);
+               target_write_buffer(target, FLASH_FMD, 4, last_word);
+               target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_WRITE);
+               /* LOG_DEBUG("0x%x 0x%x 0x%x",address,buf_get_u32(buffer, 0, 32),FMC_WRKEY | FMC_WRITE); */
+               /* Wait until write complete */
+               do
+               {
+                       target_read_u32(target, FLASH_FMC, &flash_fmc);
+               } while (flash_fmc & FMC_WRITE);
+       }
+       
+       /* Check access violations */
        target_read_u32(target, FLASH_CRIS, &flash_cris);
        if (flash_cris & (AMASK))
        {
@@ -926,6 +953,7 @@ int stellaris_probe(struct flash_bank_s *bank)
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -952,6 +980,7 @@ int stellaris_mass_erase(struct flash_bank_s *bank)
        
        if (target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
        
@@ -981,11 +1010,11 @@ int stellaris_mass_erase(struct flash_bank_s *bank)
        {
                target_read_u32(target, FLASH_FMC, &flash_fmc);
        }
-       while(flash_fmc & FMC_MERASE);
+       while (flash_fmc & FMC_MERASE);
        
        /* if device has > 128k, then second erase cycle is needed
         * this is only valid for older devices, but will not hurt */
-       if(stellaris_info->num_pages * stellaris_info->pagesize > 0x20000)
+       if (stellaris_info->num_pages * stellaris_info->pagesize > 0x20000)
        {
                target_write_u32(target, FLASH_FMA, 0x20000);
                target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
@@ -994,7 +1023,7 @@ int stellaris_mass_erase(struct flash_bank_s *bank)
                {
                        target_read_u32(target, FLASH_FMC, &flash_fmc);
                }
-               while(flash_fmc & FMC_MERASE);
+               while (flash_fmc & FMC_MERASE);
        }
        
        return ERROR_OK;
@@ -1018,15 +1047,20 @@ int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char
                return ERROR_OK;
        }
        
-       stellaris_mass_erase(bank);
-       
-       /* set all sectors as erased */
-       for (i = 0; i < bank->num_sectors; i++)
+       if (stellaris_mass_erase(bank) == ERROR_OK)
+       {
+               /* set all sectors as erased */
+               for (i = 0; i < bank->num_sectors; i++)
+               {
+                       bank->sectors[i].is_erased = 1;
+               }
+               
+               command_print(cmd_ctx, "stellaris mass erase complete");
+       }
+       else
        {
-               bank->sectors[i].is_erased = 1;
+               command_print(cmd_ctx, "stellaris mass erase failed");
        }
        
-       command_print(cmd_ctx, "stellaris mass erase complete");
-       
        return ERROR_OK;
 }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)