arm_adi_v5: make dap_lookup_cs_component() traverse subtables and handle multicore
When looking for a debug base address of a core, one should search through all the ROM tables, not just the top-level one. This code also assumes that the first found entry (in a depth-first search) will correspond to core 0, the second to core 1 etc. The patch is supposed to be an alternative implementation of http://openocd.zylin.com/#/c/1313/. Change-Id: Ifc88971a02fe3d9c00d9bf72a822ade5804d4e09 Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/1920 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
committed by
Spencer Oliver
parent
9c47dc9e8e
commit
ec9ccaa288
@@ -2393,14 +2393,19 @@ static int cortex_a_examine_first(struct target *target)
|
||||
uint32_t dbgbase;
|
||||
/* Get ROM Table base */
|
||||
uint32_t apid;
|
||||
int32_t coreidx = target->coreid;
|
||||
LOG_DEBUG("%s's dbgbase is not set, trying to detect using the ROM table",
|
||||
target->cmd_name);
|
||||
retval = dap_get_debugbase(swjdp, 1, &dbgbase, &apid);
|
||||
if (retval != ERROR_OK)
|
||||
return retval;
|
||||
/* Lookup 0x15 -- Processor DAP */
|
||||
retval = dap_lookup_cs_component(swjdp, 1, dbgbase, 0x15,
|
||||
&armv7a->debug_base);
|
||||
&armv7a->debug_base, &coreidx);
|
||||
if (retval != ERROR_OK)
|
||||
return retval;
|
||||
LOG_DEBUG("Detected core %" PRId32 " dbgbase: %08" PRIx32,
|
||||
coreidx, armv7a->debug_base);
|
||||
} else
|
||||
armv7a->debug_base = target->dbgbase;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user