X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fcortex_a.c;h=7d58ab34b4699a5a11d3f4f62d7f81478e44a5ef;hp=cc1552d61a43c0889107cd1dc9669c4d04964f03;hb=e77b7447f7b30d70961e5bee45400f70baeb16fc;hpb=927e53f8d5e6ebaf52be82cb7300cbbb471a92bb diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index cc1552d61a..7d58ab34b4 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -17,6 +17,9 @@ * Copyright (C) ST-Ericsson SA 2011 * * michel.jaouen@stericsson.com : smp minimum support * * * + * Copyright (C) Broadcom 2012 * + * ehunter@broadcom.com : Cortex R4 support * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -30,10 +33,12 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * * * Cortex-A8(tm) TRM, ARM DDI 0344H * * Cortex-A9(tm) TRM, ARM DDI 0407F * + * Cortex-A4(tm) TRM, ARM DDI 0363E * + * Cortex-A15(tm)TRM, ARM DDI 0438C * * * ***************************************************************************/ @@ -49,125 +54,117 @@ #include "arm_opcodes.h" #include -static int cortex_a8_poll(struct target *target); -static int cortex_a8_debug_entry(struct target *target); -static int cortex_a8_restore_context(struct target *target, bool bpwp); -static int cortex_a8_set_breakpoint(struct target *target, +static int cortex_a_poll(struct target *target); +static int cortex_a_debug_entry(struct target *target); +static int cortex_a_restore_context(struct target *target, bool bpwp); +static int cortex_a_set_breakpoint(struct target *target, struct breakpoint *breakpoint, uint8_t matchmode); -static int cortex_a8_set_context_breakpoint(struct target *target, +static int cortex_a_set_context_breakpoint(struct target *target, struct breakpoint *breakpoint, uint8_t matchmode); -static int cortex_a8_set_hybrid_breakpoint(struct target *target, +static int cortex_a_set_hybrid_breakpoint(struct target *target, struct breakpoint *breakpoint); -static int cortex_a8_unset_breakpoint(struct target *target, +static int cortex_a_unset_breakpoint(struct target *target, struct breakpoint *breakpoint); -static int cortex_a8_dap_read_coreregister_u32(struct target *target, +static int cortex_a_dap_read_coreregister_u32(struct target *target, uint32_t *value, int regnum); -static int cortex_a8_dap_write_coreregister_u32(struct target *target, +static int cortex_a_dap_write_coreregister_u32(struct target *target, uint32_t value, int regnum); -static int cortex_a8_mmu(struct target *target, int *enabled); -static int cortex_a8_virt2phys(struct target *target, +static int cortex_a_mmu(struct target *target, int *enabled); +static int cortex_a_virt2phys(struct target *target, uint32_t virt, uint32_t *phys); -static int cortex_a8_read_apb_ab_memory(struct target *target, +static int cortex_a_read_apb_ab_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); -/* - * FIXME do topology discovery using the ROM; don't - * assume this is an OMAP3. Also, allow for multiple ARMv7-A - * cores, with different AP numbering ... don't use a #define - * for these numbers, use per-core armv7a state. - */ -#define swjdp_memoryap 0 -#define swjdp_debugap 1 /* restore cp15_control_reg at resume */ -static int cortex_a8_restore_cp15_control_reg(struct target *target) +static int cortex_a_restore_cp15_control_reg(struct target *target) { int retval = ERROR_OK; - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); + struct cortex_a_common *cortex_a = target_to_cortex_a(target); struct armv7a_common *armv7a = target_to_armv7a(target); - if (cortex_a8->cp15_control_reg != cortex_a8->cp15_control_reg_curr) { - cortex_a8->cp15_control_reg_curr = cortex_a8->cp15_control_reg; - /* LOG_INFO("cp15_control_reg: %8.8" PRIx32, cortex_a8->cp15_control_reg); */ + if (cortex_a->cp15_control_reg != cortex_a->cp15_control_reg_curr) { + cortex_a->cp15_control_reg_curr = cortex_a->cp15_control_reg; + /* LOG_INFO("cp15_control_reg: %8.8" PRIx32, cortex_a->cp15_control_reg); */ retval = armv7a->arm.mcr(target, 15, 0, 0, /* op1, op2 */ 1, 0, /* CRn, CRm */ - cortex_a8->cp15_control_reg); + cortex_a->cp15_control_reg); } return retval; } -/* check address before cortex_a8_apb read write access with mmu on +/* check address before cortex_a_apb read write access with mmu on * remove apb predictible data abort */ -static int cortex_a8_check_address(struct target *target, uint32_t address) +static int cortex_a_check_address(struct target *target, uint32_t address) { struct armv7a_common *armv7a = target_to_armv7a(target); - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); + struct cortex_a_common *cortex_a = target_to_cortex_a(target); uint32_t os_border = armv7a->armv7a_mmu.os_border; if ((address < os_border) && (armv7a->arm.core_mode == ARM_MODE_SVC)) { - LOG_ERROR("%x access in userspace and target in supervisor", address); + LOG_ERROR("%" PRIx32 " access in userspace and target in supervisor", address); return ERROR_FAIL; } if ((address >= os_border) && - (cortex_a8->curr_mode != ARM_MODE_SVC)) { + (cortex_a->curr_mode != ARM_MODE_SVC)) { dpm_modeswitch(&armv7a->dpm, ARM_MODE_SVC); - cortex_a8->curr_mode = ARM_MODE_SVC; - LOG_INFO("%x access in kernel space and target not in supervisor", + cortex_a->curr_mode = ARM_MODE_SVC; + LOG_INFO("%" PRIx32 " access in kernel space and target not in supervisor", address); return ERROR_OK; } if ((address < os_border) && - (cortex_a8->curr_mode == ARM_MODE_SVC)) { + (cortex_a->curr_mode == ARM_MODE_SVC)) { dpm_modeswitch(&armv7a->dpm, ARM_MODE_ANY); - cortex_a8->curr_mode = ARM_MODE_ANY; + cortex_a->curr_mode = ARM_MODE_ANY; } return ERROR_OK; } /* modify cp15_control_reg in order to enable or disable mmu for : * - virt2phys address conversion * - read or write memory in phys or virt address */ -static int cortex_a8_mmu_modify(struct target *target, int enable) +static int cortex_a_mmu_modify(struct target *target, int enable) { - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); + struct cortex_a_common *cortex_a = target_to_cortex_a(target); struct armv7a_common *armv7a = target_to_armv7a(target); int retval = ERROR_OK; if (enable) { /* if mmu enabled at target stop and mmu not enable */ - if (!(cortex_a8->cp15_control_reg & 0x1U)) { + if (!(cortex_a->cp15_control_reg & 0x1U)) { LOG_ERROR("trying to enable mmu on target stopped with mmu disable"); return ERROR_FAIL; } - if (!(cortex_a8->cp15_control_reg_curr & 0x1U)) { - cortex_a8->cp15_control_reg_curr |= 0x1U; + if (!(cortex_a->cp15_control_reg_curr & 0x1U)) { + cortex_a->cp15_control_reg_curr |= 0x1U; retval = armv7a->arm.mcr(target, 15, 0, 0, /* op1, op2 */ 1, 0, /* CRn, CRm */ - cortex_a8->cp15_control_reg_curr); + cortex_a->cp15_control_reg_curr); } } else { - if (cortex_a8->cp15_control_reg_curr & 0x4U) { + if (cortex_a->cp15_control_reg_curr & 0x4U) { /* data cache is active */ - cortex_a8->cp15_control_reg_curr &= ~0x4U; + cortex_a->cp15_control_reg_curr &= ~0x4U; /* flush data cache armv7 function to be called */ if (armv7a->armv7a_mmu.armv7a_cache.flush_all_data_cache) armv7a->armv7a_mmu.armv7a_cache.flush_all_data_cache(target); } - if ((cortex_a8->cp15_control_reg_curr & 0x1U)) { - cortex_a8->cp15_control_reg_curr &= ~0x1U; + if ((cortex_a->cp15_control_reg_curr & 0x1U)) { + cortex_a->cp15_control_reg_curr &= ~0x1U; retval = armv7a->arm.mcr(target, 15, 0, 0, /* op1, op2 */ 1, 0, /* CRn, CRm */ - cortex_a8->cp15_control_reg_curr); + cortex_a->cp15_control_reg_curr); } } return retval; } /* - * Cortex-A8 Basic debug access, very low level assumes state is saved + * Cortex-A Basic debug access, very low level assumes state is saved */ -static int cortex_a8_init_debug_access(struct target *target) +static int cortex_a_init_debug_access(struct target *target) { struct armv7a_common *armv7a = target_to_armv7a(target); struct adiv5_dap *swjdp = armv7a->arm.dap; @@ -178,11 +175,11 @@ static int cortex_a8_init_debug_access(struct target *target) /* Unlocking the debug registers for modification * The debugport might be uninitialised so try twice */ - retval = mem_ap_sel_write_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55); if (retval != ERROR_OK) { /* try again */ - retval = mem_ap_sel_write_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_LOCKACCESS, 0xC5ACCE55); if (retval == ERROR_OK) LOG_USER( @@ -192,7 +189,7 @@ static int cortex_a8_init_debug_access(struct target *target) return retval; /* Clear Sticky Power Down status Bit in PRSR to enable access to the registers in the Core Power Domain */ - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_PRSR, &dummy); if (retval != ERROR_OK) return retval; @@ -202,7 +199,7 @@ static int cortex_a8_init_debug_access(struct target *target) /* Resync breakpoint registers */ /* Since this is likely called from init or reset, update target state information*/ - return cortex_a8_poll(target); + return cortex_a_poll(target); } /* To reduce needless round-trips, pass in a pointer to the current @@ -210,7 +207,7 @@ static int cortex_a8_init_debug_access(struct target *target) * value on return from this function; or DSCR_INSTR_COMP if you * happen to know that no instruction is pending. */ -static int cortex_a8_exec_opcode(struct target *target, +static int cortex_a_exec_opcode(struct target *target, uint32_t opcode, uint32_t *dscr_p) { uint32_t dscr; @@ -225,33 +222,33 @@ static int cortex_a8_exec_opcode(struct target *target, /* Wait for InstrCompl bit to be set */ long long then = timeval_ms(); while ((dscr & DSCR_INSTR_COMP) == 0) { - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) { LOG_ERROR("Could not read DSCR register, opcode = 0x%08" PRIx32, opcode); return retval; } if (timeval_ms() > then + 1000) { - LOG_ERROR("Timeout waiting for cortex_a8_exec_opcode"); + LOG_ERROR("Timeout waiting for cortex_a_exec_opcode"); return ERROR_FAIL; } } - retval = mem_ap_sel_write_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_ITR, opcode); if (retval != ERROR_OK) return retval; then = timeval_ms(); do { - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) { LOG_ERROR("Could not read DSCR register"); return retval; } if (timeval_ms() > then + 1000) { - LOG_ERROR("Timeout waiting for cortex_a8_exec_opcode"); + LOG_ERROR("Timeout waiting for cortex_a_exec_opcode"); return ERROR_FAIL; } } while ((dscr & DSCR_INSTR_COMP) == 0); /* Wait for InstrCompl bit to be set */ @@ -266,30 +263,30 @@ static int cortex_a8_exec_opcode(struct target *target, Read core register with very few exec_opcode, fast but needs work_area. This can cause problems with MMU active. **************************************************************************/ -static int cortex_a8_read_regs_through_mem(struct target *target, uint32_t address, +static int cortex_a_read_regs_through_mem(struct target *target, uint32_t address, uint32_t *regfile) { int retval = ERROR_OK; struct armv7a_common *armv7a = target_to_armv7a(target); struct adiv5_dap *swjdp = armv7a->arm.dap; - retval = cortex_a8_dap_read_coreregister_u32(target, regfile, 0); + retval = cortex_a_dap_read_coreregister_u32(target, regfile, 0); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_coreregister_u32(target, address, 0); + retval = cortex_a_dap_write_coreregister_u32(target, address, 0); if (retval != ERROR_OK) return retval; - retval = cortex_a8_exec_opcode(target, ARMV4_5_STMIA(0, 0xFFFE, 0, 0), NULL); + retval = cortex_a_exec_opcode(target, ARMV4_5_STMIA(0, 0xFFFE, 0, 0), NULL); if (retval != ERROR_OK) return retval; - retval = mem_ap_sel_read_buf_u32(swjdp, swjdp_memoryap, - (uint8_t *)(®file[1]), 4*15, address); + retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap, + (uint8_t *)(®file[1]), 4, 15, address); return retval; } -static int cortex_a8_dap_read_coreregister_u32(struct target *target, +static int cortex_a_dap_read_coreregister_u32(struct target *target, uint32_t *value, int regnum) { int retval = ERROR_OK; @@ -303,17 +300,17 @@ static int cortex_a8_dap_read_coreregister_u32(struct target *target, if (reg < 15) { /* Rn to DCCTX, "MCR p14, 0, Rn, c0, c5, 0" 0xEE00nE15 */ - retval = cortex_a8_exec_opcode(target, + retval = cortex_a_exec_opcode(target, ARMV4_5_MCR(14, 0, reg, 0, 5, 0), &dscr); if (retval != ERROR_OK) return retval; } else if (reg == 15) { /* "MOV r0, r15"; then move r0 to DCCTX */ - retval = cortex_a8_exec_opcode(target, 0xE1A0000F, &dscr); + retval = cortex_a_exec_opcode(target, 0xE1A0000F, &dscr); if (retval != ERROR_OK) return retval; - retval = cortex_a8_exec_opcode(target, + retval = cortex_a_exec_opcode(target, ARMV4_5_MCR(14, 0, 0, 0, 5, 0), &dscr); if (retval != ERROR_OK) @@ -322,10 +319,10 @@ static int cortex_a8_dap_read_coreregister_u32(struct target *target, /* "MRS r0, CPSR" or "MRS r0, SPSR" * then move r0 to DCCTX */ - retval = cortex_a8_exec_opcode(target, ARMV4_5_MRS(0, reg & 1), &dscr); + retval = cortex_a_exec_opcode(target, ARMV4_5_MRS(0, reg & 1), &dscr); if (retval != ERROR_OK) return retval; - retval = cortex_a8_exec_opcode(target, + retval = cortex_a_exec_opcode(target, ARMV4_5_MCR(14, 0, 0, 0, 5, 0), &dscr); if (retval != ERROR_OK) @@ -335,24 +332,24 @@ static int cortex_a8_dap_read_coreregister_u32(struct target *target, /* Wait for DTRRXfull then read DTRRTX */ long long then = timeval_ms(); while ((dscr & DSCR_DTR_TX_FULL) == 0) { - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; if (timeval_ms() > then + 1000) { - LOG_ERROR("Timeout waiting for cortex_a8_exec_opcode"); + LOG_ERROR("Timeout waiting for cortex_a_exec_opcode"); return ERROR_FAIL; } } - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DTRTX, value); LOG_DEBUG("read DCC 0x%08" PRIx32, *value); return retval; } -static int cortex_a8_dap_write_coreregister_u32(struct target *target, +static int cortex_a_dap_write_coreregister_u32(struct target *target, uint32_t value, int regnum) { int retval = ERROR_OK; @@ -364,14 +361,14 @@ static int cortex_a8_dap_write_coreregister_u32(struct target *target, LOG_DEBUG("register %i, value 0x%08" PRIx32, regnum, value); /* Check that DCCRX is not full */ - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; if (dscr & DSCR_DTR_RX_FULL) { LOG_ERROR("DSCR_DTR_RX_FULL, dscr 0x%08" PRIx32, dscr); /* Clear DCCRX with MRC(p14, 0, Rd, c0, c5, 0), opcode 0xEE100E15 */ - retval = cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + retval = cortex_a_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), &dscr); if (retval != ERROR_OK) return retval; @@ -382,14 +379,14 @@ static int cortex_a8_dap_write_coreregister_u32(struct target *target, /* Write DTRRX ... sets DSCR.DTRRXfull but exec_opcode() won't care */ LOG_DEBUG("write DCC 0x%08" PRIx32, value); - retval = mem_ap_sel_write_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DTRRX, value); if (retval != ERROR_OK) return retval; if (Rd < 15) { /* DCCRX to Rn, "MRC p14, 0, Rn, c0, c5, 0", 0xEE10nE15 */ - retval = cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, Rd, 0, 5, 0), + retval = cortex_a_exec_opcode(target, ARMV4_5_MRC(14, 0, Rd, 0, 5, 0), &dscr); if (retval != ERROR_OK) @@ -398,29 +395,29 @@ static int cortex_a8_dap_write_coreregister_u32(struct target *target, /* DCCRX to R0, "MRC p14, 0, R0, c0, c5, 0", 0xEE100E15 * then "mov r15, r0" */ - retval = cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + retval = cortex_a_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), &dscr); if (retval != ERROR_OK) return retval; - retval = cortex_a8_exec_opcode(target, 0xE1A0F000, &dscr); + retval = cortex_a_exec_opcode(target, 0xE1A0F000, &dscr); if (retval != ERROR_OK) return retval; } else { /* DCCRX to R0, "MRC p14, 0, R0, c0, c5, 0", 0xEE100E15 * then "MSR CPSR_cxsf, r0" or "MSR SPSR_cxsf, r0" (all fields) */ - retval = cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), + retval = cortex_a_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), &dscr); if (retval != ERROR_OK) return retval; - retval = cortex_a8_exec_opcode(target, ARMV4_5_MSR_GP(0, 0xF, Rd & 1), + retval = cortex_a_exec_opcode(target, ARMV4_5_MSR_GP(0, 0xF, Rd & 1), &dscr); if (retval != ERROR_OK) return retval; /* "Prefetch flush" after modifying execution status in CPSR */ if (Rd == 16) { - retval = cortex_a8_exec_opcode(target, + retval = cortex_a_exec_opcode(target, ARMV4_5_MCR(15, 0, 0, 7, 5, 4), &dscr); if (retval != ERROR_OK) @@ -432,7 +429,7 @@ static int cortex_a8_dap_write_coreregister_u32(struct target *target, } /* Write to memory mapped registers directly with no cache or mmu handling */ -static int cortex_a8_dap_write_memap_register_u32(struct target *target, +static int cortex_a_dap_write_memap_register_u32(struct target *target, uint32_t address, uint32_t value) { @@ -440,13 +437,13 @@ static int cortex_a8_dap_write_memap_register_u32(struct target *target, struct armv7a_common *armv7a = target_to_armv7a(target); struct adiv5_dap *swjdp = armv7a->arm.dap; - retval = mem_ap_sel_write_atomic_u32(swjdp, swjdp_debugap, address, value); + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, address, value); return retval; } /* - * Cortex-A8 implementation of Debug Programmer's Model + * Cortex-A implementation of Debug Programmer's Model * * NOTE the invariant: these routines return with DSCR_INSTR_COMP set, * so there's no need to poll for it before executing an instruction. @@ -456,22 +453,22 @@ static int cortex_a8_dap_write_memap_register_u32(struct target *target, * be the places to enable/disable that mode. */ -static inline struct cortex_a8_common *dpm_to_a8(struct arm_dpm *dpm) +static inline struct cortex_a_common *dpm_to_a(struct arm_dpm *dpm) { - return container_of(dpm, struct cortex_a8_common, armv7a_common.dpm); + return container_of(dpm, struct cortex_a_common, armv7a_common.dpm); } -static int cortex_a8_write_dcc(struct cortex_a8_common *a8, uint32_t data) +static int cortex_a_write_dcc(struct cortex_a_common *a, uint32_t data) { LOG_DEBUG("write DCC 0x%08" PRIx32, data); - return mem_ap_sel_write_u32(a8->armv7a_common.arm.dap, - swjdp_debugap, a8->armv7a_common.debug_base + CPUDBG_DTRRX, data); + return mem_ap_sel_write_u32(a->armv7a_common.arm.dap, + a->armv7a_common.debug_ap, a->armv7a_common.debug_base + CPUDBG_DTRRX, data); } -static int cortex_a8_read_dcc(struct cortex_a8_common *a8, uint32_t *data, +static int cortex_a_read_dcc(struct cortex_a_common *a, uint32_t *data, uint32_t *dscr_p) { - struct adiv5_dap *swjdp = a8->armv7a_common.arm.dap; + struct adiv5_dap *swjdp = a->armv7a_common.arm.dap; uint32_t dscr = DSCR_INSTR_COMP; int retval; @@ -481,8 +478,8 @@ static int cortex_a8_read_dcc(struct cortex_a8_common *a8, uint32_t *data, /* Wait for DTRRXfull */ long long then = timeval_ms(); while ((dscr & DSCR_DTR_TX_FULL) == 0) { - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, - a8->armv7a_common.debug_base + CPUDBG_DSCR, + retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap, + a->armv7a_common.debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; @@ -492,8 +489,8 @@ static int cortex_a8_read_dcc(struct cortex_a8_common *a8, uint32_t *data, } } - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, - a8->armv7a_common.debug_base + CPUDBG_DTRTX, data); + retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap, + a->armv7a_common.debug_base + CPUDBG_DTRTX, data); if (retval != ERROR_OK) return retval; /* LOG_DEBUG("read DCC 0x%08" PRIx32, *data); */ @@ -504,18 +501,18 @@ static int cortex_a8_read_dcc(struct cortex_a8_common *a8, uint32_t *data, return retval; } -static int cortex_a8_dpm_prepare(struct arm_dpm *dpm) +static int cortex_a_dpm_prepare(struct arm_dpm *dpm) { - struct cortex_a8_common *a8 = dpm_to_a8(dpm); - struct adiv5_dap *swjdp = a8->armv7a_common.arm.dap; + struct cortex_a_common *a = dpm_to_a(dpm); + struct adiv5_dap *swjdp = a->armv7a_common.arm.dap; uint32_t dscr; int retval; /* set up invariant: INSTR_COMP is set after ever DPM operation */ long long then = timeval_ms(); for (;; ) { - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, - a8->armv7a_common.debug_base + CPUDBG_DSCR, + retval = mem_ap_sel_read_atomic_u32(swjdp, a->armv7a_common.debug_ap, + a->armv7a_common.debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; @@ -531,8 +528,8 @@ static int cortex_a8_dpm_prepare(struct arm_dpm *dpm) if (dscr & DSCR_DTR_RX_FULL) { LOG_ERROR("DSCR_DTR_RX_FULL, dscr 0x%08" PRIx32, dscr); /* Clear DCCRX */ - retval = cortex_a8_exec_opcode( - a8->armv7a_common.arm.target, + retval = cortex_a_exec_opcode( + a->armv7a_common.arm.target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), &dscr); if (retval != ERROR_OK) @@ -542,119 +539,119 @@ static int cortex_a8_dpm_prepare(struct arm_dpm *dpm) return retval; } -static int cortex_a8_dpm_finish(struct arm_dpm *dpm) +static int cortex_a_dpm_finish(struct arm_dpm *dpm) { /* REVISIT what could be done here? */ return ERROR_OK; } -static int cortex_a8_instr_write_data_dcc(struct arm_dpm *dpm, +static int cortex_a_instr_write_data_dcc(struct arm_dpm *dpm, uint32_t opcode, uint32_t data) { - struct cortex_a8_common *a8 = dpm_to_a8(dpm); + struct cortex_a_common *a = dpm_to_a(dpm); int retval; uint32_t dscr = DSCR_INSTR_COMP; - retval = cortex_a8_write_dcc(a8, data); + retval = cortex_a_write_dcc(a, data); if (retval != ERROR_OK) return retval; - return cortex_a8_exec_opcode( - a8->armv7a_common.arm.target, + return cortex_a_exec_opcode( + a->armv7a_common.arm.target, opcode, &dscr); } -static int cortex_a8_instr_write_data_r0(struct arm_dpm *dpm, +static int cortex_a_instr_write_data_r0(struct arm_dpm *dpm, uint32_t opcode, uint32_t data) { - struct cortex_a8_common *a8 = dpm_to_a8(dpm); + struct cortex_a_common *a = dpm_to_a(dpm); uint32_t dscr = DSCR_INSTR_COMP; int retval; - retval = cortex_a8_write_dcc(a8, data); + retval = cortex_a_write_dcc(a, data); if (retval != ERROR_OK) return retval; /* DCCRX to R0, "MCR p14, 0, R0, c0, c5, 0", 0xEE000E15 */ - retval = cortex_a8_exec_opcode( - a8->armv7a_common.arm.target, + retval = cortex_a_exec_opcode( + a->armv7a_common.arm.target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), &dscr); if (retval != ERROR_OK) return retval; /* then the opcode, taking data from R0 */ - retval = cortex_a8_exec_opcode( - a8->armv7a_common.arm.target, + retval = cortex_a_exec_opcode( + a->armv7a_common.arm.target, opcode, &dscr); return retval; } -static int cortex_a8_instr_cpsr_sync(struct arm_dpm *dpm) +static int cortex_a_instr_cpsr_sync(struct arm_dpm *dpm) { struct target *target = dpm->arm->target; uint32_t dscr = DSCR_INSTR_COMP; /* "Prefetch flush" after modifying execution status in CPSR */ - return cortex_a8_exec_opcode(target, + return cortex_a_exec_opcode(target, ARMV4_5_MCR(15, 0, 0, 7, 5, 4), &dscr); } -static int cortex_a8_instr_read_data_dcc(struct arm_dpm *dpm, +static int cortex_a_instr_read_data_dcc(struct arm_dpm *dpm, uint32_t opcode, uint32_t *data) { - struct cortex_a8_common *a8 = dpm_to_a8(dpm); + struct cortex_a_common *a = dpm_to_a(dpm); int retval; uint32_t dscr = DSCR_INSTR_COMP; /* the opcode, writing data to DCC */ - retval = cortex_a8_exec_opcode( - a8->armv7a_common.arm.target, + retval = cortex_a_exec_opcode( + a->armv7a_common.arm.target, opcode, &dscr); if (retval != ERROR_OK) return retval; - return cortex_a8_read_dcc(a8, data, &dscr); + return cortex_a_read_dcc(a, data, &dscr); } -static int cortex_a8_instr_read_data_r0(struct arm_dpm *dpm, +static int cortex_a_instr_read_data_r0(struct arm_dpm *dpm, uint32_t opcode, uint32_t *data) { - struct cortex_a8_common *a8 = dpm_to_a8(dpm); + struct cortex_a_common *a = dpm_to_a(dpm); uint32_t dscr = DSCR_INSTR_COMP; int retval; /* the opcode, writing data to R0 */ - retval = cortex_a8_exec_opcode( - a8->armv7a_common.arm.target, + retval = cortex_a_exec_opcode( + a->armv7a_common.arm.target, opcode, &dscr); if (retval != ERROR_OK) return retval; /* write R0 to DCC */ - retval = cortex_a8_exec_opcode( - a8->armv7a_common.arm.target, + retval = cortex_a_exec_opcode( + a->armv7a_common.arm.target, ARMV4_5_MCR(14, 0, 0, 0, 5, 0), &dscr); if (retval != ERROR_OK) return retval; - return cortex_a8_read_dcc(a8, data, &dscr); + return cortex_a_read_dcc(a, data, &dscr); } -static int cortex_a8_bpwp_enable(struct arm_dpm *dpm, unsigned index_t, +static int cortex_a_bpwp_enable(struct arm_dpm *dpm, unsigned index_t, uint32_t addr, uint32_t control) { - struct cortex_a8_common *a8 = dpm_to_a8(dpm); - uint32_t vr = a8->armv7a_common.debug_base; - uint32_t cr = a8->armv7a_common.debug_base; + struct cortex_a_common *a = dpm_to_a(dpm); + uint32_t vr = a->armv7a_common.debug_base; + uint32_t cr = a->armv7a_common.debug_base; int retval; switch (index_t) { @@ -673,29 +670,29 @@ static int cortex_a8_bpwp_enable(struct arm_dpm *dpm, unsigned index_t, vr += 4 * index_t; cr += 4 * index_t; - LOG_DEBUG("A8: bpwp enable, vr %08x cr %08x", + LOG_DEBUG("A: bpwp enable, vr %08x cr %08x", (unsigned) vr, (unsigned) cr); - retval = cortex_a8_dap_write_memap_register_u32(dpm->arm->target, + retval = cortex_a_dap_write_memap_register_u32(dpm->arm->target, vr, addr); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_memap_register_u32(dpm->arm->target, + retval = cortex_a_dap_write_memap_register_u32(dpm->arm->target, cr, control); return retval; } -static int cortex_a8_bpwp_disable(struct arm_dpm *dpm, unsigned index_t) +static int cortex_a_bpwp_disable(struct arm_dpm *dpm, unsigned index_t) { - struct cortex_a8_common *a8 = dpm_to_a8(dpm); + struct cortex_a_common *a = dpm_to_a(dpm); uint32_t cr; switch (index_t) { case 0 ... 15: - cr = a8->armv7a_common.debug_base + CPUDBG_BCR_BASE; + cr = a->armv7a_common.debug_base + CPUDBG_BCR_BASE; break; case 16 ... 31: - cr = a8->armv7a_common.debug_base + CPUDBG_WCR_BASE; + cr = a->armv7a_common.debug_base + CPUDBG_WCR_BASE; index_t -= 16; break; default: @@ -703,32 +700,32 @@ static int cortex_a8_bpwp_disable(struct arm_dpm *dpm, unsigned index_t) } cr += 4 * index_t; - LOG_DEBUG("A8: bpwp disable, cr %08x", (unsigned) cr); + LOG_DEBUG("A: bpwp disable, cr %08x", (unsigned) cr); /* clear control register */ - return cortex_a8_dap_write_memap_register_u32(dpm->arm->target, cr, 0); + return cortex_a_dap_write_memap_register_u32(dpm->arm->target, cr, 0); } -static int cortex_a8_dpm_setup(struct cortex_a8_common *a8, uint32_t didr) +static int cortex_a_dpm_setup(struct cortex_a_common *a, uint32_t didr) { - struct arm_dpm *dpm = &a8->armv7a_common.dpm; + struct arm_dpm *dpm = &a->armv7a_common.dpm; int retval; - dpm->arm = &a8->armv7a_common.arm; + dpm->arm = &a->armv7a_common.arm; dpm->didr = didr; - dpm->prepare = cortex_a8_dpm_prepare; - dpm->finish = cortex_a8_dpm_finish; + dpm->prepare = cortex_a_dpm_prepare; + dpm->finish = cortex_a_dpm_finish; - dpm->instr_write_data_dcc = cortex_a8_instr_write_data_dcc; - dpm->instr_write_data_r0 = cortex_a8_instr_write_data_r0; - dpm->instr_cpsr_sync = cortex_a8_instr_cpsr_sync; + dpm->instr_write_data_dcc = cortex_a_instr_write_data_dcc; + dpm->instr_write_data_r0 = cortex_a_instr_write_data_r0; + dpm->instr_cpsr_sync = cortex_a_instr_cpsr_sync; - dpm->instr_read_data_dcc = cortex_a8_instr_read_data_dcc; - dpm->instr_read_data_r0 = cortex_a8_instr_read_data_r0; + dpm->instr_read_data_dcc = cortex_a_instr_read_data_dcc; + dpm->instr_read_data_r0 = cortex_a_instr_read_data_r0; - dpm->bpwp_enable = cortex_a8_bpwp_enable; - dpm->bpwp_disable = cortex_a8_bpwp_disable; + dpm->bpwp_enable = cortex_a_bpwp_enable; + dpm->bpwp_disable = cortex_a_bpwp_disable; retval = arm_dpm_setup(dpm); if (retval == ERROR_OK) @@ -736,7 +733,7 @@ static int cortex_a8_dpm_setup(struct cortex_a8_common *a8, uint32_t didr) return retval; } -static struct target *get_cortex_a8(struct target *target, int32_t coreid) +static struct target *get_cortex_a(struct target *target, int32_t coreid) { struct target_list *head; struct target *curr; @@ -750,9 +747,9 @@ static struct target *get_cortex_a8(struct target *target, int32_t coreid) } return target; } -static int cortex_a8_halt(struct target *target); +static int cortex_a_halt(struct target *target); -static int cortex_a8_halt_smp(struct target *target) +static int cortex_a_halt_smp(struct target *target) { int retval = 0; struct target_list *head; @@ -761,7 +758,7 @@ static int cortex_a8_halt_smp(struct target *target) while (head != (struct target_list *)NULL) { curr = head->target; if ((curr != target) && (curr->state != TARGET_HALTED)) - retval += cortex_a8_halt(curr); + retval += cortex_a_halt(curr); head = head->next; } return retval; @@ -770,24 +767,24 @@ static int cortex_a8_halt_smp(struct target *target) static int update_halt_gdb(struct target *target) { int retval = 0; - if (target->gdb_service->core[0] == -1) { + if (target->gdb_service && target->gdb_service->core[0] == -1) { target->gdb_service->target = target; target->gdb_service->core[0] = target->coreid; - retval += cortex_a8_halt_smp(target); + retval += cortex_a_halt_smp(target); } return retval; } /* - * Cortex-A8 Run control + * Cortex-A Run control */ -static int cortex_a8_poll(struct target *target) +static int cortex_a_poll(struct target *target) { int retval = ERROR_OK; uint32_t dscr; - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common *armv7a = &cortex_a8->armv7a_common; + struct cortex_a_common *cortex_a = target_to_cortex_a(target); + struct armv7a_common *armv7a = &cortex_a->armv7a_common; struct adiv5_dap *swjdp = armv7a->arm.dap; enum target_state prev_target_state = target->state; /* toggle to another core is done by gdb as follow */ @@ -798,15 +795,15 @@ static int cortex_a8_poll(struct target *target) (target->gdb_service) && (target->gdb_service->target == NULL)) { target->gdb_service->target = - get_cortex_a8(target, target->gdb_service->core[1]); + get_cortex_a(target, target->gdb_service->core[1]); target_call_event_callbacks(target, TARGET_EVENT_HALTED); return retval; } - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; - cortex_a8->cpudbg_dscr = dscr; + cortex_a->cpudbg_dscr = dscr; if (DSCR_RUN_MODE(dscr) == (DSCR_CORE_HALTED | DSCR_CORE_RESTARTED)) { if (prev_target_state != TARGET_HALTED) { @@ -816,7 +813,7 @@ static int cortex_a8_poll(struct target *target) if ((prev_target_state == TARGET_RUNNING) || (prev_target_state == TARGET_UNKNOWN) || (prev_target_state == TARGET_RESET)) { - retval = cortex_a8_debug_entry(target); + retval = cortex_a_debug_entry(target); if (retval != ERROR_OK) return retval; if (target->smp) { @@ -830,7 +827,7 @@ static int cortex_a8_poll(struct target *target) if (prev_target_state == TARGET_DEBUG_RUNNING) { LOG_DEBUG(" "); - retval = cortex_a8_debug_entry(target); + retval = cortex_a_debug_entry(target); if (retval != ERROR_OK) return retval; if (target->smp) { @@ -853,7 +850,7 @@ static int cortex_a8_poll(struct target *target) return retval; } -static int cortex_a8_halt(struct target *target) +static int cortex_a_halt(struct target *target) { int retval = ERROR_OK; uint32_t dscr; @@ -864,7 +861,7 @@ static int cortex_a8_halt(struct target *target) * Tell the core to be halted by writing DRCR with 0x1 * and then wait for the core to be halted. */ - retval = mem_ap_sel_write_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DRCR, DRCR_HALT); if (retval != ERROR_OK) return retval; @@ -872,19 +869,19 @@ static int cortex_a8_halt(struct target *target) /* * enter halting debug mode */ - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; - retval = mem_ap_sel_write_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, dscr | DSCR_HALT_DBG_MODE); if (retval != ERROR_OK) return retval; long long then = timeval_ms(); for (;; ) { - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; @@ -901,7 +898,7 @@ static int cortex_a8_halt(struct target *target) return ERROR_OK; } -static int cortex_a8_internal_restore(struct target *target, int current, +static int cortex_a_internal_restore(struct target *target, int current, uint32_t *address, int handle_breakpoints, int debug_execution) { struct armv7a_common *armv7a = target_to_armv7a(target); @@ -966,10 +963,10 @@ static int cortex_a8_internal_restore(struct target *target, int current, dpm_modeswitch(&armv7a->dpm, ARM_MODE_ANY); /* called it now before restoring context because it uses cpu * register r0 for restoring cp15 control register */ - retval = cortex_a8_restore_cp15_control_reg(target); + retval = cortex_a_restore_cp15_control_reg(target); if (retval != ERROR_OK) return retval; - retval = cortex_a8_restore_context(target, handle_breakpoints); + retval = cortex_a_restore_context(target, handle_breakpoints); if (retval != ERROR_OK) return retval; target->debug_reason = DBG_REASON_NOTHALTED; @@ -995,7 +992,7 @@ static int cortex_a8_internal_restore(struct target *target, int current, return retval; } -static int cortex_a8_internal_restart(struct target *target) +static int cortex_a_internal_restart(struct target *target) { struct armv7a_common *armv7a = target_to_armv7a(target); struct arm *arm = &armv7a->arm; @@ -1010,7 +1007,7 @@ static int cortex_a8_internal_restart(struct target *target) * disable IRQs by default, with optional override... */ - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; @@ -1018,12 +1015,12 @@ static int cortex_a8_internal_restart(struct target *target) if ((dscr & DSCR_INSTR_COMP) == 0) LOG_ERROR("DSCR InstrCompl must be set before leaving debug!"); - retval = mem_ap_sel_write_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, dscr & ~DSCR_ITR_EN); if (retval != ERROR_OK) return retval; - retval = mem_ap_sel_write_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DRCR, DRCR_RESTART | DRCR_CLEAR_EXCEPTIONS); if (retval != ERROR_OK) @@ -1031,7 +1028,7 @@ static int cortex_a8_internal_restart(struct target *target) long long then = timeval_ms(); for (;; ) { - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; @@ -1052,7 +1049,7 @@ static int cortex_a8_internal_restart(struct target *target) return ERROR_OK; } -static int cortex_a8_restore_smp(struct target *target, int handle_breakpoints) +static int cortex_a_restore_smp(struct target *target, int handle_breakpoints) { int retval = 0; struct target_list *head; @@ -1063,9 +1060,9 @@ static int cortex_a8_restore_smp(struct target *target, int handle_breakpoints) curr = head->target; if ((curr != target) && (curr->state != TARGET_RUNNING)) { /* resume current address , not in step mode */ - retval += cortex_a8_internal_restore(curr, 1, &address, + retval += cortex_a_internal_restore(curr, 1, &address, handle_breakpoints, 0); - retval += cortex_a8_internal_restart(curr); + retval += cortex_a_internal_restart(curr); } head = head->next; @@ -1073,7 +1070,7 @@ static int cortex_a8_restore_smp(struct target *target, int handle_breakpoints) return retval; } -static int cortex_a8_resume(struct target *target, int current, +static int cortex_a_resume(struct target *target, int current, uint32_t address, int handle_breakpoints, int debug_execution) { int retval = 0; @@ -1086,14 +1083,14 @@ static int cortex_a8_resume(struct target *target, int current, target_call_event_callbacks(target, TARGET_EVENT_RESUMED); return 0; } - cortex_a8_internal_restore(target, current, &address, handle_breakpoints, debug_execution); + cortex_a_internal_restore(target, current, &address, handle_breakpoints, debug_execution); if (target->smp) { target->gdb_service->core[0] = -1; - retval = cortex_a8_restore_smp(target, handle_breakpoints); + retval = cortex_a_restore_smp(target, handle_breakpoints); if (retval != ERROR_OK) return retval; } - cortex_a8_internal_restart(target); + cortex_a_internal_restart(target); if (!debug_execution) { target->state = TARGET_RUNNING; @@ -1108,46 +1105,46 @@ static int cortex_a8_resume(struct target *target, int current, return ERROR_OK; } -static int cortex_a8_debug_entry(struct target *target) +static int cortex_a_debug_entry(struct target *target) { int i; uint32_t regfile[16], cpsr, dscr; int retval = ERROR_OK; struct working_area *regfile_working_area = NULL; - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); + struct cortex_a_common *cortex_a = target_to_cortex_a(target); struct armv7a_common *armv7a = target_to_armv7a(target); struct arm *arm = &armv7a->arm; struct adiv5_dap *swjdp = armv7a->arm.dap; struct reg *reg; - LOG_DEBUG("dscr = 0x%08" PRIx32, cortex_a8->cpudbg_dscr); + LOG_DEBUG("dscr = 0x%08" PRIx32, cortex_a->cpudbg_dscr); /* REVISIT surely we should not re-read DSCR !! */ - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); if (retval != ERROR_OK) return retval; - /* REVISIT see A8 TRM 12.11.4 steps 2..3 -- make sure that any + /* REVISIT see A TRM 12.11.4 steps 2..3 -- make sure that any * imprecise data aborts get discarded by issuing a Data * Synchronization Barrier: ARMV4_5_MCR(15, 0, 0, 7, 10, 4). */ /* Enable the ITR execution once we are in debug mode */ dscr |= DSCR_ITR_EN; - retval = mem_ap_sel_write_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, dscr); if (retval != ERROR_OK) return retval; /* Examine debug reason */ - arm_dpm_report_dscr(&armv7a->dpm, cortex_a8->cpudbg_dscr); + arm_dpm_report_dscr(&armv7a->dpm, cortex_a->cpudbg_dscr); /* save address of instruction that triggered the watchpoint? */ if (target->debug_reason == DBG_REASON_WATCHPOINT) { uint32_t wfar; - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_WFAR, &wfar); if (retval != ERROR_OK) @@ -1158,14 +1155,14 @@ static int cortex_a8_debug_entry(struct target *target) /* REVISIT fast_reg_read is never set ... */ /* Examine target state and mode */ - if (cortex_a8->fast_reg_read) + if (cortex_a->fast_reg_read) target_alloc_working_area(target, 64, ®file_working_area); /* First load register acessible through core debug port*/ if (!regfile_working_area) retval = arm_dpm_read_current_registers(&armv7a->dpm); else { - retval = cortex_a8_read_regs_through_mem(target, + retval = cortex_a_read_regs_through_mem(target, regfile_working_area->address, regfile); target_free_working_area(target, regfile_working_area); @@ -1173,7 +1170,7 @@ static int cortex_a8_debug_entry(struct target *target) return retval; /* read Current PSR */ - retval = cortex_a8_dap_read_coreregister_u32(target, &cpsr, 16); + retval = cortex_a_dap_read_coreregister_u32(target, &cpsr, 16); /* store current cpsr */ if (retval != ERROR_OK) return retval; @@ -1208,13 +1205,13 @@ static int cortex_a8_debug_entry(struct target *target) #if 0 /* TODO, Move this */ uint32_t cp15_control_register, cp15_cacr, cp15_nacr; - cortex_a8_read_cp(target, &cp15_control_register, 15, 0, 1, 0, 0); + cortex_a_read_cp(target, &cp15_control_register, 15, 0, 1, 0, 0); LOG_DEBUG("cp15_control_register = 0x%08x", cp15_control_register); - cortex_a8_read_cp(target, &cp15_cacr, 15, 0, 1, 0, 2); + cortex_a_read_cp(target, &cp15_cacr, 15, 0, 1, 0, 2); LOG_DEBUG("cp15 Coprocessor Access Control Register = 0x%08x", cp15_cacr); - cortex_a8_read_cp(target, &cp15_nacr, 15, 0, 1, 1, 2); + cortex_a_read_cp(target, &cp15_nacr, 15, 0, 1, 1, 2); LOG_DEBUG("cp15 Nonsecure Access Control Register = 0x%08x", cp15_nacr); #endif @@ -1229,37 +1226,41 @@ static int cortex_a8_debug_entry(struct target *target) return retval; } -static int cortex_a8_post_debug_entry(struct target *target) +static int cortex_a_post_debug_entry(struct target *target) { - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common *armv7a = &cortex_a8->armv7a_common; + struct cortex_a_common *cortex_a = target_to_cortex_a(target); + struct armv7a_common *armv7a = &cortex_a->armv7a_common; int retval; /* MRC p15,0,,c1,c0,0 ; Read CP15 System Control Register */ retval = armv7a->arm.mrc(target, 15, 0, 0, /* op1, op2 */ 1, 0, /* CRn, CRm */ - &cortex_a8->cp15_control_reg); + &cortex_a->cp15_control_reg); if (retval != ERROR_OK) return retval; - LOG_DEBUG("cp15_control_reg: %8.8" PRIx32, cortex_a8->cp15_control_reg); - cortex_a8->cp15_control_reg_curr = cortex_a8->cp15_control_reg; + LOG_DEBUG("cp15_control_reg: %8.8" PRIx32, cortex_a->cp15_control_reg); + cortex_a->cp15_control_reg_curr = cortex_a->cp15_control_reg; if (armv7a->armv7a_mmu.armv7a_cache.ctype == -1) armv7a_identify_cache(target); - armv7a->armv7a_mmu.mmu_enabled = - (cortex_a8->cp15_control_reg & 0x1U) ? 1 : 0; + if (armv7a->is_armv7r) { + armv7a->armv7a_mmu.mmu_enabled = 0; + } else { + armv7a->armv7a_mmu.mmu_enabled = + (cortex_a->cp15_control_reg & 0x1U) ? 1 : 0; + } armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled = - (cortex_a8->cp15_control_reg & 0x4U) ? 1 : 0; + (cortex_a->cp15_control_reg & 0x4U) ? 1 : 0; armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled = - (cortex_a8->cp15_control_reg & 0x1000U) ? 1 : 0; - cortex_a8->curr_mode = armv7a->arm.core_mode; + (cortex_a->cp15_control_reg & 0x1000U) ? 1 : 0; + cortex_a->curr_mode = armv7a->arm.core_mode; return ERROR_OK; } -static int cortex_a8_step(struct target *target, int current, uint32_t address, +static int cortex_a_step(struct target *target, int current, uint32_t address, int handle_breakpoints) { struct armv7a_common *armv7a = target_to_armv7a(target); @@ -1282,14 +1283,14 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address, address = buf_get_u32(r->value, 0, 32); /* The front-end may request us not to handle breakpoints. - * But since Cortex-A8 uses breakpoint for single step, + * But since Cortex-A uses breakpoint for single step, * we MUST handle breakpoints. */ handle_breakpoints = 1; if (handle_breakpoints) { breakpoint = breakpoint_find(target, address); if (breakpoint) - cortex_a8_unset_breakpoint(target, breakpoint); + cortex_a_unset_breakpoint(target, breakpoint); } /* Setup single step breakpoint */ @@ -1300,17 +1301,17 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address, stepbreakpoint.set = 0; /* Break on IVA mismatch */ - cortex_a8_set_breakpoint(target, &stepbreakpoint, 0x04); + cortex_a_set_breakpoint(target, &stepbreakpoint, 0x04); target->debug_reason = DBG_REASON_SINGLESTEP; - retval = cortex_a8_resume(target, 1, address, 0, 0); + retval = cortex_a_resume(target, 1, address, 0, 0); if (retval != ERROR_OK) return retval; long long then = timeval_ms(); while (target->state != TARGET_HALTED) { - retval = cortex_a8_poll(target); + retval = cortex_a_poll(target); if (retval != ERROR_OK) return retval; if (timeval_ms() > then + 1000) { @@ -1319,12 +1320,12 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address, } } - cortex_a8_unset_breakpoint(target, &stepbreakpoint); + cortex_a_unset_breakpoint(target, &stepbreakpoint); target->debug_reason = DBG_REASON_BREAKPOINT; if (breakpoint) - cortex_a8_set_breakpoint(target, breakpoint, 0); + cortex_a_set_breakpoint(target, breakpoint, 0); if (target->state != TARGET_HALTED) LOG_DEBUG("target stepped"); @@ -1332,7 +1333,7 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address, return ERROR_OK; } -static int cortex_a8_restore_context(struct target *target, bool bpwp) +static int cortex_a_restore_context(struct target *target, bool bpwp) { struct armv7a_common *armv7a = target_to_armv7a(target); @@ -1345,20 +1346,20 @@ static int cortex_a8_restore_context(struct target *target, bool bpwp) } /* - * Cortex-A8 Breakpoint and watchpoint functions + * Cortex-A Breakpoint and watchpoint functions */ /* Setup hardware Breakpoint Register Pair */ -static int cortex_a8_set_breakpoint(struct target *target, +static int cortex_a_set_breakpoint(struct target *target, struct breakpoint *breakpoint, uint8_t matchmode) { int retval; int brp_i = 0; uint32_t control; uint8_t byte_addr_select = 0x0F; - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common *armv7a = &cortex_a8->armv7a_common; - struct cortex_a8_brp *brp_list = cortex_a8->brp_list; + struct cortex_a_common *cortex_a = target_to_cortex_a(target); + struct armv7a_common *armv7a = &cortex_a->armv7a_common; + struct cortex_a_brp *brp_list = cortex_a->brp_list; if (breakpoint->set) { LOG_WARNING("breakpoint already set"); @@ -1366,9 +1367,9 @@ static int cortex_a8_set_breakpoint(struct target *target, } if (breakpoint->type == BKPT_HARD) { - while (brp_list[brp_i].used && (brp_i < cortex_a8->brp_num)) + while (brp_list[brp_i].used && (brp_i < cortex_a->brp_num)) brp_i++; - if (brp_i >= cortex_a8->brp_num) { + if (brp_i >= cortex_a->brp_num) { LOG_ERROR("ERROR Can not find free Breakpoint Register Pair"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } @@ -1381,12 +1382,12 @@ static int cortex_a8_set_breakpoint(struct target *target, brp_list[brp_i].used = 1; brp_list[brp_i].value = (breakpoint->address & 0xFFFFFFFC); brp_list[brp_i].control = control; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BVR_BASE + 4 * brp_list[brp_i].BRPn, brp_list[brp_i].value); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BCR_BASE + 4 * brp_list[brp_i].BRPn, brp_list[brp_i].control); if (retval != ERROR_OK) @@ -1417,16 +1418,16 @@ static int cortex_a8_set_breakpoint(struct target *target, return ERROR_OK; } -static int cortex_a8_set_context_breakpoint(struct target *target, +static int cortex_a_set_context_breakpoint(struct target *target, struct breakpoint *breakpoint, uint8_t matchmode) { int retval = ERROR_FAIL; int brp_i = 0; uint32_t control; uint8_t byte_addr_select = 0x0F; - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common *armv7a = &cortex_a8->armv7a_common; - struct cortex_a8_brp *brp_list = cortex_a8->brp_list; + struct cortex_a_common *cortex_a = target_to_cortex_a(target); + struct armv7a_common *armv7a = &cortex_a->armv7a_common; + struct cortex_a_brp *brp_list = cortex_a->brp_list; if (breakpoint->set) { LOG_WARNING("breakpoint already set"); @@ -1434,10 +1435,10 @@ static int cortex_a8_set_context_breakpoint(struct target *target, } /*check available context BRPs*/ while ((brp_list[brp_i].used || - (brp_list[brp_i].type != BRP_CONTEXT)) && (brp_i < cortex_a8->brp_num)) + (brp_list[brp_i].type != BRP_CONTEXT)) && (brp_i < cortex_a->brp_num)) brp_i++; - if (brp_i >= cortex_a8->brp_num) { + if (brp_i >= cortex_a->brp_num) { LOG_ERROR("ERROR Can not find free Breakpoint Register Pair"); return ERROR_FAIL; } @@ -1449,12 +1450,12 @@ static int cortex_a8_set_context_breakpoint(struct target *target, brp_list[brp_i].used = 1; brp_list[brp_i].value = (breakpoint->asid); brp_list[brp_i].control = control; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BVR_BASE + 4 * brp_list[brp_i].BRPn, brp_list[brp_i].value); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BCR_BASE + 4 * brp_list[brp_i].BRPn, brp_list[brp_i].control); if (retval != ERROR_OK) @@ -1466,7 +1467,7 @@ static int cortex_a8_set_context_breakpoint(struct target *target, } -static int cortex_a8_set_hybrid_breakpoint(struct target *target, struct breakpoint *breakpoint) +static int cortex_a_set_hybrid_breakpoint(struct target *target, struct breakpoint *breakpoint) { int retval = ERROR_FAIL; int brp_1 = 0; /* holds the contextID pair */ @@ -1476,9 +1477,9 @@ static int cortex_a8_set_hybrid_breakpoint(struct target *target, struct breakpo uint8_t IVA_byte_addr_select = 0x0F; uint8_t CTX_machmode = 0x03; uint8_t IVA_machmode = 0x01; - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common *armv7a = &cortex_a8->armv7a_common; - struct cortex_a8_brp *brp_list = cortex_a8->brp_list; + struct cortex_a_common *cortex_a = target_to_cortex_a(target); + struct armv7a_common *armv7a = &cortex_a->armv7a_common; + struct cortex_a_brp *brp_list = cortex_a->brp_list; if (breakpoint->set) { LOG_WARNING("breakpoint already set"); @@ -1486,21 +1487,21 @@ static int cortex_a8_set_hybrid_breakpoint(struct target *target, struct breakpo } /*check available context BRPs*/ while ((brp_list[brp_1].used || - (brp_list[brp_1].type != BRP_CONTEXT)) && (brp_1 < cortex_a8->brp_num)) + (brp_list[brp_1].type != BRP_CONTEXT)) && (brp_1 < cortex_a->brp_num)) brp_1++; printf("brp(CTX) found num: %d\n", brp_1); - if (brp_1 >= cortex_a8->brp_num) { + if (brp_1 >= cortex_a->brp_num) { LOG_ERROR("ERROR Can not find free Breakpoint Register Pair"); return ERROR_FAIL; } while ((brp_list[brp_2].used || - (brp_list[brp_2].type != BRP_NORMAL)) && (brp_2 < cortex_a8->brp_num)) + (brp_list[brp_2].type != BRP_NORMAL)) && (brp_2 < cortex_a->brp_num)) brp_2++; printf("brp(IVA) found num: %d\n", brp_2); - if (brp_2 >= cortex_a8->brp_num) { + if (brp_2 >= cortex_a->brp_num) { LOG_ERROR("ERROR Can not find free Breakpoint Register Pair"); return ERROR_FAIL; } @@ -1515,12 +1516,12 @@ static int cortex_a8_set_hybrid_breakpoint(struct target *target, struct breakpo brp_list[brp_1].used = 1; brp_list[brp_1].value = (breakpoint->asid); brp_list[brp_1].control = control_CTX; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BVR_BASE + 4 * brp_list[brp_1].BRPn, brp_list[brp_1].value); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BCR_BASE + 4 * brp_list[brp_1].BRPn, brp_list[brp_1].control); if (retval != ERROR_OK) @@ -1533,12 +1534,12 @@ static int cortex_a8_set_hybrid_breakpoint(struct target *target, struct breakpo brp_list[brp_2].used = 1; brp_list[brp_2].value = (breakpoint->address & 0xFFFFFFFC); brp_list[brp_2].control = control_IVA; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BVR_BASE + 4 * brp_list[brp_2].BRPn, brp_list[brp_2].value); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BCR_BASE + 4 * brp_list[brp_2].BRPn, brp_list[brp_2].control); if (retval != ERROR_OK) @@ -1547,12 +1548,12 @@ static int cortex_a8_set_hybrid_breakpoint(struct target *target, struct breakpo return ERROR_OK; } -static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint *breakpoint) +static int cortex_a_unset_breakpoint(struct target *target, struct breakpoint *breakpoint) { int retval; - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common *armv7a = &cortex_a8->armv7a_common; - struct cortex_a8_brp *brp_list = cortex_a8->brp_list; + struct cortex_a_common *cortex_a = target_to_cortex_a(target); + struct armv7a_common *armv7a = &cortex_a->armv7a_common; + struct cortex_a_brp *brp_list = cortex_a->brp_list; if (!breakpoint->set) { LOG_WARNING("breakpoint not set"); @@ -1563,7 +1564,7 @@ static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint * if ((breakpoint->address != 0) && (breakpoint->asid != 0)) { int brp_i = breakpoint->set - 1; int brp_j = breakpoint->linked_BRP; - if ((brp_i < 0) || (brp_i >= cortex_a8->brp_num)) { + if ((brp_i < 0) || (brp_i >= cortex_a->brp_num)) { LOG_DEBUG("Invalid BRP number in breakpoint"); return ERROR_OK; } @@ -1572,17 +1573,17 @@ static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint * brp_list[brp_i].used = 0; brp_list[brp_i].value = 0; brp_list[brp_i].control = 0; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BCR_BASE + 4 * brp_list[brp_i].BRPn, brp_list[brp_i].control); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BVR_BASE + 4 * brp_list[brp_i].BRPn, brp_list[brp_i].value); if (retval != ERROR_OK) return retval; - if ((brp_j < 0) || (brp_j >= cortex_a8->brp_num)) { + if ((brp_j < 0) || (brp_j >= cortex_a->brp_num)) { LOG_DEBUG("Invalid BRP number in breakpoint"); return ERROR_OK; } @@ -1591,12 +1592,12 @@ static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint * brp_list[brp_j].used = 0; brp_list[brp_j].value = 0; brp_list[brp_j].control = 0; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BCR_BASE + 4 * brp_list[brp_j].BRPn, brp_list[brp_j].control); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BVR_BASE + 4 * brp_list[brp_j].BRPn, brp_list[brp_j].value); if (retval != ERROR_OK) @@ -1607,7 +1608,7 @@ static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint * } else { int brp_i = breakpoint->set - 1; - if ((brp_i < 0) || (brp_i >= cortex_a8->brp_num)) { + if ((brp_i < 0) || (brp_i >= cortex_a->brp_num)) { LOG_DEBUG("Invalid BRP number in breakpoint"); return ERROR_OK; } @@ -1616,12 +1617,12 @@ static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint * brp_list[brp_i].used = 0; brp_list[brp_i].value = 0; brp_list[brp_i].control = 0; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BCR_BASE + 4 * brp_list[brp_i].BRPn, brp_list[brp_i].control); if (retval != ERROR_OK) return retval; - retval = cortex_a8_dap_write_memap_register_u32(target, armv7a->debug_base + retval = cortex_a_dap_write_memap_register_u32(target, armv7a->debug_base + CPUDBG_BVR_BASE + 4 * brp_list[brp_i].BRPn, brp_list[brp_i].value); if (retval != ERROR_OK) @@ -1650,58 +1651,58 @@ static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint * return ERROR_OK; } -static int cortex_a8_add_breakpoint(struct target *target, +static int cortex_a_add_breakpoint(struct target *target, struct breakpoint *breakpoint) { - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); + struct cortex_a_common *cortex_a = target_to_cortex_a(target); - if ((breakpoint->type == BKPT_HARD) && (cortex_a8->brp_num_available < 1)) { + if ((breakpoint->type == BKPT_HARD) && (cortex_a->brp_num_available < 1)) { LOG_INFO("no hardware breakpoint available"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } if (breakpoint->type == BKPT_HARD) - cortex_a8->brp_num_available--; + cortex_a->brp_num_available--; - return cortex_a8_set_breakpoint(target, breakpoint, 0x00); /* Exact match */ + return cortex_a_set_breakpoint(target, breakpoint, 0x00); /* Exact match */ } -static int cortex_a8_add_context_breakpoint(struct target *target, +static int cortex_a_add_context_breakpoint(struct target *target, struct breakpoint *breakpoint) { - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); + struct cortex_a_common *cortex_a = target_to_cortex_a(target); - if ((breakpoint->type == BKPT_HARD) && (cortex_a8->brp_num_available < 1)) { + if ((breakpoint->type == BKPT_HARD) && (cortex_a->brp_num_available < 1)) { LOG_INFO("no hardware breakpoint available"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } if (breakpoint->type == BKPT_HARD) - cortex_a8->brp_num_available--; + cortex_a->brp_num_available--; - return cortex_a8_set_context_breakpoint(target, breakpoint, 0x02); /* asid match */ + return cortex_a_set_context_breakpoint(target, breakpoint, 0x02); /* asid match */ } -static int cortex_a8_add_hybrid_breakpoint(struct target *target, +static int cortex_a_add_hybrid_breakpoint(struct target *target, struct breakpoint *breakpoint) { - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); + struct cortex_a_common *cortex_a = target_to_cortex_a(target); - if ((breakpoint->type == BKPT_HARD) && (cortex_a8->brp_num_available < 1)) { + if ((breakpoint->type == BKPT_HARD) && (cortex_a->brp_num_available < 1)) { LOG_INFO("no hardware breakpoint available"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } if (breakpoint->type == BKPT_HARD) - cortex_a8->brp_num_available--; + cortex_a->brp_num_available--; - return cortex_a8_set_hybrid_breakpoint(target, breakpoint); /* ??? */ + return cortex_a_set_hybrid_breakpoint(target, breakpoint); /* ??? */ } -static int cortex_a8_remove_breakpoint(struct target *target, struct breakpoint *breakpoint) +static int cortex_a_remove_breakpoint(struct target *target, struct breakpoint *breakpoint) { - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); + struct cortex_a_common *cortex_a = target_to_cortex_a(target); #if 0 /* It is perfectly possible to remove breakpoints while the target is running */ @@ -1712,9 +1713,9 @@ static int cortex_a8_remove_breakpoint(struct target *target, struct breakpoint #endif if (breakpoint->set) { - cortex_a8_unset_breakpoint(target, breakpoint); + cortex_a_unset_breakpoint(target, breakpoint); if (breakpoint->type == BKPT_HARD) - cortex_a8->brp_num_available++; + cortex_a->brp_num_available++; } @@ -1722,10 +1723,10 @@ static int cortex_a8_remove_breakpoint(struct target *target, struct breakpoint } /* - * Cortex-A8 Reset functions + * Cortex-A Reset functions */ -static int cortex_a8_assert_reset(struct target *target) +static int cortex_a_assert_reset(struct target *target) { struct armv7a_common *armv7a = target_to_armv7a(target); @@ -1754,7 +1755,7 @@ static int cortex_a8_assert_reset(struct target *target) return ERROR_OK; } -static int cortex_a8_deassert_reset(struct target *target) +static int cortex_a_deassert_reset(struct target *target) { int retval; @@ -1763,7 +1764,7 @@ static int cortex_a8_deassert_reset(struct target *target) /* be certain SRST is off */ jtag_add_reset(0, 0); - retval = cortex_a8_poll(target); + retval = cortex_a_poll(target); if (retval != ERROR_OK) return retval; @@ -1780,7 +1781,7 @@ static int cortex_a8_deassert_reset(struct target *target) return ERROR_OK; } -static int cortex_a8_write_apb_ab_memory(struct target *target, +static int cortex_a_write_apb_ab_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer) { @@ -1798,6 +1799,8 @@ static int cortex_a8_write_apb_ab_memory(struct target *target, uint32_t dscr; uint8_t *tmp_buff = NULL; + LOG_DEBUG("Writing APB-AP memory address 0x%" PRIx32 " size %" PRIu32 " count%" PRIu32, + address, size, count); if (target->state != TARGET_HALTED) { LOG_WARNING("target not halted"); return ERROR_TARGET_NOT_HALTED; @@ -1819,7 +1822,7 @@ static int cortex_a8_write_apb_ab_memory(struct target *target, return retval; /* This algorithm comes from either : - * Cortex-A8 TRM Example 12-25 + * Cortex-A TRM Example 12-25 * Cortex-R4 TRM Example 11-26 * (slight differences) */ @@ -1829,14 +1832,13 @@ static int cortex_a8_write_apb_ab_memory(struct target *target, * The first and last words will be read first to avoid * corruption if needed. */ - tmp_buff = (uint8_t *) malloc(total_u32 << 2); - + tmp_buff = malloc(total_u32 * 4); if ((start_byte != 0) && (total_u32 > 1)) { /* First bytes not aligned - read the 32 bit word to avoid corrupting * the other bytes in the word. */ - retval = cortex_a8_read_apb_ab_memory(target, (address & ~0x3), 4, 1, tmp_buff); + retval = cortex_a_read_apb_ab_memory(target, (address & ~0x3), 4, 1, tmp_buff); if (retval != ERROR_OK) goto error_free_buff_w; } @@ -1846,8 +1848,8 @@ static int cortex_a8_write_apb_ab_memory(struct target *target, ((total_u32 == 1) && (total_bytes != 4))) { /* Read the last word to avoid corruption during 32 bit write */ - int mem_offset = (total_u32-1) << 4; - retval = cortex_a8_read_apb_ab_memory(target, (address & ~0x3) + mem_offset, 4, 1, &tmp_buff[mem_offset]); + int mem_offset = (total_u32-1) * 4; + retval = cortex_a_read_apb_ab_memory(target, (address & ~0x3) + mem_offset, 4, 1, &tmp_buff[mem_offset]); if (retval != ERROR_OK) goto error_free_buff_w; } @@ -1891,8 +1893,8 @@ static int cortex_a8_write_apb_ab_memory(struct target *target, goto error_unset_dtr_w; /* Do the write */ - retval = mem_ap_sel_write_buf_u32_noincr(swjdp, armv7a->debug_ap, - tmp_buff, (total_u32)<<2, armv7a->debug_base + CPUDBG_DTRRX); + retval = mem_ap_sel_write_buf_noincr(swjdp, armv7a->debug_ap, + tmp_buff, 4, total_u32, armv7a->debug_base + CPUDBG_DTRRX); if (retval != ERROR_OK) goto error_unset_dtr_w; @@ -1911,7 +1913,7 @@ static int cortex_a8_write_apb_ab_memory(struct target *target, goto error_free_buff_w; if (dscr & (DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE)) { /* Abort occurred - clear it and exit */ - LOG_ERROR("abort occurred - dscr = 0x%08x", dscr); + LOG_ERROR("abort occurred - dscr = 0x%08" PRIx32, dscr); mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DRCR, 1<<2); goto error_free_buff_w; @@ -1934,7 +1936,7 @@ error_free_buff_w: return ERROR_FAIL; } -static int cortex_a8_read_apb_ab_memory(struct target *target, +static int cortex_a_read_apb_ab_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { @@ -1947,17 +1949,21 @@ static int cortex_a8_read_apb_ab_memory(struct target *target, int total_bytes = count * size; int total_u32; int start_byte = address & 0x3; + int end_byte = (address + total_bytes) & 0x3; struct reg *reg; uint32_t dscr; - char *tmp_buff = NULL; - uint32_t buff32[2]; + uint8_t *tmp_buff = NULL; + uint8_t buf[8]; + uint8_t *u8buf_ptr; + + LOG_DEBUG("Reading APB-AP memory address 0x%" PRIx32 " size %" PRIu32 " count%" PRIu32, + address, size, count); if (target->state != TARGET_HALTED) { LOG_WARNING("target not halted"); return ERROR_TARGET_NOT_HALTED; } total_u32 = DIV_ROUND_UP((address & 3) + total_bytes, 4); - /* Mark register R0 as dirty, as it will be used * for transferring the data. * It will be restored automatically when exiting @@ -1970,14 +1976,14 @@ static int cortex_a8_read_apb_ab_memory(struct target *target, retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DRCR, 1<<2); if (retval != ERROR_OK) - return retval; + goto error_free_buff_r; /* Read DSCR */ retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); /* This algorithm comes from either : - * Cortex-A8 TRM Example 12-24 + * Cortex-A TRM Example 12-24 * Cortex-R4 TRM Example 11-25 * (slight differences) */ @@ -1987,47 +1993,53 @@ static int cortex_a8_read_apb_ab_memory(struct target *target, retval += mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, dscr); - /* Write R0 with value 'address' using write procedure for stall mode */ + /* Write R0 with value 'address' using write procedure for stall mode */ /* - Write the address for read access into DTRRX */ retval += mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DTRRX, address & ~0x3); /* - Copy value from DTRRX to R0 using instruction mrc p14, 0, r0, c5, c0 */ - cortex_a8_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), &dscr); - + cortex_a_exec_opcode(target, ARMV4_5_MRC(14, 0, 0, 0, 5, 0), &dscr); /* Write the data transfer instruction (ldc p14, c5, [r0],4) * and the DTR mode setting to fast mode * in one combined write (since they are adjacent registers) */ - buff32[0] = ARMV4_5_LDC(0, 1, 0, 1, 14, 5, 0, 4); + u8buf_ptr = buf; + target_buffer_set_u32(target, u8buf_ptr, ARMV4_5_LDC(0, 1, 0, 1, 14, 5, 0, 4)); dscr = (dscr & ~DSCR_EXT_DCC_MASK) | DSCR_EXT_DCC_FAST_MODE; - buff32[1] = dscr; + target_buffer_set_u32(target, u8buf_ptr + 4, dscr); /* group the 2 access CPUDBG_ITR 0x84 and CPUDBG_DSCR 0x88 */ - retval += mem_ap_sel_write_buf_u32(swjdp, armv7a->debug_ap, (uint8_t *)buff32, 8, + retval += mem_ap_sel_write_buf(swjdp, armv7a->debug_ap, u8buf_ptr, 4, 2, armv7a->debug_base + CPUDBG_ITR); if (retval != ERROR_OK) goto error_unset_dtr_r; + /* Optimize the read as much as we can, either way we read in a single pass */ + if ((start_byte) || (end_byte)) { + /* The algorithm only copies 32 bit words, so the buffer + * should be expanded to include the words at either end. + * The first and last words will be read into a temp buffer + * to avoid corruption + */ + tmp_buff = malloc(total_u32 * 4); + if (!tmp_buff) + goto error_unset_dtr_r; - /* Due to offset word alignment, the buffer may not have space - * to read the full first and last int32 words, - * hence, malloc space to read into, then copy and align into the buffer. - */ - tmp_buff = (char *) malloc(total_u32<<2); + /* use the tmp buffer to read the entire data */ + u8buf_ptr = tmp_buff; + } else + /* address and read length are aligned so read directely into the passed buffer */ + u8buf_ptr = buffer; - /* The last word needs to be handled separately - read all other words in one go. + /* Read the data - Each read of the DTRTX register causes the instruction to be reissued + * Abort flags are sticky, so can be read at end of transactions + * + * This data is read in aligned to 32 bit boundary. */ - if (total_u32 > 1) { - /* Read the data - Each read of the DTRTX register causes the instruction to be reissued - * Abort flags are sticky, so can be read at end of transactions - * - * This data is read in aligned to 32 bit boundary, hence may need shifting later. - */ - retval = mem_ap_sel_read_buf_u32_noincr(swjdp, armv7a->debug_ap, (uint8_t *)tmp_buff, (total_u32-1)<<2, + retval = mem_ap_sel_read_buf_noincr(swjdp, armv7a->debug_ap, u8buf_ptr, 4, total_u32, armv7a->debug_base + CPUDBG_DTRTX); - if (retval != ERROR_OK) + if (retval != ERROR_OK) goto error_unset_dtr_r; - } /* set DTR access mode back to non blocking b00 */ dscr = (dscr & ~DSCR_EXT_DCC_MASK) | DSCR_EXT_DCC_NON_BLOCKING; @@ -2044,7 +2056,6 @@ static int cortex_a8_read_apb_ab_memory(struct target *target, goto error_free_buff_r; } while ((dscr & DSCR_INSTR_COMP) == 0); - /* Check for sticky abort flags in the DSCR */ retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); @@ -2052,27 +2063,21 @@ static int cortex_a8_read_apb_ab_memory(struct target *target, goto error_free_buff_r; if (dscr & (DSCR_STICKY_ABORT_PRECISE | DSCR_STICKY_ABORT_IMPRECISE)) { /* Abort occurred - clear it and exit */ - LOG_ERROR("abort occurred - dscr = 0x%08x", dscr); + LOG_ERROR("abort occurred - dscr = 0x%08" PRIx32, dscr); mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DRCR, 1<<2); goto error_free_buff_r; } - /* Read the last word */ - retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, - armv7a->debug_base + CPUDBG_DTRTX, (uint32_t *)&tmp_buff[(total_u32-1)<<2]); - if (retval != ERROR_OK) - goto error_free_buff_r; - - /* Copy and align the data into the output buffer */ - memcpy(buffer, &tmp_buff[start_byte], total_bytes); - - free(tmp_buff); + /* check if we need to copy aligned data by applying any shift necessary */ + if (tmp_buff) { + memcpy(buffer, tmp_buff + start_byte, total_bytes); + free(tmp_buff); + } /* Done */ return ERROR_OK; - error_unset_dtr_r: /* Unset DTR mode */ mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, @@ -2088,13 +2093,13 @@ error_free_buff_r: /* - * Cortex-A8 Memory access + * Cortex-A Memory access * * This is same Cortex M3 but we must also use the correct * ap number for every access. */ -static int cortex_a8_read_phys_memory(struct target *target, +static int cortex_a_read_phys_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { @@ -2102,86 +2107,79 @@ static int cortex_a8_read_phys_memory(struct target *target, struct adiv5_dap *swjdp = armv7a->arm.dap; int retval = ERROR_COMMAND_SYNTAX_ERROR; uint8_t apsel = swjdp->apsel; - LOG_DEBUG("Reading memory at real address 0x%x; size %d; count %d", + LOG_DEBUG("Reading memory at real address 0x%" PRIx32 "; size %" PRId32 "; count %" PRId32, address, size, count); if (count && buffer) { - if (apsel == swjdp_memoryap) { + if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap)) { /* read memory through AHB-AP */ - - switch (size) { - case 4: - retval = mem_ap_sel_read_buf_u32(swjdp, swjdp_memoryap, - buffer, 4 * count, address); - break; - case 2: - retval = mem_ap_sel_read_buf_u16(swjdp, swjdp_memoryap, - buffer, 2 * count, address); - break; - case 1: - retval = mem_ap_sel_read_buf_u8(swjdp, swjdp_memoryap, - buffer, count, address); - break; - } + retval = mem_ap_sel_read_buf(swjdp, armv7a->memory_ap, buffer, size, count, address); } else { - /* read memory through APB-AP - * disable mmu */ - retval = cortex_a8_mmu_modify(target, 0); - if (retval != ERROR_OK) - return retval; - retval = cortex_a8_read_apb_ab_memory(target, address, size, count, buffer); + /* read memory through APB-AP */ + if (!armv7a->is_armv7r) { + /* disable mmu */ + retval = cortex_a_mmu_modify(target, 0); + if (retval != ERROR_OK) + return retval; + } + retval = cortex_a_read_apb_ab_memory(target, address, size, count, buffer); } } return retval; } -static int cortex_a8_read_memory(struct target *target, uint32_t address, +static int cortex_a_read_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { - int enabled = 0; + int mmu_enabled = 0; uint32_t virt, phys; int retval; struct armv7a_common *armv7a = target_to_armv7a(target); struct adiv5_dap *swjdp = armv7a->arm.dap; uint8_t apsel = swjdp->apsel; - /* cortex_a8 handles unaligned memory access */ - LOG_DEBUG("Reading memory at address 0x%x; size %d; count %d", address, + /* cortex_a handles unaligned memory access */ + LOG_DEBUG("Reading memory at address 0x%" PRIx32 "; size %" PRId32 "; count %" PRId32, address, size, count); - if (apsel == swjdp_memoryap) { - retval = cortex_a8_mmu(target, &enabled); + + /* determine if MMU was enabled on target stop */ + if (!armv7a->is_armv7r) { + retval = cortex_a_mmu(target, &mmu_enabled); if (retval != ERROR_OK) return retval; + } - - if (enabled) { + if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap)) { + if (mmu_enabled) { virt = address; - retval = cortex_a8_virt2phys(target, virt, &phys); + retval = cortex_a_virt2phys(target, virt, &phys); if (retval != ERROR_OK) return retval; - LOG_DEBUG("Reading at virtual address. Translating v:0x%x to r:0x%x", - virt, phys); + LOG_DEBUG("Reading at virtual address. Translating v:0x%" PRIx32 " to r:0x%" PRIx32, + virt, phys); address = phys; } - retval = cortex_a8_read_phys_memory(target, address, size, count, buffer); + retval = cortex_a_read_phys_memory(target, address, size, count, buffer); } else { - retval = cortex_a8_check_address(target, address); - if (retval != ERROR_OK) - return retval; - /* enable mmu */ - retval = cortex_a8_mmu_modify(target, 1); - if (retval != ERROR_OK) - return retval; - retval = cortex_a8_read_apb_ab_memory(target, address, size, count, buffer); + if (mmu_enabled) { + retval = cortex_a_check_address(target, address); + if (retval != ERROR_OK) + return retval; + /* enable MMU as we could have disabled it for phys access */ + retval = cortex_a_mmu_modify(target, 1); + if (retval != ERROR_OK) + return retval; + } + retval = cortex_a_read_apb_ab_memory(target, address, size, count, buffer); } return retval; } -static int cortex_a8_write_phys_memory(struct target *target, +static int cortex_a_write_phys_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer) { @@ -2190,37 +2188,24 @@ static int cortex_a8_write_phys_memory(struct target *target, int retval = ERROR_COMMAND_SYNTAX_ERROR; uint8_t apsel = swjdp->apsel; - LOG_DEBUG("Writing memory to real address 0x%x; size %d; count %d", address, + LOG_DEBUG("Writing memory to real address 0x%" PRIx32 "; size %" PRId32 "; count %" PRId32, address, size, count); if (count && buffer) { - if (apsel == swjdp_memoryap) { + if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap)) { /* write memory through AHB-AP */ - - switch (size) { - case 4: - retval = mem_ap_sel_write_buf_u32(swjdp, swjdp_memoryap, - buffer, 4 * count, address); - break; - case 2: - retval = mem_ap_sel_write_buf_u16(swjdp, swjdp_memoryap, - buffer, 2 * count, address); - break; - case 1: - retval = mem_ap_sel_write_buf_u8(swjdp, swjdp_memoryap, - buffer, count, address); - break; - } - + retval = mem_ap_sel_write_buf(swjdp, armv7a->memory_ap, buffer, size, count, address); } else { /* write memory through APB-AP */ - retval = cortex_a8_mmu_modify(target, 0); - if (retval != ERROR_OK) - return retval; - return cortex_a8_write_apb_ab_memory(target, address, size, count, buffer); + if (!armv7a->is_armv7r) { + retval = cortex_a_mmu_modify(target, 0); + if (retval != ERROR_OK) + return retval; + } + return cortex_a_write_apb_ab_memory(target, address, size, count, buffer); } } @@ -2237,7 +2222,7 @@ static int cortex_a8_write_phys_memory(struct target *target, * wrong addresses will be invalidated! * * For both ICache and DCache, walk all cache lines in the - * address range. Cortex-A8 has fixed 64 byte line length. + * address range. Cortex-A has fixed 64 byte line length. * * REVISIT per ARMv7, these may trigger watchpoints ... */ @@ -2248,12 +2233,12 @@ static int cortex_a8_write_phys_memory(struct target *target, * with MVA to PoU * MCR p15, 0, r0, c7, c5, 1 */ - for (uint32_t cacheline = address; - cacheline < address + size * count; + for (uint32_t cacheline = 0; + cacheline < size * count; cacheline += 64) { retval = dpm->instr_write_data_r0(dpm, ARMV4_5_MCR(15, 0, 0, 7, 5, 1), - cacheline); + address + cacheline); if (retval != ERROR_OK) return retval; } @@ -2265,12 +2250,12 @@ static int cortex_a8_write_phys_memory(struct target *target, * with MVA to PoC * MCR p15, 0, r0, c7, c6, 1 */ - for (uint32_t cacheline = address; - cacheline < address + size * count; + for (uint32_t cacheline = 0; + cacheline < size * count; cacheline += 64) { retval = dpm->instr_write_data_r0(dpm, ARMV4_5_MCR(15, 0, 0, 7, 6, 1), - cacheline); + address + cacheline); if (retval != ERROR_OK) return retval; } @@ -2282,59 +2267,59 @@ static int cortex_a8_write_phys_memory(struct target *target, return retval; } -static int cortex_a8_write_memory(struct target *target, uint32_t address, +static int cortex_a_write_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer) { - int enabled = 0; + int mmu_enabled = 0; uint32_t virt, phys; int retval; struct armv7a_common *armv7a = target_to_armv7a(target); struct adiv5_dap *swjdp = armv7a->arm.dap; uint8_t apsel = swjdp->apsel; - /* cortex_a8 handles unaligned memory access */ - LOG_DEBUG("Reading memory at address 0x%x; size %d; count %d", address, + + /* cortex_a handles unaligned memory access */ + LOG_DEBUG("Writing memory at address 0x%" PRIx32 "; size %" PRId32 "; count %" PRId32, address, size, count); - if (apsel == swjdp_memoryap) { - LOG_DEBUG("Writing memory to address 0x%x; size %d; count %d", address, size, - count); - retval = cortex_a8_mmu(target, &enabled); + /* determine if MMU was enabled on target stop */ + if (!armv7a->is_armv7r) { + retval = cortex_a_mmu(target, &mmu_enabled); if (retval != ERROR_OK) return retval; + } - if (enabled) { + if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap)) { + LOG_DEBUG("Writing memory to address 0x%" PRIx32 "; size %" PRId32 "; count %" PRId32, address, size, + count); + if (mmu_enabled) { virt = address; - retval = cortex_a8_virt2phys(target, virt, &phys); + retval = cortex_a_virt2phys(target, virt, &phys); if (retval != ERROR_OK) return retval; - LOG_DEBUG("Writing to virtual address. Translating v:0x%x to r:0x%x", - virt, - phys); + + LOG_DEBUG("Writing to virtual address. Translating v:0x%" PRIx32 " to r:0x%" PRIx32, + virt, + phys); address = phys; } - - retval = cortex_a8_write_phys_memory(target, address, size, + retval = cortex_a_write_phys_memory(target, address, size, count, buffer); } else { - retval = cortex_a8_check_address(target, address); - if (retval != ERROR_OK) - return retval; - /* enable mmu */ - retval = cortex_a8_mmu_modify(target, 1); - if (retval != ERROR_OK) - return retval; - retval = cortex_a8_write_apb_ab_memory(target, address, size, count, buffer); + if (mmu_enabled) { + retval = cortex_a_check_address(target, address); + if (retval != ERROR_OK) + return retval; + /* enable MMU as we could have disabled it for phys access */ + retval = cortex_a_mmu_modify(target, 1); + if (retval != ERROR_OK) + return retval; + } + retval = cortex_a_write_apb_ab_memory(target, address, size, count, buffer); } return retval; } -static int cortex_a8_bulk_write_memory(struct target *target, uint32_t address, - uint32_t count, const uint8_t *buffer) -{ - return cortex_a8_write_memory(target, address, 4, count, buffer); -} - -static int cortex_a8_handle_target_request(void *priv) +static int cortex_a_handle_target_request(void *priv) { struct target *target = priv; struct armv7a_common *armv7a = target_to_armv7a(target); @@ -2349,16 +2334,16 @@ static int cortex_a8_handle_target_request(void *priv) if (target->state == TARGET_RUNNING) { uint32_t request; uint32_t dscr; - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); /* check if we have data */ while ((dscr & DSCR_DTR_TX_FULL) && (retval == ERROR_OK)) { - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DTRTX, &request); if (retval == ERROR_OK) { target_request(target, request); - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DSCR, &dscr); } } @@ -2368,13 +2353,13 @@ static int cortex_a8_handle_target_request(void *priv) } /* - * Cortex-A8 target information and configuration + * Cortex-A target information and configuration */ -static int cortex_a8_examine_first(struct target *target) +static int cortex_a_examine_first(struct target *target) { - struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common *armv7a = &cortex_a8->armv7a_common; + struct cortex_a_common *cortex_a = target_to_cortex_a(target); + struct armv7a_common *armv7a = &cortex_a->armv7a_common; struct adiv5_dap *swjdp = armv7a->arm.dap; int i; int retval = ERROR_OK; @@ -2387,6 +2372,23 @@ static int cortex_a8_examine_first(struct target *target) if (retval != ERROR_OK) return retval; + /* Search for the APB-AB - it is needed for access to debug registers */ + retval = dap_find_ap(swjdp, AP_TYPE_APB_AP, &armv7a->debug_ap); + if (retval != ERROR_OK) { + LOG_ERROR("Could not find APB-AP for debug access"); + return retval; + } + /* Search for the AHB-AB */ + retval = dap_find_ap(swjdp, AP_TYPE_AHB_AP, &armv7a->memory_ap); + if (retval != ERROR_OK) { + /* AHB-AP not found - use APB-AP */ + LOG_DEBUG("Could not find AHB-AP - using APB-AP for memory access"); + armv7a->memory_ap_available = false; + } else { + armv7a->memory_ap_available = true; + } + + if (!target->dbgbase_set) { uint32_t dbgbase; /* Get ROM Table base */ @@ -2402,33 +2404,33 @@ static int cortex_a8_examine_first(struct target *target) } else armv7a->debug_base = target->dbgbase; - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_CPUID, &cpuid); if (retval != ERROR_OK) return retval; - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_CPUID, &cpuid); if (retval != ERROR_OK) { LOG_DEBUG("Examine %s failed", "CPUID"); return retval; } - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_CTYPR, &ctypr); if (retval != ERROR_OK) { LOG_DEBUG("Examine %s failed", "CTYPR"); return retval; } - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_TTYPR, &ttypr); if (retval != ERROR_OK) { LOG_DEBUG("Examine %s failed", "TTYPR"); return retval; } - retval = mem_ap_sel_read_atomic_u32(swjdp, swjdp_debugap, + retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_DIDR, &didr); if (retval != ERROR_OK) { LOG_DEBUG("Examine %s failed", "DIDR"); @@ -2441,80 +2443,80 @@ static int cortex_a8_examine_first(struct target *target) LOG_DEBUG("didr = 0x%08" PRIx32, didr); armv7a->arm.core_type = ARM_MODE_MON; - retval = cortex_a8_dpm_setup(cortex_a8, didr); + retval = cortex_a_dpm_setup(cortex_a, didr); if (retval != ERROR_OK) return retval; /* Setup Breakpoint Register Pairs */ - cortex_a8->brp_num = ((didr >> 24) & 0x0F) + 1; - cortex_a8->brp_num_context = ((didr >> 20) & 0x0F) + 1; - cortex_a8->brp_num_available = cortex_a8->brp_num; - cortex_a8->brp_list = calloc(cortex_a8->brp_num, sizeof(struct cortex_a8_brp)); -/* cortex_a8->brb_enabled = ????; */ - for (i = 0; i < cortex_a8->brp_num; i++) { - cortex_a8->brp_list[i].used = 0; - if (i < (cortex_a8->brp_num-cortex_a8->brp_num_context)) - cortex_a8->brp_list[i].type = BRP_NORMAL; + cortex_a->brp_num = ((didr >> 24) & 0x0F) + 1; + cortex_a->brp_num_context = ((didr >> 20) & 0x0F) + 1; + cortex_a->brp_num_available = cortex_a->brp_num; + cortex_a->brp_list = calloc(cortex_a->brp_num, sizeof(struct cortex_a_brp)); +/* cortex_a->brb_enabled = ????; */ + for (i = 0; i < cortex_a->brp_num; i++) { + cortex_a->brp_list[i].used = 0; + if (i < (cortex_a->brp_num-cortex_a->brp_num_context)) + cortex_a->brp_list[i].type = BRP_NORMAL; else - cortex_a8->brp_list[i].type = BRP_CONTEXT; - cortex_a8->brp_list[i].value = 0; - cortex_a8->brp_list[i].control = 0; - cortex_a8->brp_list[i].BRPn = i; + cortex_a->brp_list[i].type = BRP_CONTEXT; + cortex_a->brp_list[i].value = 0; + cortex_a->brp_list[i].control = 0; + cortex_a->brp_list[i].BRPn = i; } - LOG_DEBUG("Configured %i hw breakpoints", cortex_a8->brp_num); + LOG_DEBUG("Configured %i hw breakpoints", cortex_a->brp_num); target_set_examined(target); return ERROR_OK; } -static int cortex_a8_examine(struct target *target) +static int cortex_a_examine(struct target *target) { int retval = ERROR_OK; /* don't re-probe hardware after each reset */ if (!target_was_examined(target)) - retval = cortex_a8_examine_first(target); + retval = cortex_a_examine_first(target); /* Configure core debug access */ if (retval == ERROR_OK) - retval = cortex_a8_init_debug_access(target); + retval = cortex_a_init_debug_access(target); return retval; } /* - * Cortex-A8 target creation and initialization + * Cortex-A target creation and initialization */ -static int cortex_a8_init_target(struct command_context *cmd_ctx, +static int cortex_a_init_target(struct command_context *cmd_ctx, struct target *target) { /* examine_first() does a bunch of this */ return ERROR_OK; } -static int cortex_a8_init_arch_info(struct target *target, - struct cortex_a8_common *cortex_a8, struct jtag_tap *tap) +static int cortex_a_init_arch_info(struct target *target, + struct cortex_a_common *cortex_a, struct jtag_tap *tap) { - struct armv7a_common *armv7a = &cortex_a8->armv7a_common; + struct armv7a_common *armv7a = &cortex_a->armv7a_common; struct adiv5_dap *dap = &armv7a->dap; armv7a->arm.dap = dap; - /* Setup struct cortex_a8_common */ - cortex_a8->common_magic = CORTEX_A8_COMMON_MAGIC; + /* Setup struct cortex_a_common */ + cortex_a->common_magic = CORTEX_A_COMMON_MAGIC; /* tap has no dap initialized */ if (!tap->dap) { armv7a->arm.dap = dap; - /* Setup struct cortex_a8_common */ + /* Setup struct cortex_a_common */ /* prepare JTAG information for the new target */ - cortex_a8->jtag_info.tap = tap; - cortex_a8->jtag_info.scann_size = 4; + cortex_a->jtag_info.tap = tap; + cortex_a->jtag_info.scann_size = 4; /* Leave (only) generic DAP stuff for debugport_init() */ - dap->jtag_info = &cortex_a8->jtag_info; + dap->jtag_info = &cortex_a->jtag_info; /* Number of bits for tar autoincrement, impl. dep. at least 10 */ dap->tar_autoincr_block = (1 << 10); @@ -2523,64 +2525,74 @@ static int cortex_a8_init_arch_info(struct target *target, } else armv7a->arm.dap = tap->dap; - cortex_a8->fast_reg_read = 0; + cortex_a->fast_reg_read = 0; /* register arch-specific functions */ armv7a->examine_debug_reason = NULL; - armv7a->post_debug_entry = cortex_a8_post_debug_entry; + armv7a->post_debug_entry = cortex_a_post_debug_entry; armv7a->pre_restore_context = NULL; - armv7a->armv7a_mmu.read_physical_memory = cortex_a8_read_phys_memory; + armv7a->armv7a_mmu.read_physical_memory = cortex_a_read_phys_memory; -/* arm7_9->handle_target_request = cortex_a8_handle_target_request; */ +/* arm7_9->handle_target_request = cortex_a_handle_target_request; */ /* REVISIT v7a setup should be in a v7a-specific routine */ armv7a_init_arch_info(target, armv7a); - target_register_timer_callback(cortex_a8_handle_target_request, 1, 1, target); + target_register_timer_callback(cortex_a_handle_target_request, 1, 1, target); return ERROR_OK; } -static int cortex_a8_target_create(struct target *target, Jim_Interp *interp) +static int cortex_a_target_create(struct target *target, Jim_Interp *interp) { - struct cortex_a8_common *cortex_a8 = calloc(1, sizeof(struct cortex_a8_common)); + struct cortex_a_common *cortex_a = calloc(1, sizeof(struct cortex_a_common)); - return cortex_a8_init_arch_info(target, cortex_a8, target->tap); + cortex_a->armv7a_common.is_armv7r = false; + + return cortex_a_init_arch_info(target, cortex_a, target->tap); } +static int cortex_r4_target_create(struct target *target, Jim_Interp *interp) +{ + struct cortex_a_common *cortex_a = calloc(1, sizeof(struct cortex_a_common)); + + cortex_a->armv7a_common.is_armv7r = true; + + return cortex_a_init_arch_info(target, cortex_a, target->tap); +} -static int cortex_a8_mmu(struct target *target, int *enabled) +static int cortex_a_mmu(struct target *target, int *enabled) { if (target->state != TARGET_HALTED) { LOG_ERROR("%s: target not halted", __func__); return ERROR_TARGET_INVALID; } - *enabled = target_to_cortex_a8(target)->armv7a_common.armv7a_mmu.mmu_enabled; + *enabled = target_to_cortex_a(target)->armv7a_common.armv7a_mmu.mmu_enabled; return ERROR_OK; } -static int cortex_a8_virt2phys(struct target *target, +static int cortex_a_virt2phys(struct target *target, uint32_t virt, uint32_t *phys) { int retval = ERROR_FAIL; struct armv7a_common *armv7a = target_to_armv7a(target); struct adiv5_dap *swjdp = armv7a->arm.dap; uint8_t apsel = swjdp->apsel; - if (apsel == swjdp_memoryap) { + if (armv7a->memory_ap_available && (apsel == armv7a->memory_ap)) { uint32_t ret; retval = armv7a_mmu_translate_va(target, virt, &ret); if (retval != ERROR_OK) goto done; *phys = ret; - } else {/* use this method if swjdp_memoryap not selected + } else {/* use this method if armv7a->memory_ap not selected * mmu must be enable in order to get a correct translation */ - retval = cortex_a8_mmu_modify(target, 1); + retval = cortex_a_mmu_modify(target, 1); if (retval != ERROR_OK) goto done; retval = armv7a_mmu_translate_va_pa(target, virt, phys, 1); @@ -2589,7 +2601,7 @@ done: return retval; } -COMMAND_HANDLER(cortex_a8_handle_cache_info_command) +COMMAND_HANDLER(cortex_a_handle_cache_info_command) { struct target *target = get_current_target(CMD_CTX); struct armv7a_common *armv7a = target_to_armv7a(target); @@ -2599,7 +2611,7 @@ COMMAND_HANDLER(cortex_a8_handle_cache_info_command) } -COMMAND_HANDLER(cortex_a8_handle_dbginit_command) +COMMAND_HANDLER(cortex_a_handle_dbginit_command) { struct target *target = get_current_target(CMD_CTX); if (!target_was_examined(target)) { @@ -2607,9 +2619,9 @@ COMMAND_HANDLER(cortex_a8_handle_dbginit_command) return ERROR_FAIL; } - return cortex_a8_init_debug_access(target); + return cortex_a_init_debug_access(target); } -COMMAND_HANDLER(cortex_a8_handle_smp_off_command) +COMMAND_HANDLER(cortex_a_handle_smp_off_command) { struct target *target = get_current_target(CMD_CTX); /* check target is an smp target */ @@ -2629,7 +2641,7 @@ COMMAND_HANDLER(cortex_a8_handle_smp_off_command) return ERROR_OK; } -COMMAND_HANDLER(cortex_a8_handle_smp_on_command) +COMMAND_HANDLER(cortex_a_handle_smp_on_command) { struct target *target = get_current_target(CMD_CTX); struct target_list *head; @@ -2646,7 +2658,7 @@ COMMAND_HANDLER(cortex_a8_handle_smp_on_command) return ERROR_OK; } -COMMAND_HANDLER(cortex_a8_handle_smp_gdb_command) +COMMAND_HANDLER(cortex_a_handle_smp_gdb_command) { struct target *target = get_current_target(CMD_CTX); int retval = ERROR_OK; @@ -2661,42 +2673,42 @@ COMMAND_HANDLER(cortex_a8_handle_smp_gdb_command) target->gdb_service->core[1] = coreid; } - command_print(CMD_CTX, "gdb coreid %d -> %d", target->gdb_service->core[0] + command_print(CMD_CTX, "gdb coreid %" PRId32 " -> %" PRId32, target->gdb_service->core[0] , target->gdb_service->core[1]); } return ERROR_OK; } -static const struct command_registration cortex_a8_exec_command_handlers[] = { +static const struct command_registration cortex_a_exec_command_handlers[] = { { .name = "cache_info", - .handler = cortex_a8_handle_cache_info_command, + .handler = cortex_a_handle_cache_info_command, .mode = COMMAND_EXEC, .help = "display information about target caches", .usage = "", }, { .name = "dbginit", - .handler = cortex_a8_handle_dbginit_command, + .handler = cortex_a_handle_dbginit_command, .mode = COMMAND_EXEC, .help = "Initialize core debug", .usage = "", }, { .name = "smp_off", - .handler = cortex_a8_handle_smp_off_command, + .handler = cortex_a_handle_smp_off_command, .mode = COMMAND_EXEC, .help = "Stop smp handling", .usage = "",}, { .name = "smp_on", - .handler = cortex_a8_handle_smp_on_command, + .handler = cortex_a_handle_smp_on_command, .mode = COMMAND_EXEC, .help = "Restart smp handling", .usage = "", }, { .name = "smp_gdb", - .handler = cortex_a8_handle_smp_gdb_command, + .handler = cortex_a_handle_smp_gdb_command, .mode = COMMAND_EXEC, .help = "display/fix current core played to gdb", .usage = "", @@ -2705,7 +2717,7 @@ static const struct command_registration cortex_a8_exec_command_handlers[] = { COMMAND_REGISTRATION_DONE }; -static const struct command_registration cortex_a8_command_handlers[] = { +static const struct command_registration cortex_a_command_handlers[] = { { .chain = arm_command_handlers, }, @@ -2713,57 +2725,126 @@ static const struct command_registration cortex_a8_command_handlers[] = { .chain = armv7a_command_handlers, }, { - .name = "cortex_a8", + .name = "cortex_a", .mode = COMMAND_ANY, - .help = "Cortex-A8 command group", + .help = "Cortex-A command group", .usage = "", - .chain = cortex_a8_exec_command_handlers, + .chain = cortex_a_exec_command_handlers, }, COMMAND_REGISTRATION_DONE }; -struct target_type cortexa8_target = { - .name = "cortex_a8", +struct target_type cortexa_target = { + .name = "cortex_a", + .deprecated_name = "cortex_a8", - .poll = cortex_a8_poll, + .poll = cortex_a_poll, .arch_state = armv7a_arch_state, - .target_request_data = NULL, + .halt = cortex_a_halt, + .resume = cortex_a_resume, + .step = cortex_a_step, - .halt = cortex_a8_halt, - .resume = cortex_a8_resume, - .step = cortex_a8_step, - - .assert_reset = cortex_a8_assert_reset, - .deassert_reset = cortex_a8_deassert_reset, - .soft_reset_halt = NULL, + .assert_reset = cortex_a_assert_reset, + .deassert_reset = cortex_a_deassert_reset, /* REVISIT allow exporting VFP3 registers ... */ .get_gdb_reg_list = arm_get_gdb_reg_list, - .read_memory = cortex_a8_read_memory, - .write_memory = cortex_a8_write_memory, - .bulk_write_memory = cortex_a8_bulk_write_memory, + .read_memory = cortex_a_read_memory, + .write_memory = cortex_a_write_memory, .checksum_memory = arm_checksum_memory, .blank_check_memory = arm_blank_check_memory, .run_algorithm = armv4_5_run_algorithm, - .add_breakpoint = cortex_a8_add_breakpoint, - .add_context_breakpoint = cortex_a8_add_context_breakpoint, - .add_hybrid_breakpoint = cortex_a8_add_hybrid_breakpoint, - .remove_breakpoint = cortex_a8_remove_breakpoint, + .add_breakpoint = cortex_a_add_breakpoint, + .add_context_breakpoint = cortex_a_add_context_breakpoint, + .add_hybrid_breakpoint = cortex_a_add_hybrid_breakpoint, + .remove_breakpoint = cortex_a_remove_breakpoint, .add_watchpoint = NULL, .remove_watchpoint = NULL, - .commands = cortex_a8_command_handlers, - .target_create = cortex_a8_target_create, - .init_target = cortex_a8_init_target, - .examine = cortex_a8_examine, + .commands = cortex_a_command_handlers, + .target_create = cortex_a_target_create, + .init_target = cortex_a_init_target, + .examine = cortex_a_examine, + + .read_phys_memory = cortex_a_read_phys_memory, + .write_phys_memory = cortex_a_write_phys_memory, + .mmu = cortex_a_mmu, + .virt2phys = cortex_a_virt2phys, +}; + +static const struct command_registration cortex_r4_exec_command_handlers[] = { + { + .name = "cache_info", + .handler = cortex_a_handle_cache_info_command, + .mode = COMMAND_EXEC, + .help = "display information about target caches", + .usage = "", + }, + { + .name = "dbginit", + .handler = cortex_a_handle_dbginit_command, + .mode = COMMAND_EXEC, + .help = "Initialize core debug", + .usage = "", + }, + + COMMAND_REGISTRATION_DONE +}; +static const struct command_registration cortex_r4_command_handlers[] = { + { + .chain = arm_command_handlers, + }, + { + .chain = armv7a_command_handlers, + }, + { + .name = "cortex_r4", + .mode = COMMAND_ANY, + .help = "Cortex-R4 command group", + .usage = "", + .chain = cortex_r4_exec_command_handlers, + }, + COMMAND_REGISTRATION_DONE +}; + +struct target_type cortexr4_target = { + .name = "cortex_r4", + + .poll = cortex_a_poll, + .arch_state = armv7a_arch_state, + + .halt = cortex_a_halt, + .resume = cortex_a_resume, + .step = cortex_a_step, + + .assert_reset = cortex_a_assert_reset, + .deassert_reset = cortex_a_deassert_reset, + + /* REVISIT allow exporting VFP3 registers ... */ + .get_gdb_reg_list = arm_get_gdb_reg_list, + + .read_memory = cortex_a_read_memory, + .write_memory = cortex_a_write_memory, + + .checksum_memory = arm_checksum_memory, + .blank_check_memory = arm_blank_check_memory, + + .run_algorithm = armv4_5_run_algorithm, + + .add_breakpoint = cortex_a_add_breakpoint, + .add_context_breakpoint = cortex_a_add_context_breakpoint, + .add_hybrid_breakpoint = cortex_a_add_hybrid_breakpoint, + .remove_breakpoint = cortex_a_remove_breakpoint, + .add_watchpoint = NULL, + .remove_watchpoint = NULL, - .read_phys_memory = cortex_a8_read_phys_memory, - .write_phys_memory = cortex_a8_write_phys_memory, - .mmu = cortex_a8_mmu, - .virt2phys = cortex_a8_virt2phys, + .commands = cortex_r4_command_handlers, + .target_create = cortex_r4_target_create, + .init_target = cortex_a_init_target, + .examine = cortex_a_examine, };