Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
nor: move in driver.h the flash_driver's declaration
[openocd.git] / src / flash / nor / rp2040.c
diff --git a/src/flash/nor/rp2040.c b/src/flash/nor/rp2040.c
index 7cc6434ffeab573d279eae1f898c4e397b8b2877..6c18c7b280ba168e068484b60b52fa6903fa36d1 100644 (file)
--- a/src/flash/nor/rp2040.c
+++ b/src/flash/nor/rp2040.c
@@ -50,6 +50,10 @@ struct rp2040_flash_bank {
        const struct flash_device *dev;
 };
 
+/* guessed SPI flash description if autodetection disabled (same as win w25q16jv) */
+static const struct flash_device rp2040_default_spi_device =
+       FLASH_ID("autodetect disabled", 0x03, 0x00, 0x02, 0xd8, 0xc7, 0, 0x100, 0x10000, 0);
+
 static uint32_t rp2040_lookup_symbol(struct target *target, uint32_t tag, uint16_t *symbol)
 {
        uint32_t magic;
@@ -99,8 +103,7 @@ static int rp2040_call_rom_func(struct target *target, struct rp2040_flash_bank
        }
        target_addr_t stacktop = priv->stack->address + priv->stack->size;
 
-       LOG_DEBUG("Calling ROM func @0x%" PRIx16 " with %d arguments", func_offset, n_args);
-       LOG_DEBUG("Calling on core \"%s\"", target->cmd_name);
+       LOG_TARGET_DEBUG(target, "Calling ROM func @0x%" PRIx16 " with %u arguments", func_offset, n_args);
 
        struct reg_param args[ARRAY_SIZE(regnames) + 2];
        struct armv7m_algorithm alg_info;
@@ -112,11 +115,12 @@ static int rp2040_call_rom_func(struct target *target, struct rp2040_flash_bank
        /* Pass function pointer in r7 */
        init_reg_param(&args[n_args], "r7", 32, PARAM_OUT);
        buf_set_u32(args[n_args].value, 0, 32, func_offset);
+       /* Setup stack */
        init_reg_param(&args[n_args + 1], "sp", 32, PARAM_OUT);
        buf_set_u32(args[n_args + 1].value, 0, 32, stacktop);
+       unsigned int n_reg_params = n_args + 2; /* User arguments + r7 + sp */
 
-
-       for (unsigned int i = 0; i < n_args + 2; ++i)
+       for (unsigned int i = 0; i < n_reg_params; ++i)
                LOG_DEBUG("Set %s = 0x%" PRIx32, args[i].reg_name, buf_get_u32(args[i].value, 0, 32));
 
        /* Actually call the function */
@@ -125,17 +129,19 @@ static int rp2040_call_rom_func(struct target *target, struct rp2040_flash_bank
        int err = target_run_algorithm(
                target,
                0, NULL,          /* No memory arguments */
-               n_args + 1, args, /* User arguments + r7 */
+               n_reg_params, args, /* User arguments + r7 + sp */
                priv->jump_debug_trampoline, priv->jump_debug_trampoline_end,
                timeout_ms,
                &alg_info
        );
-       for (unsigned int i = 0; i < n_args + 2; ++i)
+
+       for (unsigned int i = 0; i < n_reg_params; ++i)
                destroy_reg_param(&args[i]);
+
        if (err != ERROR_OK)
-               LOG_ERROR("Failed to invoke ROM function @0x%" PRIx16 "\n", func_offset);
-       return err;
+               LOG_ERROR("Failed to invoke ROM function @0x%" PRIx16, func_offset);
 
+       return err;
 }
 
 /* Finalize flash write/erase/read ID
@@ -211,6 +217,12 @@ static int rp2040_flash_write(struct flash_bank *bank, const uint8_t *buffer, ui
 
        struct rp2040_flash_bank *priv = bank->driver_priv;
        struct target *target = bank->target;
+
+       if (target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
        struct working_area *bounce = NULL;
 
        int err = rp2040_stack_grab_and_prep(bank);
@@ -266,6 +278,13 @@ cleanup:
 static int rp2040_flash_erase(struct flash_bank *bank, unsigned int first, unsigned int last)
 {
        struct rp2040_flash_bank *priv = bank->driver_priv;
+       struct target *target = bank->target;
+
+       if (target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
        uint32_t start_addr = bank->sectors[first].offset;
        uint32_t length = bank->sectors[last].offset + bank->sectors[last].size - start_addr;
        LOG_DEBUG("RP2040 erase %d bytes starting at 0x%" PRIx32, length, start_addr);
@@ -294,7 +313,7 @@ static int rp2040_flash_erase(struct flash_bank *bank, unsigned int first, unsig
        */
 
        int timeout_ms = 2000 * (last - first) + 1000;
-       err = rp2040_call_rom_func(bank->target, priv, priv->jump_flash_range_erase,
+       err = rp2040_call_rom_func(target, priv, priv->jump_flash_range_erase,
                                                        args, ARRAY_SIZE(args), timeout_ms);
 
 cleanup:
@@ -362,6 +381,11 @@ static int rp2040_flash_probe(struct flash_bank *bank)
        struct rp2040_flash_bank *priv = bank->driver_priv;
        struct target *target = bank->target;
 
+       if (target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
        int err = rp2040_lookup_symbol(target, FUNC_DEBUG_TRAMPOLINE, &priv->jump_debug_trampoline);
        if (err != ERROR_OK) {
                LOG_ERROR("Debug trampoline not found in RP2040 ROM.");
@@ -412,41 +436,48 @@ static int rp2040_flash_probe(struct flash_bank *bank)
                return err;
        }
 
-       err = rp2040_stack_grab_and_prep(bank);
+       if (bank->size) {
+               /* size overridden, suppress reading SPI flash ID */
+               priv->dev = &rp2040_default_spi_device;
+               LOG_DEBUG("SPI flash autodetection disabled, using configured size");
 
-       uint32_t device_id = 0;
-       if (err == ERROR_OK)
-               err = rp2040_spi_read_flash_id(target, &device_id);
+       } else {
+               /* zero bank size in cfg, read SPI flash ID and autodetect */
+               err = rp2040_stack_grab_and_prep(bank);
 
-       rp2040_finalize_stack_free(bank);
+               uint32_t device_id = 0;
+               if (err == ERROR_OK)
+                       err = rp2040_spi_read_flash_id(target, &device_id);
 
-       if (err != ERROR_OK)
-               return err;
+               rp2040_finalize_stack_free(bank);
 
-       /* search for a SPI flash Device ID match */
-       priv->dev = NULL;
-       for (const struct flash_device *p = flash_devices; p->name ; p++)
-               if (p->device_id == device_id) {
-                       priv->dev = p;
-                       break;
+               if (err != ERROR_OK)
+                       return err;
+
+               /* search for a SPI flash Device ID match */
+               priv->dev = NULL;
+               for (const struct flash_device *p = flash_devices; p->name ; p++)
+                       if (p->device_id == device_id) {
+                               priv->dev = p;
+                               break;
+                       }
+
+               if (!priv->dev) {
+                       LOG_ERROR("Unknown flash device (ID 0x%08" PRIx32 ")", device_id);
+                       return ERROR_FAIL;
                }
+               LOG_INFO("Found flash device '%s' (ID 0x%08" PRIx32 ")",
+                       priv->dev->name, priv->dev->device_id);
 
-       if (!priv->dev) {
-               LOG_ERROR("Unknown flash device (ID 0x%08" PRIx32 ")", device_id);
-               return ERROR_FAIL;
+               bank->size = priv->dev->size_in_bytes;
        }
 
-       LOG_INFO("Found flash device \'%s\' (ID 0x%08" PRIx32 ")",
-               priv->dev->name, priv->dev->device_id);
-
        /* the Boot ROM flash_range_program() routine requires page alignment */
        bank->write_start_alignment = priv->dev->pagesize;
        bank->write_end_alignment = priv->dev->pagesize;
 
-       bank->size = priv->dev->size_in_bytes;
-
        bank->num_sectors = bank->size / priv->dev->sectorsize;
-       LOG_INFO("RP2040 B0 Flash Probe: %d bytes @" TARGET_ADDR_FMT ", in %d sectors\n",
+       LOG_INFO("RP2040 B0 Flash Probe: %" PRIu32 " bytes @" TARGET_ADDR_FMT ", in %u sectors\n",
                bank->size, bank->base, bank->num_sectors);
        bank->sectors = alloc_block_array(0, priv->dev->sectorsize, bank->num_sectors);
        if (!bank->sectors)
@@ -489,7 +520,7 @@ FLASH_BANK_COMMAND_HANDLER(rp2040_flash_bank_command)
        return ERROR_OK;
 }
 
-struct flash_driver rp2040_flash = {
+const struct flash_driver rp2040_flash = {
        .name = "rp2040_flash",
        .flash_bank_command = rp2040_flash_bank_command,
        .erase =  rp2040_flash_erase,
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)