Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Charles Hardin <ckhardin@gmail.com> move jim into helper
[openocd.git] / src / flash / stm32x.c
diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 9ce16f7d361b4438b529de4f3ef5921ac64d4177..a8125f4766d26dd53fe1115abdef140719ef1a2c 100644 (file)
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -50,6 +50,7 @@ int stm32x_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, c
 int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+int stm32x_mass_erase(struct flash_bank_s *bank);
 
 flash_driver_t stm32x_flash =
 {
@@ -61,7 +62,7 @@ flash_driver_t stm32x_flash =
        .write = stm32x_write,
        .probe = stm32x_probe,
        .auto_probe = stm32x_auto_probe,
-       .erase_check = default_flash_blank_check,
+       .erase_check = default_flash_mem_blank_check,
        .protect_check = stm32x_protect_check,
        .info = stm32x_info
 };
@@ -316,7 +317,6 @@ int stm32x_protect_check(struct flash_bank_s *bank)
 int stm32x_erase(struct flash_bank_s *bank, int first, int last)
 {
        target_t *target = bank->target;
-       
        int i;
        u32 status;
        
@@ -324,7 +324,12 @@ int stm32x_erase(struct flash_bank_s *bank, int first, int last)
        {
                return ERROR_TARGET_NOT_HALTED;
        }
-
+       
+       if ((first == 0) && (last == (bank->num_sectors - 1)))
+       {
+               return stm32x_mass_erase(bank);
+       }
+       
        /* unlock flash registers */
        target_write_u32(target, STM32_FLASH_KEYR, KEY1);
        target_write_u32(target, STM32_FLASH_KEYR, KEY2);
@@ -483,6 +488,7 @@ int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 co
                                stm32x_info->write_algorithm->address + (sizeof(stm32x_flash_write_code) - 10), 10000, &armv7m_info)) != ERROR_OK)
                {
                        LOG_ERROR("error executing stm32x flash write algorithm");
+                       retval = ERROR_FLASH_OPERATION_FAILED;
                        break;
                }
                
@@ -624,48 +630,53 @@ int stm32x_probe(struct flash_bank_s *bank)
        target_read_u32(target, 0xE0042000, &device_id);
        LOG_INFO( "device id = 0x%08x", device_id );
        
-       switch (device_id & 0x7ff)
-       {
-               case 0x410:
-                       /* medium density - we have 1k pages
-                        * 4 pages for a protection area */
-                       page_size = 1024;
-                       stm32x_info->ppage_size = 4;
-                       break;
-               
-               case 0x414:
-                       /* high density - we have 2k pages
-                        * 2 pages for a protection area */
-                       page_size = 2048;
-                       stm32x_info->ppage_size = 2;
-                       break;
-               
-               default:
-                       LOG_WARNING( "Cannot identify target as a STM32 family." );
-                       return ERROR_FLASH_OPERATION_FAILED;
-       }
-       
        /* get flash size from target */
        if (target_read_u16(target, 0x1FFFF7E0, &num_pages) != ERROR_OK)
        {
-               /* failed reading flash size, default to 128k */
-               LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 128k flash" );
-               num_pages = 128;
+               /* failed reading flash size, default to max target family */
+               num_pages = 0xffff;
        }
        
-       /* check for early silicon rev A */
-       if ((device_id >> 16) == 0 )
+       if ((device_id & 0x7ff) == 0x410)
        {
-               /* number of sectors incorrect on revA */
-               LOG_WARNING( "STM32 Rev A Silicon detected, probe inaccurate - assuming 128k flash" );
-               num_pages = 128;
+               /* medium density - we have 1k pages
+                * 4 pages for a protection area */
+               page_size = 1024;
+               stm32x_info->ppage_size = 4;
+               
+               /* check for early silicon */
+               if (num_pages == 0xffff)
+               {
+                       /* number of sectors incorrect on revA */
+                       LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 128k flash" );
+                       num_pages = 128;
+               }
+       }
+       else if ((device_id & 0x7ff) == 0x414)
+       {
+               /* high density - we have 2k pages
+                * 2 pages for a protection area */
+               page_size = 2048;
+               stm32x_info->ppage_size = 2;
+               
+               /* check for early silicon */
+               if (num_pages == 0xffff)
+               {
+                       /* number of sectors incorrect on revZ */
+                       LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 512k flash" );
+                       num_pages = 512;
+               }
+       }
+       else
+       {
+               LOG_WARNING( "Cannot identify target as a STM32 family." );
+               return ERROR_FLASH_OPERATION_FAILED;
        }
        
        LOG_INFO( "flash size = %dkbytes", num_pages );
        
        /* calculate numbers of pages */
-       if (page_size - 1024)
-               num_pages /= (page_size - 1024);
+       num_pages /= (page_size / 1024);
        
        bank->base = 0x08000000;
        bank->size = (num_pages * page_size);
@@ -930,30 +941,10 @@ int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx, char
        return ERROR_OK;
 }
 
-int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int stm32x_mass_erase(struct flash_bank_s *bank)
 {
-       target_t *target = NULL;
-       stm32x_flash_bank_t *stm32x_info = NULL;
-       flash_bank_t *bank;
+       target_t *target = bank->target;
        u32 status;
-       int i;
-       
-       if (argc < 1)
-       {
-               command_print(cmd_ctx, "stm32x mass_erase <bank>");
-               return ERROR_OK;        
-       }
-       
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
-       
-       stm32x_info = bank->driver_priv;
-       
-       target = bank->target;
        
        if (target->state != TARGET_HALTED)
        {
@@ -974,23 +965,51 @@ int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cm
        
        if( status & FLASH_WRPRTERR )
        {
-               command_print(cmd_ctx, "stm32x device protected");
+               LOG_ERROR("stm32x device protected");
                return ERROR_OK;
        }
        
        if( status & FLASH_PGERR )
        {
-               command_print(cmd_ctx, "stm32x device programming failed");
+               LOG_ERROR("stm32x device programming failed");
                return ERROR_OK;
        }
        
-       /* set all sectors as erased */
-       for (i = 0; i < bank->num_sectors; i++)
+       return ERROR_OK;
+}
+
+int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       flash_bank_t *bank;
+       int i;
+       
+       if (argc < 1)
+       {
+               command_print(cmd_ctx, "stm32x mass_erase <bank>");
+               return ERROR_OK;        
+       }
+       
+       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
+       if (!bank)
        {
-               bank->sectors[i].is_erased = 1;
+               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+               return ERROR_OK;
        }
        
-       command_print(cmd_ctx, "stm32x mass erase complete");
+       if (stm32x_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, "stm32x mass erase complete");
+       }
+       else
+       {
+               command_print(cmd_ctx, "stm32x mass erase failed");
+       }
        
        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)