target: arm_adi_v5: added types and subtypes based on latest coresight documentation

[fw/openocd] / src / target / arm_adi_v5.c

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 1c80fcc2f53bae2469ebeac09aafc0cff3651a53..2154c0e72ab23aec453d0276d2bad06b3e8a3eb7 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,6 @@ extern const struct dap_ops jtag_dp_ops;
  */
 int ahbap_debugport_init(struct adiv5_dap *dap)
 {
-       uint32_t ctrlstat;
-       int cnt = 0;
        int retval;
 
        LOG_DEBUG(" ");
@@ -681,36 +681,21 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
        if (retval != ERROR_OK)
                return retval;
 
-       retval = dap_queue_dp_read(dap, DP_CTRL_STAT, &ctrlstat);
+       /* Check that we have debug power domains activated */
+       LOG_DEBUG("DAP: wait CDBGPWRUPACK");
+       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);
+
+       LOG_DEBUG("DAP: wait CSYSPWRUPACK");
+       retval = dap_dp_poll_register(dap, DP_CTRL_STAT,
+                                     CSYSPWRUPACK, CSYSPWRUPACK,
+                                     DAP_POWER_DOMAIN_TIMEOUT);
        if (retval != ERROR_OK)
                return retval;
 
-       /* Check that we have debug power domains activated */
-       while (!(ctrlstat & CDBGPWRUPACK) && (cnt++ < 10)) {
-               LOG_DEBUG("DAP: wait CDBGPWRUPACK");
-               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;
-               alive_sleep(10);
-       }
-
-       while (!(ctrlstat & CSYSPWRUPACK) && (cnt++ < 10)) {
-               LOG_DEBUG("DAP: wait CSYSPWRUPACK");
-               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;
-               alive_sleep(10);
-       }
-
        retval = dap_queue_dp_read(dap, DP_CTRL_STAT, NULL);
        if (retval != ERROR_OK)
                return retval;
@@ -1084,6 +1069,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 +1109,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 +1126,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 +1146,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;
                                }
@@ -1243,6 +1266,14 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                type = "Coresight ITM";
                                full = "(Instrumentation Trace Macrocell)";
                                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 +1302,10 @@ static int dap_rom_display(struct command_context *cmd_ctx,
                                type = "CoreSight Component";
                                full = "(unidentified Cortex-A9 component)";
                                break;
+                       case 0x962:
+                               type = "CoreSight STM";
+                               full = "(System Trace Macrocell)";
+                               break;
                        case 0x9a0:
                                type = "CoreSight PMU";
                                full = "(Performance Monitoring Unit)";