interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm_adi_v5: Convert the AP references from numbers to pointers 

Change the debug_ap and memory_ap fields of the cortex_a target and
the debug_ap field of the cortex_m target to be pointers to the
struct adiv5_ap instead of AP numbers in some known DAP.

This reduces the dependency on the DAP struct in the targets and
enables MEM-AP accesses to take the relevant AP as parameter.

Change-Id: I39d7b134d78000564b7eec5bff464adf0ef89147
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3147
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
This commit is contained in:
Andreas Fritiofson 2015-12-06 01:34:09 +01:00
parent beb843d28d
commit 557aa6dc5c
8 changed files with 144 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/flash/nor/at91sam4l.c
View File

@ -660,14 +660,14 @@ COMMAND_HANDLER(sam4l_handle_reset_deassert)
* After vectreset SMAP release is not needed however makes no harm * After vectreset SMAP release is not needed however makes no harm
*/ */
if (target->reset_halt && (jtag_reset_config & RESET_HAS_SRST)) { if (target->reset_halt && (jtag_reset_config & RESET_HAS_SRST)) {
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, DBGKEY | C_HALT | C_DEBUGEN); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, DBGKEY | C_HALT | C_DEBUGEN);
if (retval == ERROR_OK) if (retval == ERROR_OK)
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR,
TRCENA | VC_HARDERR | VC_BUSERR | VC_CORERESET); TRCENA | VC_HARDERR | VC_BUSERR | VC_CORERESET);
/* do not return on error here, releasing SMAP reset is more important */ /* do not return on error here, releasing SMAP reset is more important */
} }
int retval2 = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, SMAP_SCR, SMAP_SCR_HCR); int retval2 = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, SMAP_SCR, SMAP_SCR_HCR);
if (retval2 != ERROR_OK) if (retval2 != ERROR_OK)
return retval2; return retval2;

4
src/flash/nor/at91samd.c
View File

@ -1000,9 +1000,9 @@ COMMAND_HANDLER(samd_handle_reset_deassert)
* After vectreset DSU release is not needed however makes no harm * After vectreset DSU release is not needed however makes no harm
*/ */
if (target->reset_halt && (jtag_reset_config & RESET_HAS_SRST)) { if (target->reset_halt && (jtag_reset_config & RESET_HAS_SRST)) {
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, DBGKEY | C_HALT | C_DEBUGEN); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, DBGKEY | C_HALT | C_DEBUGEN);
if (retval == ERROR_OK) if (retval == ERROR_OK)
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR,
TRCENA | VC_HARDERR | VC_BUSERR | VC_CORERESET); TRCENA | VC_HARDERR | VC_BUSERR | VC_CORERESET);
/* do not return on error here, releasing DSU reset is more important */ /* do not return on error here, releasing DSU reset is more important */
} }

12
src/target/arm_adi_v5.c
View File

@ -804,16 +804,16 @@ static bool is_dap_cid_ok(uint32_t cid3, uint32_t cid2, uint32_t cid1, uint32_t
/* /*
* This function checks the ID for each access port to find the requested Access Port type * This function checks the ID for each access port to find the requested Access Port type
*/ */
int dap_find_ap(struct adiv5_dap *dap, enum ap_type type_to_find, uint8_t *ap_num_out) int dap_find_ap(struct adiv5_dap *dap, enum ap_type type_to_find, struct adiv5_ap **ap_out)
{ {
int ap; int ap_num;
/* Maximum AP number is 255 since the SELECT register is 8 bits */ /* Maximum AP number is 255 since the SELECT register is 8 bits */
for (ap = 0; ap <= 255; ap++) { for (ap_num = 0; ap_num <= 255; ap_num++) {
/* read the IDR register of the Access Port */ /* read the IDR register of the Access Port */
uint32_t id_val = 0; uint32_t id_val = 0;
dap_ap_select(dap, ap); dap_ap_select(dap, ap_num);
int retval = dap_queue_ap_read(dap, AP_REG_IDR, &id_val); int retval = dap_queue_ap_read(dap, AP_REG_IDR, &id_val);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -843,9 +843,9 @@ int dap_find_ap(struct adiv5_dap *dap, enum ap_type type_to_find, uint8_t *ap_nu
(type_to_find == AP_TYPE_APB_AP) ? "APB-AP" : (type_to_find == AP_TYPE_APB_AP) ? "APB-AP" :
(type_to_find == AP_TYPE_AXI_AP) ? "AXI-AP" : (type_to_find == AP_TYPE_AXI_AP) ? "AXI-AP" :
(type_to_find == AP_TYPE_JTAG_AP) ? "JTAG-AP" : "Unknown", (type_to_find == AP_TYPE_JTAG_AP) ? "JTAG-AP" : "Unknown",
ap, id_val); ap_num, id_val);
*ap_num_out = ap; *ap_out = &dap->ap[ap_num];
return ERROR_OK; return ERROR_OK;
} }
} }

2
src/target/arm_adi_v5.h
View File

