From 1567caea2cbaf5dfc42454d6a7baf177baec0b85 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Tue, 14 Oct 2014 11:55:27 +0200 Subject: [PATCH] cortex_a: Add support for A7 MPCore A7 MPCore needs unlocking the debug registers same as with A15 MPCore. Found out by hacking on the code. Change-Id: I613cb4fb35007b85b4a9a401577b47768bc1a08b Signed-off-by: Alexander Stein Reviewed-on: http://openocd.zylin.com/2344 Tested-by: jenkins Reviewed-by: Kamal Dasu Reviewed-by: Andreas Fritiofson --- src/target/cortex_a.c | 13 +++++++++++++ src/target/cortex_a.h | 1 + 2 files changed, 14 insertions(+) diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index 3075055dc..6e0e52cfe 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -208,6 +208,7 @@ static int cortex_a_init_debug_access(struct target *target) CORTEX_A_MIDR_PARTNUM_SHIFT; switch (cortex_part_num) { + case CORTEX_A7_PARTNUM: case CORTEX_A15_PARTNUM: retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_OSLSR, @@ -2511,6 +2512,18 @@ static int cortex_a_examine_first(struct target *target) if (retval != ERROR_OK) return retval; + } + /* Unlocking the debug registers */ + if ((cpuid & CORTEX_A_MIDR_PARTNUM_MASK) >> CORTEX_A_MIDR_PARTNUM_SHIFT == + CORTEX_A7_PARTNUM) { + + retval = mem_ap_sel_write_atomic_u32(swjdp, armv7a->debug_ap, + armv7a->debug_base + CPUDBG_OSLAR, + 0); + + if (retval != ERROR_OK) + return retval; + } retval = mem_ap_sel_read_atomic_u32(swjdp, armv7a->debug_ap, armv7a->debug_base + CPUDBG_PRSR, &dbg_osreg); diff --git a/src/target/cortex_a.h b/src/target/cortex_a.h index 043d96f92..94d80f92b 100644 --- a/src/target/cortex_a.h +++ b/src/target/cortex_a.h @@ -35,6 +35,7 @@ #define CORTEX_A_COMMON_MAGIC 0x411fc082 #define CORTEX_A15_COMMON_MAGIC 0x413fc0f1 +#define CORTEX_A7_PARTNUM 0xc07 #define CORTEX_A8_PARTNUM 0xc08 #define CORTEX_A9_PARTNUM 0xc09 #define CORTEX_A15_PARTNUM 0xc0f