Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
non-CFI flash code uses data from CFI structures. Make sure that timeouts are filled...
[openocd.git] / src / flash / nor / cfi.c
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 4165166f2b13b52b7b807b2a9b480fe9dd2ff6f7..5a35aaef92d024efb4895a74858d8c7774dc7ef7 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -1226,6 +1226,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer,
         * r6: error test pattern
         */
 
+       /* see contib/loaders/flash/armv4_5_cfi_intel_32.s for src */
        static const uint32_t word_32_code[] = {
                0xe4904004,   /* loop:  ldr r4, [r0], #4 */
                0xe5813000,   /*                str r3, [r1] */
@@ -1243,6 +1244,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer,
                0xeafffffe    /* done:  b -2 */
        };
 
+       /* see contib/loaders/flash/armv4_5_cfi_intel_16.s for src */
        static const uint32_t word_16_code[] = {
                0xe0d040b2,   /* loop:  ldrh r4, [r0], #2 */
                0xe1c130b0,   /*                strh r3, [r1] */
@@ -1260,6 +1262,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer,
                0xeafffffe    /* done:  b -2 */
        };
 
+       /* see contib/loaders/flash/armv4_5_cfi_intel_8.s for src */
        static const uint32_t word_8_code[] = {
                0xe4d04001,   /* loop:  ldrb r4, [r0], #1 */
                0xe5c13000,   /*                strb r3, [r1] */
@@ -1487,6 +1490,7 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer,
        /*  R10 = unlock2_addr */
        /*  R11 = unlock2_cmd */
 
+       /* see contib/loaders/flash/armv4_5_cfi_span_32.s for src */
        static const uint32_t word_32_code[] = {
                                                /* 00008100 <sp_32_code>:               */
                0xe4905004,             /* ldr  r5, [r0], #4                    */
@@ -1519,9 +1523,10 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer,
                                                /*                                                              */
                                                /* 00008154 <sp_32_done>:               */
                0xeafffffe              /* b    8154 <sp_32_done>               */
-               };
+       };
 
-               static const uint32_t word_16_code[] = {
+       /* see contib/loaders/flash/armv4_5_cfi_span_16.s for src */
+       static const uint32_t word_16_code[] = {
                                                /* 00008158 <sp_16_code>:               */
                0xe0d050b2,             /* ldrh r5, [r0], #2                    */
                0xe1c890b0,             /* strh r9, [r8]                                */
@@ -1553,9 +1558,10 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer,
                                                /*                                                              */
                                                /* 000081ac <sp_16_done>:               */
                0xeafffffe              /* b    81ac <sp_16_done>               */
-               };
+       };
 
-               static const uint32_t word_16_code_dq7only[] = {
+       /* see contib/loaders/flash/armv4_5_cfi_span_16_dq7.s for src */
+       static const uint32_t word_16_code_dq7only[] = {
                                                /* <sp_16_code>:                                */
                0xe0d050b2,             /* ldrh r5, [r0], #2                    */
                0xe1c890b0,             /* strh r9, [r8]                                */
@@ -1578,9 +1584,10 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer,
                                                /*                                                              */
                                                /* 000081ac <sp_16_done>:               */
                0xeafffffe              /* b    81ac <sp_16_done>               */
-               };
+       };
 