@ -480,7 +480,7 @@ int dap_get_debugbase(struct adiv5_dap *dap, int ap,
/* Probe Access Ports to find a particular type */ /* Probe Access Ports to find a particular type */
int dap_find_ap(struct adiv5_dap *dap, int dap_find_ap(struct adiv5_dap *dap,
enum ap_type type_to_find, enum ap_type type_to_find,
uint8_t *ap_num_out); struct adiv5_ap **ap_out);
/* Lookup CoreSight component */ /* Lookup CoreSight component */
int dap_lookup_cs_component(struct adiv5_dap *dap, int ap, int dap_lookup_cs_component(struct adiv5_dap *dap, int ap,

4
src/target/armv7a.h
View File

@ -107,8 +107,8 @@ struct armv7a_common {
/* Core Debug Unit */ /* Core Debug Unit */
struct arm_dpm dpm; struct arm_dpm dpm;
uint32_t debug_base; uint32_t debug_base;
uint8_t debug_ap; struct adiv5_ap *debug_ap;
uint8_t memory_ap; struct adiv5_ap *memory_ap;
bool memory_ap_available; bool memory_ap_available;
/* mdir */ /* mdir */
uint8_t multi_processor_system; uint8_t multi_processor_system;

2
src/target/armv7m.h
View File

@ -148,7 +148,7 @@ struct armv7m_common {
int exception_number; int exception_number;
/* AP this processor is connected to in the DAP */ /* AP this processor is connected to in the DAP */
uint8_t debug_ap; struct adiv5_ap *debug_ap;
int fp_feature; int fp_feature;
uint32_t demcr; uint32_t demcr;

144
src/target/cortex_a.c
View File

@ -195,11 +195,11 @@ static int cortex_a8_init_debug_access(struct target *target)
/* Unlocking the debug registers for modification /* Unlocking the debug registers for modification
* The debugport might be uninitialised so try twice */ * The debugport might be uninitialised so try twice */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55); armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
/* try again */ /* try again */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55); armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55);
if (retval == ERROR_OK) if (retval == ERROR_OK)
LOG_USER( LOG_USER(
@ -228,7 +228,7 @@ static int cortex_a_init_debug_access(struct target *target)
switch (cortex_part_num) { switch (cortex_part_num) {
case CORTEX_A7_PARTNUM: case CORTEX_A7_PARTNUM:
case CORTEX_A15_PARTNUM: case CORTEX_A15_PARTNUM:
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_OSLSR, armv7a->debug_base + CPUDBG_OSLSR,
&dbg_osreg); &dbg_osreg);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -238,7 +238,7 @@ static int cortex_a_init_debug_access(struct target *target)
if (dbg_osreg & CPUDBG_OSLAR_LK_MASK) if (dbg_osreg & CPUDBG_OSLAR_LK_MASK)
/* Unlocking the DEBUG OS registers for modification */ /* Unlocking the DEBUG OS registers for modification */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_OSLAR, armv7a->debug_base + CPUDBG_OSLAR,
0); 0);
break; break;
@ -254,7 +254,7 @@ static int cortex_a_init_debug_access(struct target *target)
return retval; return retval;
/* Clear Sticky Power Down status Bit in PRSR to enable access to /* Clear Sticky Power Down status Bit in PRSR to enable access to
the registers in the Core Power Domain */ the registers in the Core Power Domain */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_PRSR, &dbg_osreg); armv7a->debug_base + CPUDBG_PRSR, &dbg_osreg);
LOG_DEBUG("target->coreid %" PRId32 " DBGPRSR 0x%" PRIx32, target->coreid, dbg_osreg); LOG_DEBUG("target->coreid %" PRId32 " DBGPRSR 0x%" PRIx32, target->coreid, dbg_osreg);
@ -262,13 +262,13 @@ static int cortex_a_init_debug_access(struct target *target)
return retval; return retval;
/* Disable cacheline fills and force cache write-through in debug state */ /* Disable cacheline fills and force cache write-through in debug state */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCCR, 0); armv7a->debug_base + CPUDBG_DSCCR, 0);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* Disable TLB lookup and refill/eviction in debug state */ /* Disable TLB lookup and refill/eviction in debug state */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSMCR, 0); armv7a->debug_base + CPUDBG_DSMCR, 0);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -291,7 +291,7 @@ static int cortex_a_wait_instrcmpl(struct target *target, uint32_t *dscr, bool f
long long then = timeval_ms(); long long then = timeval_ms();
while ((*dscr & DSCR_INSTR_COMP) == 0 || force) { while ((*dscr & DSCR_INSTR_COMP) == 0 || force) {
force = false; force = false;
int retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, int retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, dscr); armv7a->debug_base + CPUDBG_DSCR, dscr);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR("Could not read DSCR register"); LOG_ERROR("Could not read DSCR register");
@ -327,14 +327,14 @@ static int cortex_a_exec_opcode(struct target *target,
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_ITR, opcode); armv7a->debug_base + CPUDBG_ITR, opcode);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
long long then = timeval_ms(); long long then = timeval_ms();
do { do {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR("Could not read DSCR register"); LOG_ERROR("Could not read DSCR register");
@ -373,7 +373,7 @@ static int cortex_a_read_regs_through_mem(struct target *target, uint32_t addres
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap, retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap->ap_num,
(uint8_t *)(&regfile[1]), 4, 15, address); (uint8_t *)(&regfile[1]), 4, 15, address);
return retval; return retval;
@ -425,7 +425,7 @@ static int cortex_a_dap_read_coreregister_u32(struct target *target,
/* Wait for DTRRXfull then read DTRRTX */ /* Wait for DTRRXfull then read DTRRTX */
long long then = timeval_ms(); long long then = timeval_ms();
while ((dscr & DSCR_DTR_TX_FULL) == 0) { while ((dscr & DSCR_DTR_TX_FULL) == 0) {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -435,7 +435,7 @@ static int cortex_a_dap_read_coreregister_u32(struct target *target,
} }
} }
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRTX, value); armv7a->debug_base + CPUDBG_DTRTX, value);
LOG_DEBUG("read DCC 0x%08" PRIx32, *value); LOG_DEBUG("read DCC 0x%08" PRIx32, *value);
@ -454,7 +454,7 @@ static int cortex_a_dap_write_coreregister_u32(struct target *target,
LOG_DEBUG("register %i, value 0x%08" PRIx32, regnum, value); LOG_DEBUG("register %i, value 0x%08" PRIx32, regnum, value);
/* Check that DCCRX is not full */ /* Check that DCCRX is not full */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -472,7 +472,7 @@ static int cortex_a_dap_write_coreregister_u32(struct target *target,
/* Write DTRRX ... sets DSCR.DTRRXfull but exec_opcode() won't care */ /* Write DTRRX ... sets DSCR.DTRRXfull but exec_opcode() won't care */
LOG_DEBUG("write DCC 0x%08" PRIx32, value); LOG_DEBUG("write DCC 0x%08" PRIx32, value);
retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRRX, value); armv7a->debug_base + CPUDBG_DTRRX, value);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -530,7 +530,7 @@ static int cortex_a_dap_write_memap_register_u32(struct target *target,
struct armv7a_common *armv7a = target_to_armv7a(target); struct armv7a_common *armv7a = target_to_armv7a(target);
struct adiv5_dap *swjdp = armv7a->arm.dap; struct adiv5_dap *swjdp = armv7a->arm.dap;
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, address, value); retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num, address, value);
return retval; return retval;
} }
@ -555,7 +555,7 @@ static int cortex_a_write_dcc(struct cortex_a_common *a, uint32_t data)
{ {
LOG_DEBUG("write DCC 0x%08" PRIx32, data); LOG_DEBUG("write DCC 0x%08" PRIx32, data);
return mem_ap_sel_write_u32(a->armv7a_common.arm.dap, return mem_ap_sel_write_u32(a->armv7a_common.arm.dap,
a->armv7a_common.debug_ap, a->armv7a_common.debug_base + CPUDBG_DTRRX, data); a->armv7a_common.debug_ap->ap_num, a->armv7a_common.debug_base + CPUDBG_DTRRX, data);
} }
static int cortex_a_read_dcc(struct cortex_a_common *a, uint32_t *data, static int cortex_a_read_dcc(struct cortex_a_common *a, uint32_t *data,
@ -571,7 +571,7 @@ static int cortex_a_read_dcc(struct cortex_a_common *a, uint32_t *data,
/* Wait for DTRRXfull */ /* Wait for DTRRXfull */
long long then = timeval_ms(); long long then = timeval_ms();
while ((dscr & DSCR_DTR_TX_FULL) == 0) { while ((dscr & DSCR_DTR_TX_FULL) == 0) {
retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap->ap_num,
a->armv7a_common.debug_base + CPUDBG_DSCR, a->armv7a_common.debug_base + CPUDBG_DSCR,
&dscr); &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -582,7 +582,7 @@ static int cortex_a_read_dcc(struct cortex_a_common *a, uint32_t *data,
} }
} }
retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap->ap_num,
a->armv7a_common.debug_base + CPUDBG_DTRTX, data); a->armv7a_common.debug_base + CPUDBG_DTRTX, data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -604,7 +604,7 @@ static int cortex_a_dpm_prepare(struct arm_dpm *dpm)
/* set up invariant: INSTR_COMP is set after ever DPM operation */ /* set up invariant: INSTR_COMP is set after ever DPM operation */
long long then = timeval_ms(); long long then = timeval_ms();
for (;; ) { for (;; ) {
retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap->ap_num,
a->armv7a_common.debug_base + CPUDBG_DSCR, a->armv7a_common.debug_base + CPUDBG_DSCR,
&dscr); &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -892,7 +892,7 @@ static int cortex_a_poll(struct target *target)
target_call_event_callbacks(target, TARGET_EVENT_HALTED); target_call_event_callbacks(target, TARGET_EVENT_HALTED);
return retval; return retval;
} }
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -954,7 +954,7 @@ static int cortex_a_halt(struct target *target)
* Tell the core to be halted by writing DRCR with 0x1 * Tell the core to be halted by writing DRCR with 0x1
* and then wait for the core to be halted. * and then wait for the core to be halted.
*/ */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DRCR, DRCR_HALT); armv7a->debug_base + CPUDBG_DRCR, DRCR_HALT);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -962,19 +962,19 @@ static int cortex_a_halt(struct target *target)
/* /*
* enter halting debug mode * enter halting debug mode
*/ */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, dscr | DSCR_HALT_DBG_MODE); armv7a->debug_base + CPUDBG_DSCR, dscr | DSCR_HALT_DBG_MODE);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
long long then = timeval_ms(); long long then = timeval_ms();
for (;; ) { for (;; ) {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -1100,7 +1100,7 @@ static int cortex_a_internal_restart(struct target *target)
* disable IRQs by default, with optional override... * disable IRQs by default, with optional override...
*/ */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -1108,12 +1108,12 @@ static int cortex_a_internal_restart(struct target *target)
if ((dscr & DSCR_INSTR_COMP) == 0) if ((dscr & DSCR_INSTR_COMP) == 0)
LOG_ERROR("DSCR InstrCompl must be set before leaving debug!"); LOG_ERROR("DSCR InstrCompl must be set before leaving debug!");
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, dscr & ~DSCR_ITR_EN); armv7a->debug_base + CPUDBG_DSCR, dscr & ~DSCR_ITR_EN);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DRCR, DRCR_RESTART | armv7a->debug_base + CPUDBG_DRCR, DRCR_RESTART |
DRCR_CLEAR_EXCEPTIONS); DRCR_CLEAR_EXCEPTIONS);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -1121,7 +1121,7 @@ static int cortex_a_internal_restart(struct target *target)
long long then = timeval_ms(); long long then = timeval_ms();
for (;; ) { for (;; ) {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -1213,7 +1213,7 @@ static int cortex_a_debug_entry(struct target *target)
LOG_DEBUG("dscr = 0x%08" PRIx32, cortex_a->cpudbg_dscr); LOG_DEBUG("dscr = 0x%08" PRIx32, cortex_a->cpudbg_dscr);
/* REVISIT surely we should not re-read DSCR !! */ /* REVISIT surely we should not re-read DSCR !! */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -1225,7 +1225,7 @@ static int cortex_a_debug_entry(struct target *target)
/* Enable the ITR execution once we are in debug mode */ /* Enable the ITR execution once we are in debug mode */
dscr |= DSCR_ITR_EN; dscr |= DSCR_ITR_EN;
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, dscr); armv7a->debug_base + CPUDBG_DSCR, dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -1237,7 +1237,7 @@ static int cortex_a_debug_entry(struct target *target)
if (target->debug_reason == DBG_REASON_WATCHPOINT) { if (target->debug_reason == DBG_REASON_WATCHPOINT) {
uint32_t wfar; uint32_t wfar;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_WFAR, armv7a->debug_base + CPUDBG_WFAR,
&wfar); &wfar);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -1360,7 +1360,7 @@ int cortex_a_set_dscr_bits(struct target *target, unsigned long bit_mask, unsign
uint32_t dscr; uint32_t dscr;
/* Read DSCR */ /* Read DSCR */
int retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, int retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (ERROR_OK != retval) if (ERROR_OK != retval)
return retval; return retval;
@ -1371,7 +1371,7 @@ int cortex_a_set_dscr_bits(struct target *target, unsigned long bit_mask, unsign
dscr |= value & bit_mask; dscr |= value & bit_mask;
/* write new DSCR */ /* write new DSCR */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, dscr); armv7a->debug_base + CPUDBG_DSCR, dscr);
return retval; return retval;
} }
@ -1953,7 +1953,7 @@ static int cortex_a_set_dcc_mode(struct target *target, uint32_t mode, uint32_t
if (new_dscr != *dscr) { if (new_dscr != *dscr) {
struct armv7a_common *armv7a = target_to_armv7a(target); struct armv7a_common *armv7a = target_to_armv7a(target);
int retval = mem_ap_sel_write_atomic_u32(armv7a->arm.dap, int retval = mem_ap_sel_write_atomic_u32(armv7a->arm.dap,
armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, new_dscr); armv7a->debug_ap->ap_num, armv7a->debug_base + CPUDBG_DSCR, new_dscr);
if (retval == ERROR_OK) if (retval == ERROR_OK)
*dscr = new_dscr; *dscr = new_dscr;
return retval; return retval;
@ -1972,7 +1972,7 @@ static int cortex_a_wait_dscr_bits(struct target *target, uint32_t mask,
int retval; int retval;
while ((*dscr & mask) != value) { while ((*dscr & mask) != value) {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, dscr); armv7a->debug_base + CPUDBG_DSCR, dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2011,7 +2011,7 @@ static int cortex_a_read_copro(struct target *target, uint32_t opcode,
return retval; return retval;
/* Read the value transferred to DTRTX. */ /* Read the value transferred to DTRTX. */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRTX, data); armv7a->debug_base + CPUDBG_DTRTX, data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2047,7 +2047,7 @@ static int cortex_a_write_copro(struct target *target, uint32_t opcode,
struct adiv5_dap *swjdp = armv7a->arm.dap; struct adiv5_dap *swjdp = armv7a->arm.dap;
/* Write the value into DTRRX. */ /* Write the value into DTRRX. */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRRX, data); armv7a->debug_base + CPUDBG_DTRRX, data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2151,7 +2151,7 @@ static int cortex_a_write_apb_ab_memory_slow(struct target *target,
data = target_buffer_get_u16(target, buffer); data = target_buffer_get_u16(target, buffer);
else else
data = target_buffer_get_u32(target, buffer); data = target_buffer_get_u32(target, buffer);
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRRX, data); armv7a->debug_base + CPUDBG_DTRRX, data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2212,13 +2212,13 @@ static int cortex_a_write_apb_ab_memory_fast(struct target *target,
return retval; return retval;
/* Latch STC instruction. */ /* Latch STC instruction. */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_ITR, ARMV4_5_STC(0, 1, 0, 1, 14, 5, 0, 4)); armv7a->debug_base + CPUDBG_ITR, ARMV4_5_STC(0, 1, 0, 1, 14, 5, 0, 4));
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* Transfer all the data and issue all the instructions. */ /* Transfer all the data and issue all the instructions. */
return mem_ap_sel_write_buf_noincr(swjdp, armv7a->debug_ap, buffer, return mem_ap_sel_write_buf_noincr(swjdp, armv7a->debug_ap->ap_num, buffer,
4, count, armv7a->debug_base + CPUDBG_DTRRX); 4, count, armv7a->debug_base + CPUDBG_DTRRX);
} }
@ -2244,13 +2244,13 @@ static int cortex_a_write_apb_ab_memory(struct target *target,
return ERROR_OK; return ERROR_OK;
/* Clear any abort. */ /* Clear any abort. */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS); armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* Read DSCR. */ /* Read DSCR. */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2269,7 +2269,7 @@ static int cortex_a_write_apb_ab_memory(struct target *target,
goto out; goto out;
/* Get the memory address into R0. */ /* Get the memory address into R0. */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRRX, address); armv7a->debug_base + CPUDBG_DTRRX, address);
if (retval != ERROR_OK) if (retval != ERROR_OK)
goto out; goto out;
@ -2313,7 +2313,7 @@ out:
/* If there were any sticky abort flags, clear them. */ /* If there were any sticky abort flags, clear them. */
if (dscr & (DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE)) { if (dscr & (DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE)) {
fault_dscr = dscr; fault_dscr = dscr;
mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS); armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS);
dscr &= ~(DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE); dscr &= ~(DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE);
} else { } else {
@ -2347,7 +2347,7 @@ out:
/* If the DCC is nonempty, clear it. */ /* If the DCC is nonempty, clear it. */
if (dscr & DSCR_DTRTX_FULL_LATCHED) { if (dscr & DSCR_DTRTX_FULL_LATCHED) {
uint32_t dummy; uint32_t dummy;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRTX, &dummy); armv7a->debug_base + CPUDBG_DTRTX, &dummy);
if (final_retval == ERROR_OK) if (final_retval == ERROR_OK)
final_retval = retval; final_retval = retval;
@ -2420,7 +2420,7 @@ static int cortex_a_read_apb_ab_memory_slow(struct target *target,
return retval; return retval;
/* Read the value transferred to DTRTX into the buffer. */ /* Read the value transferred to DTRTX into the buffer. */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRTX, &data); armv7a->debug_base + CPUDBG_DTRTX, &data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2473,7 +2473,7 @@ static int cortex_a_read_apb_ab_memory_fast(struct target *target,
return retval; return retval;
/* Latch LDC instruction. */ /* Latch LDC instruction. */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_ITR, ARMV4_5_LDC(0, 1, 0, 1, 14, 5, 0, 4)); armv7a->debug_base + CPUDBG_ITR, ARMV4_5_LDC(0, 1, 0, 1, 14, 5, 0, 4));
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2484,7 +2484,7 @@ static int cortex_a_read_apb_ab_memory_fast(struct target *target,
* memory. The last read of DTRTX in this call reads the second-to-last * memory. The last read of DTRTX in this call reads the second-to-last
* word from memory and issues the read instruction for the last word. * word from memory and issues the read instruction for the last word.
*/ */
retval = mem_ap_sel_read_buf_noincr(swjdp, armv7a->debug_ap, buffer, retval = mem_ap_sel_read_buf_noincr(swjdp, armv7a->debug_ap->ap_num, buffer,
4, count, armv7a->debug_base + CPUDBG_DTRTX); 4, count, armv7a->debug_base + CPUDBG_DTRTX);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2518,7 +2518,7 @@ static int cortex_a_read_apb_ab_memory_fast(struct target *target,
/* Read the value transferred to DTRTX into the buffer. This is the last /* Read the value transferred to DTRTX into the buffer. This is the last
* word. */ * word. */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRTX, &u32); armv7a->debug_base + CPUDBG_DTRTX, &u32);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2549,13 +2549,13 @@ static int cortex_a_read_apb_ab_memory(struct target *target,
return ERROR_OK; return ERROR_OK;
/* Clear any abort. */ /* Clear any abort. */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS); armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* Read DSCR */ /* Read DSCR */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2574,7 +2574,7 @@ static int cortex_a_read_apb_ab_memory(struct target *target,
goto out; goto out;
/* Get the memory address into R0. */ /* Get the memory address into R0. */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRRX, address); armv7a->debug_base + CPUDBG_DTRRX, address);
if (retval != ERROR_OK) if (retval != ERROR_OK)
goto out; goto out;
@ -2606,7 +2606,7 @@ out:
/* If there were any sticky abort flags, clear them. */ /* If there were any sticky abort flags, clear them. */
if (dscr & (DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE)) { if (dscr & (DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE)) {
fault_dscr = dscr; fault_dscr = dscr;
mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS); armv7a->debug_base + CPUDBG_DRCR, DRCR_CLEAR_EXCEPTIONS);
dscr &= ~(DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE); dscr &= ~(DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE);
} else { } else {
@ -2640,7 +2640,7 @@ out:
/* If the DCC is nonempty, clear it. */ /* If the DCC is nonempty, clear it. */
if (dscr & DSCR_DTRTX_FULL_LATCHED) { if (dscr & DSCR_DTRTX_FULL_LATCHED) {
uint32_t dummy; uint32_t dummy;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRTX, &dummy); armv7a->debug_base + CPUDBG_DTRTX, &dummy);
if (final_retval == ERROR_OK) if (final_retval == ERROR_OK)
final_retval = retval; final_retval = retval;
@ -2707,7 +2707,7 @@ static int cortex_a_read_memory_ahb(struct target *target, uint32_t address,
struct adiv5_dap *swjdp = armv7a->arm.dap; struct adiv5_dap *swjdp = armv7a->arm.dap;
uint8_t apsel = swjdp->apsel; uint8_t apsel = swjdp->apsel;
if (!armv7a->memory_ap_available || (apsel != armv7a->memory_ap)) if (!armv7a->memory_ap_available || (apsel != armv7a->memory_ap->ap_num))
return target_read_memory(target, address, size, count, buffer); return target_read_memory(target, address, size, count, buffer);
/* cortex_a handles unaligned memory access */ /* cortex_a handles unaligned memory access */
@ -2735,7 +2735,7 @@ static int cortex_a_read_memory_ahb(struct target *target, uint32_t address,
if (!count || !buffer) if (!count || !buffer)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap, buffer, size, count, address); retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap->ap_num, buffer, size, count, address);
return retval; return retval;
} }
@ -2787,7 +2787,7 @@ static int cortex_a_write_memory_ahb(struct target *target, uint32_t address,
struct adiv5_dap *swjdp = armv7a->arm.dap; struct adiv5_dap *swjdp = armv7a->arm.dap;
uint8_t apsel = swjdp->apsel; uint8_t apsel = swjdp->apsel;
if (!armv7a->memory_ap_available || (apsel != armv7a->memory_ap)) if (!armv7a->memory_ap_available || (apsel != armv7a->memory_ap->ap_num))
return target_write_memory(target, address, size, count, buffer); return target_write_memory(target, address, size, count, buffer);
/* cortex_a handles unaligned memory access */ /* cortex_a handles unaligned memory access */
@ -2816,7 +2816,7 @@ static int cortex_a_write_memory_ahb(struct target *target, uint32_t address,
if (!count || !buffer) if (!count || !buffer)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
retval = mem_ap_sel_write_buf(swjdp, armv7a->memory_ap, buffer, size, count, address); retval = mem_ap_sel_write_buf(swjdp, armv7a->memory_ap->ap_num, buffer, size, count, address);
return retval; return retval;
} }
@ -2904,16 +2904,16 @@ static int cortex_a_handle_target_request(void *priv)
if (target->state == TARGET_RUNNING) { if (target->state == TARGET_RUNNING) {
uint32_t request; uint32_t request;
uint32_t dscr; uint32_t dscr;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
/* check if we have data */ /* check if we have data */
while ((dscr & DSCR_DTR_TX_FULL) && (retval == ERROR_OK)) { while ((dscr & DSCR_DTR_TX_FULL) && (retval == ERROR_OK)) {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DTRTX, &request); armv7a->debug_base + CPUDBG_DTRTX, &request);
if (retval == ERROR_OK) { if (retval == ERROR_OK) {
target_request(target, request); target_request(target, request);
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DSCR, &dscr); armv7a->debug_base + CPUDBG_DSCR, &dscr);
} }
} }
@ -2945,7 +2945,7 @@ static int cortex_a_examine_first(struct target *target)
/* We do one extra read to ensure DAP is configured, /* We do one extra read to ensure DAP is configured,
* we call ahbap_debugport_init(swjdp) instead * we call ahbap_debugport_init(swjdp) instead
*/ */
retval = ahbap_debugport_init(swjdp, armv7a->debug_ap); retval = ahbap_debugport_init(swjdp, armv7a->debug_ap->ap_num);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2983,33 +2983,33 @@ static int cortex_a_examine_first(struct target *target)
} else } else
armv7a->debug_base = target->dbgbase; armv7a->debug_base = target->dbgbase;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_CPUID, &cpuid); armv7a->debug_base + CPUDBG_CPUID, &cpuid);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_CPUID, &cpuid); armv7a->debug_base + CPUDBG_CPUID, &cpuid);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_DEBUG("Examine %s failed", "CPUID"); LOG_DEBUG("Examine %s failed", "CPUID");
return retval; return retval;
} }
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_CTYPR, &ctypr); armv7a->debug_base + CPUDBG_CTYPR, &ctypr);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_DEBUG("Examine %s failed", "CTYPR"); LOG_DEBUG("Examine %s failed", "CTYPR");
return retval; return retval;
} }
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_TTYPR, &ttypr); armv7a->debug_base + CPUDBG_TTYPR, &ttypr);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_DEBUG("Examine %s failed", "TTYPR"); LOG_DEBUG("Examine %s failed", "TTYPR");
return retval; return retval;
} }
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_DIDR, &didr); armv7a->debug_base + CPUDBG_DIDR, &didr);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_DEBUG("Examine %s failed", "DIDR"); LOG_DEBUG("Examine %s failed", "DIDR");
@ -3030,7 +3030,7 @@ static int cortex_a_examine_first(struct target *target)
if ((cpuid & CORTEX_A_MIDR_PARTNUM_MASK) >> CORTEX_A_MIDR_PARTNUM_SHIFT == if ((cpuid & CORTEX_A_MIDR_PARTNUM_MASK) >> CORTEX_A_MIDR_PARTNUM_SHIFT ==
CORTEX_A15_PARTNUM) { CORTEX_A15_PARTNUM) {
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_OSLAR, armv7a->debug_base + CPUDBG_OSLAR,
0); 0);
@ -3042,7 +3042,7 @@ static int cortex_a_examine_first(struct target *target)
if ((cpuid & CORTEX_A_MIDR_PARTNUM_MASK) >> CORTEX_A_MIDR_PARTNUM_SHIFT == if ((cpuid & CORTEX_A_MIDR_PARTNUM_MASK) >> CORTEX_A_MIDR_PARTNUM_SHIFT ==
CORTEX_A7_PARTNUM) { CORTEX_A7_PARTNUM) {
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_OSLAR, armv7a->debug_base + CPUDBG_OSLAR,
0); 0);
@ -3050,7 +3050,7 @@ static int cortex_a_examine_first(struct target *target)
return retval; return retval;
} }
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap->ap_num,
armv7a->debug_base + CPUDBG_PRSR, &dbg_osreg); armv7a->debug_base + CPUDBG_PRSR, &dbg_osreg);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -3209,7 +3209,7 @@ static int cortex_a_virt2phys(struct target *target,
struct armv7a_common *armv7a = target_to_armv7a(target); struct armv7a_common *armv7a = target_to_armv7a(target);
struct adiv5_dap *swjdp = armv7a->arm.dap; struct adiv5_dap *swjdp = armv7a->arm.dap;
uint8_t apsel = swjdp->apsel; uint8_t apsel = swjdp->apsel;
if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap)) { if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap->ap_num)) {
uint32_t ret; uint32_t ret;
retval = armv7a_mmu_translate_va(target, retval = armv7a_mmu_translate_va(target,
virt, &ret); virt, &ret);

114
src/target/cortex_m.c
View File

@ -74,16 +74,16 @@ static int cortexm_dap_read_coreregister_u32(struct target *target,
/* because the DCB_DCRDR is used for the emulated dcc channel /* because the DCB_DCRDR is used for the emulated dcc channel
* we have to save/restore the DCB_DCRDR when used */ * we have to save/restore the DCB_DCRDR when used */
if (target->dbg_msg_enabled) { if (target->dbg_msg_enabled) {
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, DCB_DCRDR, &dcrdr); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRDR, &dcrdr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DCRSR, regnum); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRSR, regnum);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DCRDR, value); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRDR, value);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -91,7 +91,7 @@ static int cortexm_dap_read_coreregister_u32(struct target *target,
/* restore DCB_DCRDR - this needs to be in a separate /* restore DCB_DCRDR - this needs to be in a separate
* transaction otherwise the emulated DCC channel breaks */ * transaction otherwise the emulated DCC channel breaks */
if (retval == ERROR_OK) if (retval == ERROR_OK)
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DCRDR, dcrdr); retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRDR, dcrdr);
} }
return retval; return retval;
@ -108,16 +108,16 @@ static int cortexm_dap_write_coreregister_u32(struct target *target,
/* because the DCB_DCRDR is used for the emulated dcc channel /* because the DCB_DCRDR is used for the emulated dcc channel
* we have to save/restore the DCB_DCRDR when used */ * we have to save/restore the DCB_DCRDR when used */
if (target->dbg_msg_enabled) { if (target->dbg_msg_enabled) {
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, DCB_DCRDR, &dcrdr); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRDR, &dcrdr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DCRDR, value); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRDR, value);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DCRSR, regnum | DCRSR_WnR); retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRSR, regnum | DCRSR_WnR);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -125,7 +125,7 @@ static int cortexm_dap_write_coreregister_u32(struct target *target,
/* restore DCB_DCRDR - this needs to be in a seperate /* restore DCB_DCRDR - this needs to be in a seperate
* transaction otherwise the emulated DCC channel breaks */ * transaction otherwise the emulated DCC channel breaks */
if (retval == ERROR_OK) if (retval == ERROR_OK)
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DCRDR, dcrdr); retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRDR, dcrdr);
} }
return retval; return retval;
@ -143,7 +143,7 @@ static int cortex_m_write_debug_halt_mask(struct target *target,
/* create new register mask */ /* create new register mask */
cortex_m->dcb_dhcsr |= DBGKEY | C_DEBUGEN | mask_on; cortex_m->dcb_dhcsr |= DBGKEY | C_DEBUGEN | mask_on;
return mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, cortex_m->dcb_dhcsr); return mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, cortex_m->dcb_dhcsr);
} }
static int cortex_m_clear_halt(struct target *target) static int cortex_m_clear_halt(struct target *target)
@ -157,12 +157,12 @@ static int cortex_m_clear_halt(struct target *target)
cortex_m_write_debug_halt_mask(target, C_HALT, C_STEP); cortex_m_write_debug_halt_mask(target, C_HALT, C_STEP);
/* Read Debug Fault Status Register */ /* Read Debug Fault Status Register */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, NVIC_DFSR, &cortex_m->nvic_dfsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_DFSR, &cortex_m->nvic_dfsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* Clear Debug Fault Status */ /* Clear Debug Fault Status */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, NVIC_DFSR, cortex_m->nvic_dfsr); retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_DFSR, cortex_m->nvic_dfsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
LOG_DEBUG(" NVIC_DFSR 0x%" PRIx32 "", cortex_m->nvic_dfsr); LOG_DEBUG(" NVIC_DFSR 0x%" PRIx32 "", cortex_m->nvic_dfsr);
@ -186,12 +186,12 @@ static int cortex_m_single_step_core(struct target *target)
* HALT can put the core into an unknown state. * HALT can put the core into an unknown state.
*/ */
if (!(cortex_m->dcb_dhcsr & C_MASKINTS)) { if (!(cortex_m->dcb_dhcsr & C_MASKINTS)) {
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR,
DBGKEY | C_MASKINTS | C_HALT | C_DEBUGEN); DBGKEY | C_MASKINTS | C_HALT | C_DEBUGEN);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR,
DBGKEY | C_MASKINTS | C_STEP | C_DEBUGEN); DBGKEY | C_MASKINTS | C_STEP | C_DEBUGEN);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -234,22 +234,22 @@ static int cortex_m_endreset_event(struct target *target)
struct cortex_m_dwt_comparator *dwt_list = cortex_m->dwt_comparator_list; struct cortex_m_dwt_comparator *dwt_list = cortex_m->dwt_comparator_list;
/* REVISIT The four debug monitor bits are currently ignored... */ /* REVISIT The four debug monitor bits are currently ignored... */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, &dcb_demcr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR, &dcb_demcr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
LOG_DEBUG("DCB_DEMCR = 0x%8.8" PRIx32 "", dcb_demcr); LOG_DEBUG("DCB_DEMCR = 0x%8.8" PRIx32 "", dcb_demcr);
/* this register is used for emulated dcc channel */ /* this register is used for emulated dcc channel */
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DCRDR, 0); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRDR, 0);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* Enable debug requests */ /* Enable debug requests */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, &cortex_m->dcb_dhcsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, &cortex_m->dcb_dhcsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
if (!(cortex_m->dcb_dhcsr & C_DEBUGEN)) { if (!(cortex_m->dcb_dhcsr & C_DEBUGEN)) {
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, DBGKEY | C_DEBUGEN); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, DBGKEY | C_DEBUGEN);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
@ -264,7 +264,7 @@ static int cortex_m_endreset_event(struct target *target)
* choices *EXCEPT* explicitly scripted overrides like "vector_catch" * choices *EXCEPT* explicitly scripted overrides like "vector_catch"
* or manual updates to the NVIC SHCSR and CCR registers. * or manual updates to the NVIC SHCSR and CCR registers.
*/ */
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, TRCENA | armv7m->demcr); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR, TRCENA | armv7m->demcr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -310,7 +310,7 @@ static int cortex_m_endreset_event(struct target *target)
register_cache_invalidate(armv7m->arm.core_cache); register_cache_invalidate(armv7m->arm.core_cache);
/* make sure we have latest dhcsr flags */ /* make sure we have latest dhcsr flags */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, &cortex_m->dcb_dhcsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, &cortex_m->dcb_dhcsr);
return retval; return retval;
} }
@ -346,47 +346,47 @@ static int cortex_m_examine_exception_reason(struct target *target)
struct adiv5_dap *swjdp = armv7m->arm.dap; struct adiv5_dap *swjdp = armv7m->arm.dap;
int retval; int retval;
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, NVIC_SHCSR, &shcsr); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_SHCSR, &shcsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
switch (armv7m->exception_number) { switch (armv7m->exception_number) {
case 2: /* NMI */ case 2: /* NMI */
break; break;
case 3: /* Hard Fault */ case 3: /* Hard Fault */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, NVIC_HFSR, &except_sr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_HFSR, &except_sr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
if (except_sr & 0x40000000) { if (except_sr & 0x40000000) {
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, NVIC_CFSR, &cfsr); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_CFSR, &cfsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
break; break;
case 4: /* Memory Management */ case 4: /* Memory Management */
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, NVIC_CFSR, &except_sr); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_CFSR, &except_sr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, NVIC_MMFAR, &except_ar); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_MMFAR, &except_ar);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
break; break;
case 5: /* Bus Fault */ case 5: /* Bus Fault */
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, NVIC_CFSR, &except_sr); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_CFSR, &except_sr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, NVIC_BFAR, &except_ar); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_BFAR, &except_ar);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
break; break;
case 6: /* Usage Fault */ case 6: /* Usage Fault */
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, NVIC_CFSR, &except_sr); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_CFSR, &except_sr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
break; break;
case 11: /* SVCall */ case 11: /* SVCall */
break; break;
case 12: /* Debug Monitor */ case 12: /* Debug Monitor */
retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap, NVIC_DFSR, &except_sr); retval = mem_ap_sel_read_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_DFSR, &except_sr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
break; break;
@ -421,7 +421,7 @@ static int cortex_m_debug_entry(struct target *target)
LOG_DEBUG(" "); LOG_DEBUG(" ");
cortex_m_clear_halt(target); cortex_m_clear_halt(target);
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, &cortex_m->dcb_dhcsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, &cortex_m->dcb_dhcsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -499,7 +499,7 @@ static int cortex_m_poll(struct target *target)
struct adiv5_dap *swjdp = cortex_m->armv7m.arm.dap; struct adiv5_dap *swjdp = cortex_m->armv7m.arm.dap;
/* Read from Debug Halting Control and Status Register */ /* Read from Debug Halting Control and Status Register */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, &cortex_m->dcb_dhcsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, &cortex_m->dcb_dhcsr);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
target->state = TARGET_UNKNOWN; target->state = TARGET_UNKNOWN;
return retval; return retval;
@ -520,7 +520,7 @@ static int cortex_m_poll(struct target *target)
detected_failure = ERROR_FAIL; detected_failure = ERROR_FAIL;
/* refresh status bits */ /* refresh status bits */
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, &cortex_m->dcb_dhcsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, &cortex_m->dcb_dhcsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
@ -636,13 +636,13 @@ static int cortex_m_soft_reset_halt(struct target *target)
LOG_WARNING("soft_reset_halt is deprecated, please use 'reset halt' instead."); LOG_WARNING("soft_reset_halt is deprecated, please use 'reset halt' instead.");
/* Enter debug state on reset; restore DEMCR in endreset_event() */ /* Enter debug state on reset; restore DEMCR in endreset_event() */
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR,
TRCENA | VC_HARDERR | VC_BUSERR | VC_CORERESET); TRCENA | VC_HARDERR | VC_BUSERR | VC_CORERESET);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* Request a core-only reset */ /* Request a core-only reset */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, NVIC_AIRCR, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_AIRCR,
AIRCR_VECTKEY | AIRCR_VECTRESET); AIRCR_VECTKEY | AIRCR_VECTRESET);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -652,9 +652,9 @@ static int cortex_m_soft_reset_halt(struct target *target)
register_cache_invalidate(cortex_m->armv7m.arm.core_cache); register_cache_invalidate(cortex_m->armv7m.arm.core_cache);
while (timeout < 100) { while (timeout < 100) {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, &dcb_dhcsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, &dcb_dhcsr);
if (retval == ERROR_OK) { if (retval == ERROR_OK) {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, NVIC_DFSR, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_DFSR,
&cortex_m->nvic_dfsr); &cortex_m->nvic_dfsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -898,7 +898,7 @@ static int cortex_m_step(struct target *target, int current,
/* Wait for pending handlers to complete or timeout */ /* Wait for pending handlers to complete or timeout */
do { do {
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num,
DCB_DHCSR, DCB_DHCSR,
&cortex_m->dcb_dhcsr); &cortex_m->dcb_dhcsr);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
@ -933,7 +933,7 @@ static int cortex_m_step(struct target *target, int current,
} }
} }
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, &cortex_m->dcb_dhcsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, &cortex_m->dcb_dhcsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -1001,11 +1001,11 @@ static int cortex_m_assert_reset(struct target *target)
/* Enable debug requests */ /* Enable debug requests */
int retval; int retval;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, &cortex_m->dcb_dhcsr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, &cortex_m->dcb_dhcsr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
if (!(cortex_m->dcb_dhcsr & C_DEBUGEN)) { if (!(cortex_m->dcb_dhcsr & C_DEBUGEN)) {
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, DBGKEY | C_DEBUGEN); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, DBGKEY | C_DEBUGEN);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
@ -1013,19 +1013,19 @@ static int cortex_m_assert_reset(struct target *target)
/* If the processor is sleeping in a WFI or WFE instruction, the /* If the processor is sleeping in a WFI or WFE instruction, the
* C_HALT bit must be asserted to regain control */ * C_HALT bit must be asserted to regain control */
if (cortex_m->dcb_dhcsr & S_SLEEP) { if (cortex_m->dcb_dhcsr & S_SLEEP) {
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, DBGKEY | C_HALT | C_DEBUGEN); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR, DBGKEY | C_HALT | C_DEBUGEN);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DCRDR, 0); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DCRDR, 0);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
if (!target->reset_halt) { if (!target->reset_halt) {
/* Set/Clear C_MASKINTS in a separate operation */ /* Set/Clear C_MASKINTS in a separate operation */
if (cortex_m->dcb_dhcsr & C_MASKINTS) { if (cortex_m->dcb_dhcsr & C_MASKINTS) {
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DHCSR, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DHCSR,
DBGKEY | C_DEBUGEN | C_HALT); DBGKEY | C_DEBUGEN | C_HALT);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -1043,7 +1043,7 @@ static int cortex_m_assert_reset(struct target *target)
* bad vector table entries. Should this include MMERR or * bad vector table entries. Should this include MMERR or
* other flags too? * other flags too?
*/ */
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR,
TRCENA | VC_HARDERR | VC_BUSERR | VC_CORERESET); TRCENA | VC_HARDERR | VC_BUSERR | VC_CORERESET);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -1067,13 +1067,13 @@ static int cortex_m_assert_reset(struct target *target)
"handler to reset any peripherals or configure hardware srst support."); "handler to reset any peripherals or configure hardware srst support.");
} }
retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap, NVIC_AIRCR, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_AIRCR,
AIRCR_VECTKEY | ((reset_config == CORTEX_M_RESET_SYSRESETREQ) AIRCR_VECTKEY | ((reset_config == CORTEX_M_RESET_SYSRESETREQ)
? AIRCR_SYSRESETREQ : AIRCR_VECTRESET)); ? AIRCR_SYSRESETREQ : AIRCR_VECTRESET));
if (retval != ERROR_OK) if (retval != ERROR_OK)
LOG_DEBUG("Ignoring AP write error right after reset"); LOG_DEBUG("Ignoring AP write error right after reset");
retval = ahbap_debugport_init(swjdp, armv7m->debug_ap); retval = ahbap_debugport_init(swjdp, armv7m->debug_ap->ap_num);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR("DP initialisation failed"); LOG_ERROR("DP initialisation failed");
return retval; return retval;
@ -1085,7 +1085,7 @@ static int cortex_m_assert_reset(struct target *target)
* after reset) on LM3S6918 -- Michael Schwingen * after reset) on LM3S6918 -- Michael Schwingen
*/ */
uint32_t tmp; uint32_t tmp;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, NVIC_AIRCR, &tmp); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, NVIC_AIRCR, &tmp);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
@ -1119,7 +1119,7 @@ static int cortex_m_deassert_reset(struct target *target)
if ((jtag_reset_config & RESET_HAS_SRST) && if ((jtag_reset_config & RESET_HAS_SRST) &&
!(jtag_reset_config & RESET_SRST_NO_GATING)) { !(jtag_reset_config & RESET_SRST_NO_GATING)) {
int retval = ahbap_debugport_init(armv7m->arm.dap, armv7m->debug_ap); int retval = ahbap_debugport_init(armv7m->arm.dap, armv7m->debug_ap->ap_num);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR("DP initialisation failed"); LOG_ERROR("DP initialisation failed");
return retval; return retval;
@ -1680,7 +1680,7 @@ static int cortex_m_read_memory(struct target *target, uint32_t address,
return ERROR_TARGET_UNALIGNED_ACCESS; return ERROR_TARGET_UNALIGNED_ACCESS;
} }
return mem_ap_sel_read_buf(swjdp, armv7m->debug_ap, buffer, size, count, address); return mem_ap_sel_read_buf(swjdp, armv7m->debug_ap->ap_num, buffer, size, count, address);
} }
static int cortex_m_write_memory(struct target *target, uint32_t address, static int cortex_m_write_memory(struct target *target, uint32_t address,
@ -1695,7 +1695,7 @@ static int cortex_m_write_memory(struct target *target, uint32_t address,
return ERROR_TARGET_UNALIGNED_ACCESS; return ERROR_TARGET_UNALIGNED_ACCESS;
} }
return mem_ap_sel_write_buf(swjdp, armv7m->debug_ap, buffer, size, count, address); return mem_ap_sel_write_buf(swjdp, armv7m->debug_ap->ap_num, buffer, size, count, address);
} }
static int cortex_m_init_target(struct command_context *cmd_ctx, static int cortex_m_init_target(struct command_context *cmd_ctx,
@ -1911,12 +1911,12 @@ int cortex_m_examine(struct target *target)
} }
/* Leave (only) generic DAP stuff for debugport_init(); */ /* Leave (only) generic DAP stuff for debugport_init(); */
swjdp->ap[armv7m->debug_ap].memaccess_tck = 8; armv7m->debug_ap->memaccess_tck = 8;
/* stlink shares the examine handler but does not support /* stlink shares the examine handler but does not support
* all its calls */ * all its calls */
if (!armv7m->stlink) { if (!armv7m->stlink) {
retval = ahbap_debugport_init(swjdp, armv7m->debug_ap); retval = ahbap_debugport_init(swjdp, armv7m->debug_ap->ap_num);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
@ -1967,7 +1967,7 @@ int cortex_m_examine(struct target *target)
if (i == 4 || i == 3) { if (i == 4 || i == 3) {
/* Cortex-M3/M4 has 4096 bytes autoincrement range */ /* Cortex-M3/M4 has 4096 bytes autoincrement range */
swjdp->ap[armv7m->debug_ap].tar_autoincr_block = (1 << 12); armv7m->debug_ap->tar_autoincr_block = (1 << 12);
} }
/* Configure trace modules */ /* Configure trace modules */
@ -2032,7 +2032,7 @@ static int cortex_m_dcc_read(struct target *target, uint8_t *value, uint8_t *ctr
uint8_t buf[2]; uint8_t buf[2];
int retval; int retval;
retval = mem_ap_sel_read_buf_noincr(swjdp, armv7m->debug_ap, buf, 2, 1, DCB_DCRDR); retval = mem_ap_sel_read_buf_noincr(swjdp, armv7m->debug_ap->ap_num, buf, 2, 1, DCB_DCRDR);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2046,7 +2046,7 @@ static int cortex_m_dcc_read(struct target *target, uint8_t *value, uint8_t *ctr
* signify we have read data */ * signify we have read data */
if (dcrdr & (1 << 0)) { if (dcrdr & (1 << 0)) {
target_buffer_set_u16(target, buf, 0); target_buffer_set_u16(target, buf, 0);
retval = mem_ap_sel_write_buf_noincr(swjdp, armv7m->debug_ap, buf, 2, 1, DCB_DCRDR); retval = mem_ap_sel_write_buf_noincr(swjdp, armv7m->debug_ap->ap_num, buf, 2, 1, DCB_DCRDR);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} }
@ -2202,7 +2202,7 @@ COMMAND_HANDLER(handle_cortex_m_vector_catch_command)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, &demcr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR, &demcr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -2239,10 +2239,10 @@ write:
demcr |= catch; demcr |= catch;
/* write, but don't assume it stuck (why not??) */ /* write, but don't assume it stuck (why not??) */
retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, demcr); retval = mem_ap_sel_write_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR, demcr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap, DCB_DEMCR, &demcr); retval = mem_ap_sel_read_atomic_u32(swjdp, armv7m->debug_ap->ap_num, DCB_DEMCR, &demcr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;