Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
target/arm_adi_v5, cortex_m: retry ahbap_debugport_init few times in case of an error
[openocd.git] / src / target / arm_adi_v5.c
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 1c80fcc2f53bae2469ebeac09aafc0cff3651a53..3df39f9edb2908ef27dd6e7415ffdd989b503822 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -619,6 +619,8 @@ int mem_ap_sel_write_buf_noincr(struct adiv5_dap *swjdp, uint8_t ap,
 /*--------------------------------------------------------------------------*/
 
 
+#define DAP_POWER_DOMAIN_TIMEOUT (10)
+
 /* FIXME don't import ... just initialize as
  * part of DAP transport setup
 */
@@ -640,8 +642,8 @@ extern const struct dap_ops jtag_dp_ops;
  */
 int ahbap_debugport_init(struct adiv5_dap *dap)
 {
-       uint32_t ctrlstat;
-       int cnt = 0;
+       /* check that we support packed transfers */
+       uint32_t csw, cfg;
        int retval;
 
        LOG_DEBUG(" ");
@@ -661,84 +663,76 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
         */
        dap->ap_current = !0;
        dap_ap_select(dap, 0);
+       dap->last_read = NULL;
 
-       /* DP initialization */
+       for (size_t i = 0; i < 10; i++) {
+               /* DP initialization */
 
-       retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
-       if (retval != ERROR_OK)
-               return retval;
+               dap->dp_bank_value = 0;
 
-       retval = dap_queue_dp_write(dap, DP_CTRL_STAT, SSTICKYERR);
-       if (retval != ERROR_OK)
-               return retval;
+               retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
+               if (retval != ERROR_OK)
+                       continue;
 
-       retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
-       if (retval != ERROR_OK)
-               return retval;
+               retval = dap_queue_dp_write(dap, DP_CTRL_STAT, SSTICKYERR);
+               if (retval != ERROR_OK)
+                       continue;
 
-       dap->dp_ctrl_stat = CDBGPWRUPREQ | CSYSPWRUPREQ;
-       retval = dap_queue_dp_write(dap, DP_CTRL_STAT, dap->dp_ctrl_stat);
-       if (retval != ERROR_OK)
-               return retval;
+               retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
+               if (retval != ERROR_OK)
+                       continue;
 
-       retval = dap_queue_dp_read(dap, DP_CTRL_STAT, &ctrlstat);
-       if (retval != ERROR_OK)
-               return retval;
-       retval = dap_run(dap);
-       if (retval != ERROR_OK)
-               return retval;
+               dap->dp_ctrl_stat = CDBGPWRUPREQ | CSYSPWRUPREQ;
+               retval = dap_queue_dp_write(dap, DP_CTRL_STAT, dap->dp_ctrl_stat);
+               if (retval != ERROR_OK)
+                       continue;
 
-       /* Check that we have debug power domains activated */
-       while (!(ctrlstat & CDBGPWRUPACK) && (cnt++ < 10)) {
+               /* Check that we have debug power domains activated */
                LOG_DEBUG("DAP: wait CDBGPWRUPACK");
-               retval = dap_queue_dp_read(dap, DP_CTRL_STAT, &ctrlstat);
+               retval = dap_dp_poll_register(dap, DP_CTRL_STAT,
+                                             CDBGPWRUPACK, CDBGPWRUPACK,
+                                             DAP_POWER_DOMAIN_TIMEOUT);
                if (retval != ERROR_OK)
-                       return retval;
-               retval = dap_run(dap);
-               if (retval != ERROR_OK)
-                       return retval;
-               alive_sleep(10);
-       }
+                       continue;
 
-       while (!(ctrlstat & CSYSPWRUPACK) && (cnt++ < 10)) {
                LOG_DEBUG("DAP: wait CSYSPWRUPACK");
-               retval = dap_queue_dp_read(dap, DP_CTRL_STAT, &ctrlstat);
+               retval = dap_dp_poll_register(dap, DP_CTRL_STAT,
+                                             CSYSPWRUPACK, CSYSPWRUPACK,
+                                             DAP_POWER_DOMAIN_TIMEOUT);
                if (retval != ERROR_OK)
-                       return retval;
-               retval = dap_run(dap);
+                       continue;
+
+               retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
                if (retval != ERROR_OK)
-                       return retval;
-               alive_sleep(10);
-       }
+                       continue;
+               /* With debug power on we can activate OVERRUN checking */
+               dap->dp_ctrl_stat = CDBGPWRUPREQ | CSYSPWRUPREQ | CORUNDETECT;
+               retval = dap_queue_dp_write(dap, DP_CTRL_STAT, dap->dp_ctrl_stat);
+               if (retval != ERROR_OK)
+                       continue;
+               retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
+               if (retval != ERROR_OK)
+                       continue;
 
-       retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
-       if (retval != ERROR_OK)
-               return retval;
-       /* With debug power on we can activate OVERRUN checking */
-       dap->dp_ctrl_stat = CDBGPWRUPREQ | CSYSPWRUPREQ | CORUNDETECT;
-       retval = dap_queue_dp_write(dap, DP_CTRL_STAT, dap->dp_ctrl_stat);
-       if (retval != ERROR_OK)
-               return retval;
-       retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
-       if (retval != ERROR_OK)
-               return retval;
+               retval = dap_setup_accessport(dap, CSW_8BIT | CSW_ADDRINC_PACKED, 0);
+               if (retval != ERROR_OK)
+                       continue;
 
-       /* check that we support packed transfers */
-       uint32_t csw, cfg;
+               retval = dap_queue_ap_read(dap, AP_REG_CSW, &csw);
+               if (retval != ERROR_OK)
+                       continue;
 
-       retval = dap_setup_accessport(dap, CSW_8BIT | CSW_ADDRINC_PACKED, 0);
-       if (retval != ERROR_OK)
-               return retval;
+               retval = dap_queue_ap_read(dap, AP_REG_CFG, &cfg);
+               if (retval != ERROR_OK)
+                       continue;
 
-       retval = dap_queue_ap_read(dap, AP_REG_CSW, &csw);
-       if (retval != ERROR_OK)
-               return retval;
+               retval = dap_run(dap);
+               if (retval != ERROR_OK)
+                       continue;
 
-       retval = dap_queue_ap_read(dap, AP_REG_CFG, &cfg);
-       if (retval != ERROR_OK)
-               return retval;
+               break;
+       }
 
-       retval = dap_run(dap);
        if (retval != ERROR_OK)
                return retval;
 
@@ -841,11 +835,10 @@ int dap_find_ap(struct adiv5_dap *dap, enum ap_type type_to_find, uint8_t *ap_nu
 }
 
 int dap_get_debugbase(struct adiv5_dap *dap, int ap,
-                       uint32_t *out_dbgbase, uint32_t *out_apid)
+                       uint32_t *dbgbase, uint32_t *apid)
 {
        uint32_t ap_old;
        int retval;
-       uint32_t dbgbase, apid;
 
        /* AP address is in bits 31:24 of DP_SELECT */
        if (ap >= 256)
@@ -854,46 +847,32 @@ int dap_get_debugbase(struct adiv5_dap *dap, int ap,
        ap_old = dap->ap_current;
        dap_ap_select(dap, ap);
 
-       retval = dap_queue_ap_read(dap, AP_REG_BASE, &dbgbase);
+       retval = dap_queue_ap_read(dap, AP_REG_BASE, dbgbase);
        if (retval != ERROR_OK)
                return retval;
-       retval = dap_queue_ap_read(dap, AP_REG_IDR, &apid);
+       retval = dap_queue_ap_read(dap, AP_REG_IDR, apid);
        if (retval != ERROR_OK)
                return retval;
        retval = dap_run(dap);
        if (retval != ERROR_OK)
                return retval;
 
-       /* Excavate the device ID code */
-       struct jtag_tap *tap = dap->jtag_info->tap;
-       while (tap != NULL) {
-               if (tap->hasidcode)
-                       break;
-               tap = tap->next_tap;
-       }
-       if (tap == NULL || !tap->hasidcode)
-               return ERROR_OK;
-
        dap_ap_select(dap, ap_old);
 
-       /* The asignment happens only here to prevent modification of these
-        * values before they are certain. */
-       *out_dbgbase = dbgbase;
-       *out_apid = apid;
-
        return ERROR_OK;
 }
 
 int dap_lookup_cs_component(struct adiv5_dap *dap, int ap,
-                       uint32_t dbgbase, uint8_t type, uint32_t *addr)
+                       uint32_t dbgbase, uint8_t type, uint32_t *addr, int32_t *idx)
 {
        uint32_t ap_old;
        uint32_t romentry, entry_offset = 0, component_base, devtype;
-       int retval = ERROR_FAIL;
+       int retval;
 
        if (ap >= 256)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
+       *addr = 0;
        ap_old = dap->ap_current;
        dap_ap_select(dap, ap);
 
@@ -907,15 +886,33 @@ int dap_lookup_cs_component(struct adiv5_dap *dap, int ap,
                        + (romentry & 0xFFFFF000);
 
                if (romentry & 0x1) {
+                       uint32_t c_cid1;
+                       retval = mem_ap_read_atomic_u32(dap, component_base | 0xff4, &c_cid1);
+                       if (retval != ERROR_OK) {
+                               LOG_ERROR("Can't read component with base address 0x%" PRIx32
+                                         ", the corresponding core might be turned off", component_base);
+                               return retval;
+                       }
+                       if (((c_cid1 >> 4) & 0x0f) == 1) {
+                               retval = dap_lookup_cs_component(dap, ap, component_base,
+                                                       type, addr, idx);
+                               if (retval == ERROR_OK)
+                                       break;
+                               if (retval != ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
+                                       return retval;
+                       }
+
                        retval = mem_ap_read_atomic_u32(dap,
                                        (component_base & 0xfffff000) | 0xfcc,
                                        &devtype);
                        if (retval != ERROR_OK)
                                return retval;
                        if ((devtype & 0xff) == type) {
-                               *addr = component_base;
-                               retval = ERROR_OK;
-                               break;
+                               if (!*idx) {
+                                       *addr = component_base;
+                                       break;
+                               } else
+                                       (*idx)--;
                        }
                }
                entry_offset += 4;
@@ -923,7 +920,10 @@ int dap_lookup_cs_component(struct adiv5_dap *dap, int ap,
 
        dap_ap_select(dap, ap_old);
 
-       return retval;
+       if (!*addr)
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+
+       return ERROR_OK;
 }
 
 static int dap_rom_display(struct command_context *cmd_ctx,
@@ -993,7 +993,7 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                        uint32_t c_pid0, c_pid1, c_pid2, c_pid3, c_pid4;
                        uint32_t component_base;
                        unsigned part_num;
-                       char *type, *full;
+                       const char *type, *full;
 
                        component_base = (dbgbase & 0xFFFFF000) + (romentry & 0xFFFFF000);
 
@@ -1052,7 +1052,7 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                        if (((c_cid1 >> 4) & 0x0f) == 9) {
                                uint32_t devtype;
                                unsigned minor;
-                               char *major = "Reserved", *subtype = "Reserved";
+                               const char *major = "Reserved", *subtype = "Reserved";
 
                                retval = mem_ap_read_atomic_u32(dap,
                                                (component_base & 0xfffff000) | 0xfcc,
@@ -1084,6 +1084,9 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                        case 2:
                                                subtype = "Buffer";
                                                break;
+                                       case 3:
+                                               subtype = "Router";
+                                               break;
                                        }
                                        break;
                                case 2:
@@ -1121,6 +1124,9 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                        case 4:
                                                subtype = "Bus";
                                                break;
+                                       case 6:
+                                               subtype = "Software";
+                                               break;
                                        }
                                        break;
                                case 4:
@@ -1135,6 +1141,9 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                        case 2:
                                                subtype = "Debug Auth";
                                                break;
+                                       case 3:
+                                               subtype = "Power Requestor";
+                                               break;
                                        }
                                        break;
                                case 5:
@@ -1152,6 +1161,35 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                        case 3:
                                                subtype = "Engine/Coprocessor";
                                                break;
+                                       case 4:
+                                               subtype = "Bus";
+                                               break;
+                                       case 5:
+                                               subtype = "Memory";
+                                               break;
+                                       }
+                                       break;
+                               case 6:
+                                       major = "Perfomance Monitor";
+                                       switch (minor) {
+                                       case 0:
+                                               subtype = "other";
+                                               break;
+                                       case 1:
+                                               subtype = "Processor";
+                                               break;
+                                       case 2:
+                                               subtype = "DSP";
+                                               break;
+                                       case 3:
+                                               subtype = "Engine/Coprocessor";
+                                               break;
+                                       case 4:
+                                               subtype = "Bus";
+                                               break;
+                                       case 5:
+                                               subtype = "Memory";
+                                               break;
                                        }
                                        break;
                                }
@@ -1202,6 +1240,18 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                type = "Cortex-M3 FBP";
                                full = "(Flash Patch and Breakpoint)";
                                break;
+                       case 0x008:
+                               type = "Cortex-M0 SCS";
+                               full = "(System Control Space)";
+                               break;
+                       case 0x00a:
+                               type = "Cortex-M0 DWT";
+                               full = "(Data Watchpoint and Trace)";
+                               break;
+                       case 0x00b:
+                               type = "Cortex-M0 BPU";
+                               full = "(Breakpoint Unit)";
+                               break;
                        case 0x00c:
                                type = "Cortex-M4 SCS";
                                full = "(System Control Space)";
@@ -1243,6 +1293,18 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                type = "Coresight ITM";
                                full = "(Instrumentation Trace Macrocell)";
                                break;
+                       case 0x914:
+                               type = "Coresight SWO";
+                               full = "(Single Wire Output)";
+                               break;
+                       case 0x917:
+                               type = "Coresight HTM";
+                               full = "(AHB Trace Macrocell)";
+                               break;
+                       case 0x920:
+                               type = "CoreSight ETM11";
+                               full = "(Embedded Trace)";
+                               break;
                        case 0x921:
                                type = "Cortex-A8 ETM";
                                full = "(Embedded Trace)";
@@ -1271,6 +1333,14 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                type = "CoreSight Component";
                                full = "(unidentified Cortex-A9 component)";
                                break;
+                       case 0x961:
+                               type = "CoreSight TMC";
+                               full = "(Trace Memory Controller)";
+                               break;
+                       case 0x962:
+                               type = "CoreSight STM";
+                               full = "(System Trace Macrocell)";
+                               break;
                        case 0x9a0:
                                type = "CoreSight PMU";
                                full = "(Performance Monitoring Unit)";
@@ -1279,6 +1349,14 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                type = "Cortex-M4 TPUI";
                                full = "(Trace Port Interface Unit)";
                                break;
+                       case 0x9a5:
+                               type = "Cortex-A5 ETM";
+                               full = "(Embedded Trace)";
+                               break;
+                       case 0xc05:
+                               type = "Cortex-A5 Debug";
+                               full = "(Debug Unit)";
+                               break;
                        case 0xc08:
                                type = "Cortex-A8 Debug";
                                full = "(Debug Unit)";
@@ -1287,7 +1365,12 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                type = "Cortex-A9 Debug";
                                full = "(Debug Unit)";
                                break;
+                       case 0x4af:
+                               type = "Cortex-A15 Debug";
+                               full = "(Debug Unit)";
+                               break;
                        default:
+                               LOG_DEBUG("Unrecognized Part number 0x%" PRIx32, part_num);
                                type = "-*- unrecognized -*-";
                                full = "";
                                break;
@@ -1316,7 +1399,7 @@ static int dap_info_command(struct command_context *cmd_ctx,
                struct adiv5_dap *dap, int ap)
 {
        int retval;
-       uint32_t dbgbase = 0, apid = 0; /* Silence gcc by initializing */
+       uint32_t dbgbase, apid;
        int romtable_present = 0;
        uint8_t mem_ap;
        uint32_t ap_old;
@@ -1356,9 +1439,9 @@ static int dap_info_command(struct command_context *cmd_ctx,
                command_print(cmd_ctx, "No AP found at this ap 0x%x", ap);
 
        romtable_present = ((mem_ap) && (dbgbase != 0xFFFFFFFF));
-       if (romtable_present) {
+       if (romtable_present)
                dap_rom_display(cmd_ctx, dap, ap, dbgbase, 0);
-       } else
+       else
                command_print(cmd_ctx, "\tNo ROM table present");
        dap_ap_select(dap, ap_old);
 
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)