Skip to content

Commit

Permalink
cortex_a: Add support for A7 MPCore
Browse files Browse the repository at this point in the history
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 <alexander.stein@systec-electronic.com>
Reviewed-on: http://openocd.zylin.com/2344
Tested-by: jenkins
Reviewed-by: Kamal Dasu <kamal.dasu@gmail.com>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
  • Loading branch information
Alexander Stein authored and nattgris committed Jan 10, 2015
1 parent e519099 commit 1567cae
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
13 changes: 13 additions & 0 deletions src/target/cortex_a.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions src/target/cortex_a.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1567cae

Please sign in to comment.