-               static const uint32_t word_8_code[] = {
+       /* see contib/loaders/flash/armv4_5_cfi_span_8.s for src */
+       static const uint32_t word_8_code[] = {
                                                /* 000081b0 <sp_16_code_end>:   */
                0xe4d05001,             /* ldrb r5, [r0], #1                    */
                0xe5c89000,             /* strb r9, [r8]                                */
@@ -2556,39 +2563,6 @@ static int cfi_probe(struct flash_bank *bank)
                if (retval != ERROR_OK)
                        return retval;
 
-               LOG_DEBUG("Vcc min: %x.%x, Vcc max: %x.%x, Vpp min: %u.%x, Vpp max: %u.%x",
-                       (cfi_info->vcc_min & 0xf0) >> 4, cfi_info->vcc_min & 0x0f,
-                       (cfi_info->vcc_max & 0xf0) >> 4, cfi_info->vcc_max & 0x0f,
-                       (cfi_info->vpp_min & 0xf0) >> 4, cfi_info->vpp_min & 0x0f,
-                       (cfi_info->vpp_max & 0xf0) >> 4, cfi_info->vpp_max & 0x0f);
-
-               LOG_DEBUG("typ. word write timeout: %u us, typ. buf write timeout: %u us, "
-                               "typ. block erase timeout: %u ms, typ. chip erase timeout: %u ms",
-                               1 << cfi_info->word_write_timeout_typ, 1 << cfi_info->buf_write_timeout_typ,
-                               1 << cfi_info->block_erase_timeout_typ, 1 << cfi_info->chip_erase_timeout_typ);
-
-               LOG_DEBUG("max. word write timeout: %u us, max. buf write timeout: %u us, "
-                               "max. block erase timeout: %u ms, max. chip erase timeout: %u ms",
-                               (1 << cfi_info->word_write_timeout_max) * (1 << cfi_info->word_write_timeout_typ),
-                               (1 << cfi_info->buf_write_timeout_max) * (1 << cfi_info->buf_write_timeout_typ),
-                               (1 << cfi_info->block_erase_timeout_max) * (1 << cfi_info->block_erase_timeout_typ),
-                               (1 << cfi_info->chip_erase_timeout_max) * (1 << cfi_info->chip_erase_timeout_typ));
-
-               /* convert timeouts to real values in ms */
-               cfi_info->word_write_timeout = DIV_ROUND_UP((1 << cfi_info->word_write_timeout_typ) *
-                                               (1 << cfi_info->word_write_timeout_max), 1000);
-               cfi_info->buf_write_timeout = DIV_ROUND_UP((1 << cfi_info->buf_write_timeout_typ) *
-                               (1 << cfi_info->buf_write_timeout_max), 1000);
-               cfi_info->block_erase_timeout = (1 << cfi_info->block_erase_timeout_typ) *
-                               (1 << cfi_info->block_erase_timeout_max);
-               cfi_info->chip_erase_timeout = (1 << cfi_info->chip_erase_timeout_typ) *
-                               (1 << cfi_info->chip_erase_timeout_max);
-
-               LOG_DEBUG("calculated word write timeout: %u ms, buf write timeout: %u ms, "
-                               "block erase timeout: %u ms, chip erase timeout: %u ms",
-                               cfi_info->word_write_timeout, cfi_info->buf_write_timeout,
-                               cfi_info->block_erase_timeout, cfi_info->chip_erase_timeout);
-
                uint8_t data;
                retval = cfi_query_u8(bank, 0, 0x27, &data);
                if (retval != ERROR_OK)
@@ -2656,6 +2630,39 @@ static int cfi_probe(struct flash_bank *bank)
                }
        } /* end CFI case */
 
+       LOG_DEBUG("Vcc min: %x.%x, Vcc max: %x.%x, Vpp min: %u.%x, Vpp max: %u.%x",
+               (cfi_info->vcc_min & 0xf0) >> 4, cfi_info->vcc_min & 0x0f,
+               (cfi_info->vcc_max & 0xf0) >> 4, cfi_info->vcc_max & 0x0f,
+               (cfi_info->vpp_min & 0xf0) >> 4, cfi_info->vpp_min & 0x0f,
+               (cfi_info->vpp_max & 0xf0) >> 4, cfi_info->vpp_max & 0x0f);
+
+       LOG_DEBUG("typ. word write timeout: %u us, typ. buf write timeout: %u us, "
+                       "typ. block erase timeout: %u ms, typ. chip erase timeout: %u ms",
+                       1 << cfi_info->word_write_timeout_typ, 1 << cfi_info->buf_write_timeout_typ,
+                       1 << cfi_info->block_erase_timeout_typ, 1 << cfi_info->chip_erase_timeout_typ);
+
+       LOG_DEBUG("max. word write timeout: %u us, max. buf write timeout: %u us, "
+                       "max. block erase timeout: %u ms, max. chip erase timeout: %u ms",
+                       (1 << cfi_info->word_write_timeout_max) * (1 << cfi_info->word_write_timeout_typ),
+                       (1 << cfi_info->buf_write_timeout_max) * (1 << cfi_info->buf_write_timeout_typ),
+                       (1 << cfi_info->block_erase_timeout_max) * (1 << cfi_info->block_erase_timeout_typ),
+                       (1 << cfi_info->chip_erase_timeout_max) * (1 << cfi_info->chip_erase_timeout_typ));
+
+       /* convert timeouts to real values in ms */
+       cfi_info->word_write_timeout = DIV_ROUND_UP((1L << cfi_info->word_write_timeout_typ) *
+                               (1L << cfi_info->word_write_timeout_max), 1000);
+       cfi_info->buf_write_timeout = DIV_ROUND_UP((1L << cfi_info->buf_write_timeout_typ) *
+                               (1L << cfi_info->buf_write_timeout_max), 1000);
+       cfi_info->block_erase_timeout = (1L << cfi_info->block_erase_timeout_typ) *
+                               (1L << cfi_info->block_erase_timeout_max);
+       cfi_info->chip_erase_timeout = (1L << cfi_info->chip_erase_timeout_typ) *
+                               (1L << cfi_info->chip_erase_timeout_max);
+
+       LOG_DEBUG("calculated word write timeout: %u ms, buf write timeout: %u ms, "
+                       "block erase timeout: %u ms, chip erase timeout: %u ms",
+                       cfi_info->word_write_timeout, cfi_info->buf_write_timeout,
+                       cfi_info->block_erase_timeout, cfi_info->chip_erase_timeout);
+
        /* apply fixups depending on the primary command set */
        switch (cfi_info->pri_id)
        {
@@ -2851,77 +2858,74 @@ static int get_cfi_info(struct flash_bank *bank, char *buf, int buf_size)
        }
 
        if (cfi_info->not_cfi == 0)
