zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm_adi_v5: Clean up dap info command 

Reduce use of magic numbers and add AXI type MEM-AP detection. Don't try
to call dap_rom_display on a non-existent AP.

AP identification is unique per designer, so make sure the JEDEC code
matches ARM when interpreting the AP type.

Change-Id: I8e86b7de61811382afe99bf15094ab71b43f5fdf
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3150
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
__archive__
Andreas Fritiofson 2015-12-06 13:06:12 +01:00
parent 8a069b7b90
commit c6ce183055
2 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/target/arm_adi_v5.c
View File

@ -835,8 +835,8 @@ int dap_find_ap(struct adiv5_dap *dap, enum ap_type type_to_find, struct adiv5_a
* but just to be sure, try to continue searching if an error does happen. * but just to be sure, try to continue searching if an error does happen.
*/ */
if ((retval == ERROR_OK) && /* Register read success */ if ((retval == ERROR_OK) && /* Register read success */
((id_val & 0x0FFF0000) == 0x04770000) && /* Jedec codes match */ ((id_val & IDR_JEP106) == IDR_JEP106_ARM) && /* Jedec codes match */
((id_val & 0xF) == type_to_find)) { /* type matches*/ ((id_val & IDR_TYPE) == type_to_find)) { /* type matches*/
LOG_DEBUG("Found %s at AP index: %d (IDR=0x%08" PRIX32 ")", LOG_DEBUG("Found %s at AP index: %d (IDR=0x%08" PRIX32 ")",
(type_to_find == AP_TYPE_AHB_AP) ? "AHB-AP" : (type_to_find == AP_TYPE_AHB_AP) ? "AHB-AP" :
@ -1417,53 +1417,53 @@ static int dap_rom_display(struct command_context *cmd_ctx,
static int dap_info_command(struct command_context *cmd_ctx, static int dap_info_command(struct command_context *cmd_ctx,
struct adiv5_ap *ap) struct adiv5_ap *ap)
{ {
struct adiv5_dap *dap = ap->dap;
int retval; int retval;
uint32_t dbgbase, apid; uint32_t dbgbase, apid;
int romtable_present = 0; int romtable_present = 0;
uint8_t mem_ap; uint8_t mem_ap;
uint32_t ap_old;
/* Now we read ROM table ID registers, ref. ARM IHI 0029B sec */
retval = dap_get_debugbase(ap, &dbgbase, &apid); retval = dap_get_debugbase(ap, &dbgbase, &apid);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
ap_old = dap_ap_get_select(dap);
dap_ap_select(dap, ap->ap_num);
/* Now we read ROM table ID registers, ref. ARM IHI 0029B sec */
mem_ap = ((apid&0x10000) && ((apid&0x0F) != 0));
command_print(cmd_ctx, "AP ID register 0x%8.8" PRIx32, apid); command_print(cmd_ctx, "AP ID register 0x%8.8" PRIx32, apid);
if (apid) { if (apid == 0) {
switch (apid&0x0F) {
case 0:
command_print(cmd_ctx, "\tType is JTAG-AP");
break;
case 1:
command_print(cmd_ctx, "\tType is MEM-AP AHB");
break;
case 2:
command_print(cmd_ctx, "\tType is MEM-AP APB");
break;
default:
command_print(cmd_ctx, "\tUnknown AP type");
break;
}
/* NOTE: a MEM-AP may have a single CoreSight component that's
* not a ROM table ... or have no such components at all.
*/
if (mem_ap)
command_print(cmd_ctx, "AP BASE 0x%8.8" PRIx32, dbgbase);
} else
command_print(cmd_ctx, "No AP found at this ap 0x%x", ap->ap_num); command_print(cmd_ctx, "No AP found at this ap 0x%x", ap->ap_num);
return ERROR_FAIL;
}
romtable_present = ((mem_ap) && (dbgbase != 0xFFFFFFFF)); switch (apid & (IDR_JEP106 | IDR_TYPE)) {
if (romtable_present) case IDR_JEP106_ARM | AP_TYPE_JTAG_AP:
dap_rom_display(cmd_ctx, ap, dbgbase, 0); command_print(cmd_ctx, "\tType is JTAG-AP");
else break;
command_print(cmd_ctx, "\tNo ROM table present"); case IDR_JEP106_ARM | AP_TYPE_AHB_AP:
dap_ap_select(dap, ap_old); command_print(cmd_ctx, "\tType is MEM-AP AHB");
break;
case IDR_JEP106_ARM | AP_TYPE_APB_AP:
command_print(cmd_ctx, "\tType is MEM-AP APB");
break;
case IDR_JEP106_ARM | AP_TYPE_AXI_AP:
command_print(cmd_ctx, "\tType is MEM-AP AXI");
break;
default:
command_print(cmd_ctx, "\tUnknown AP type");
break;
}
/* NOTE: a MEM-AP may have a single CoreSight component that's
* not a ROM table ... or have no such components at all.
*/
mem_ap = (apid & IDR_CLASS) == AP_CLASS_MEM_AP;
if (mem_ap) {
command_print(cmd_ctx, "MEM-AP BASE 0x%8.8" PRIx32, dbgbase);
romtable_present = dbgbase != 0xFFFFFFFF;
if (romtable_present)
dap_rom_display(cmd_ctx, ap, dbgbase, 0);
else
command_print(cmd_ctx, "\tNo ROM table present");
}
return ERROR_OK; return ERROR_OK;
} }

17
src/target/arm_adi_v5.h
View File

@ -122,6 +122,15 @@
#define CSW_SPROT (1UL << 30) #define CSW_SPROT (1UL << 30)
#define CSW_DBGSWENABLE (1UL << 31) #define CSW_DBGSWENABLE (1UL << 31)
/* Fields of the MEM-AP's IDR register */
#define IDR_REV (0xFUL << 28)
#define IDR_JEP106 (0x7FFUL << 17)
#define IDR_CLASS (0xFUL << 13)
#define IDR_VARIANT (0xFUL << 4)
#define IDR_TYPE (0xFUL << 0)
#define IDR_JEP106_ARM 0x04760000
/** /**
* This represents an ARM Debug Interface (v5) Access Port (AP). * This represents an ARM Debug Interface (v5) Access Port (AP).
* Most common is a MEM-AP, for memory access. * Most common is a MEM-AP, for memory access.
@ -275,6 +284,14 @@ struct dap_ops {
int (*run)(struct adiv5_dap *dap); int (*run)(struct adiv5_dap *dap);
}; };
/*
* Access Port classes
*/
enum ap_class {
AP_CLASS_NONE = 0x00000, /* No class defined */
AP_CLASS_MEM_AP = 0x10000, /* MEM-AP */
};
/* /*
* Access Port types * Access Port types
*/ */