-               printed = snprintf(buf, buf_size, "\ncfi information:\n");
+               printed = snprintf(buf, buf_size, "\nCFI flash: ");
        else
-               printed = snprintf(buf, buf_size, "\nnon-cfi flash:\n");
+               printed = snprintf(buf, buf_size, "\nnon-CFI flash: ");
        buf += printed;
        buf_size -= printed;
 
-       printed = snprintf(buf, buf_size, "\nmfr: 0x%4.4x, id:0x%4.4x\n",
+       printed = snprintf(buf, buf_size, "mfr: 0x%4.4x, id:0x%4.4x\n\n",
                cfi_info->manufacturer, cfi_info->device_id);
        buf += printed;
        buf_size -= printed;
 
-       if (cfi_info->not_cfi == 0)
-       {
-               printed = snprintf(buf, buf_size, "qry: '%c%c%c', pri_id: 0x%4.4x, pri_addr: "
-                               "0x%4.4x, alt_id: 0x%4.4x, alt_addr: 0x%4.4x\n",
-                               cfi_info->qry[0], cfi_info->qry[1], cfi_info->qry[2],
-                               cfi_info->pri_id, cfi_info->pri_addr, cfi_info->alt_id, cfi_info->alt_addr);
-               buf += printed;
-               buf_size -= printed;
-
-               printed = snprintf(buf, buf_size, "Vcc min: %x.%x, Vcc max: %x.%x, "
-                               "Vpp min: %u.%x, Vpp max: %u.%x\n",
-                               (cfi_info->vcc_min & 0xf0) >> 4, cfi_info->vcc_min & 0x0f,
-                               (cfi_info->vcc_max & 0xf0) >> 4, cfi_info->vcc_max & 0x0f,
-                               (cfi_info->vpp_min & 0xf0) >> 4, cfi_info->vpp_min & 0x0f,
-                               (cfi_info->vpp_max & 0xf0) >> 4, cfi_info->vpp_max & 0x0f);
-               buf += printed;
-               buf_size -= printed;
-
-               printed = snprintf(buf, buf_size, "typ. word write timeout: %u us, "
-                               "typ. buf write timeout: %u us, "
-                               "typ. block erase timeout: %u ms, "
-                               "typ. chip erase timeout: %u ms\n",
-                               1 << cfi_info->word_write_timeout_typ,
-                               1 << cfi_info->buf_write_timeout_typ,
-                               1 << cfi_info->block_erase_timeout_typ,
-                               1 << cfi_info->chip_erase_timeout_typ);
-               buf += printed;
-               buf_size -= printed;
-
-               printed = snprintf(buf, buf_size, "max. word write timeout: %u us, "
-                               "max. buf write timeout: %u us, max. "
-                               "block erase timeout: %u ms, max. chip erase timeout: %u ms\n",
-                               (1 << cfi_info->word_write_timeout_max) * (1 << cfi_info->word_write_timeout_typ),
-                               (1 << cfi_info->buf_write_timeout_max) * (1 << cfi_info->buf_write_timeout_typ),
-                               (1 << cfi_info->block_erase_timeout_max) * (1 << cfi_info->block_erase_timeout_typ),
-                               (1 << cfi_info->chip_erase_timeout_max) * (1 << cfi_info->chip_erase_timeout_typ));
-               buf += printed;
-               buf_size -= printed;
-
-               printed = snprintf(buf, buf_size, "size: 0x%" PRIx32 ", interface desc: %i, "
-                               "max buffer write size: 0x%x\n",
-                               cfi_info->dev_size,
-                               cfi_info->interface_desc,
-                               1 << cfi_info->max_buf_write_size);
-               buf += printed;
-               buf_size -= printed;
+       printed = snprintf(buf, buf_size, "qry: '%c%c%c', pri_id: 0x%4.4x, pri_addr: "
+                       "0x%4.4x, alt_id: 0x%4.4x, alt_addr: 0x%4.4x\n",
+                       cfi_info->qry[0], cfi_info->qry[1], cfi_info->qry[2],
+                       cfi_info->pri_id, cfi_info->pri_addr, cfi_info->alt_id, cfi_info->alt_addr);
+       buf += printed;
+       buf_size -= printed;
 
-               switch (cfi_info->pri_id)
-               {
-                       case 1:
-                       case 3:
-                               cfi_intel_info(bank, buf, buf_size);
-                               break;
-                       case 2:
-                               cfi_spansion_info(bank, buf, buf_size);
-                               break;
-                       default:
-                               LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-                               break;
-               }
+       printed = snprintf(buf, buf_size, "Vcc min: %x.%x, Vcc max: %x.%x, "
+                       "Vpp min: %u.%x, Vpp max: %u.%x\n",
+                       (cfi_info->vcc_min & 0xf0) >> 4, cfi_info->vcc_min & 0x0f,
+                       (cfi_info->vcc_max & 0xf0) >> 4, cfi_info->vcc_max & 0x0f,
+                       (cfi_info->vpp_min & 0xf0) >> 4, cfi_info->vpp_min & 0x0f,
+                       (cfi_info->vpp_max & 0xf0) >> 4, cfi_info->vpp_max & 0x0f);
+       buf += printed;
+       buf_size -= printed;
+
+       printed = snprintf(buf, buf_size, "typ. word write timeout: %u us, "
+                       "typ. buf write timeout: %u us, "
+                       "typ. block erase timeout: %u ms, "
+                       "typ. chip erase timeout: %u ms\n",
+                       1 << cfi_info->word_write_timeout_typ,
+                       1 << cfi_info->buf_write_timeout_typ,
+                       1 << cfi_info->block_erase_timeout_typ,
+                       1 << cfi_info->chip_erase_timeout_typ);
+       buf += printed;
+       buf_size -= printed;
+
+       printed = snprintf(buf, buf_size, "max. word write timeout: %u us, "
+                       "max. buf write timeout: %u us, max. "
+                       "block erase timeout: %u ms, max. chip erase timeout: %u ms\n",
+                       (1 << cfi_info->word_write_timeout_max) * (1 << cfi_info->word_write_timeout_typ),
+                       (1 << cfi_info->buf_write_timeout_max) * (1 << cfi_info->buf_write_timeout_typ),
+                       (1 << cfi_info->block_erase_timeout_max) * (1 << cfi_info->block_erase_timeout_typ),
+                       (1 << cfi_info->chip_erase_timeout_max) * (1 << cfi_info->chip_erase_timeout_typ));
+       buf += printed;
+       buf_size -= printed;
+
+       printed = snprintf(buf, buf_size, "size: 0x%" PRIx32 ", interface desc: %i, "
+                       "max buffer write size: 0x%x\n",
+                       cfi_info->dev_size,
+                       cfi_info->interface_desc,
+                       1 << cfi_info->max_buf_write_size);
+       buf += printed;
+       buf_size -= printed;
+
+       switch (cfi_info->pri_id)
+       {
+               case 1:
+               case 3:
+                       cfi_intel_info(bank, buf, buf_size);
+                       break;
+               case 2:
+                       cfi_spansion_info(bank, buf, buf_size);
+                       break;
+               default:
+                       LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+                       break;
        }
 
        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)