jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

adiv5: catch timeout on adiv5_ap_read_id and abort

Browse Source 
This adds a TRY_CATCH around the adiv5_ap_read_id() in
adiv5_component_probe() and resets the DP when that happens.
It seems like the STM32WLE5 comes with the AP of the inactive core
enabled in a way that does not make it detectable, and the current code
times out and leaves the whole device hanging.

Catching the timeout and calling adiv5_dp_abort() seems to restore the
device to a useable state.

Tested on Seed LoRa-E5 (STM32E5JC).
This commit is contained in:
Fabio Baltieri 2021-04-18 21:09:47 +01:00 committed by UweBonnes
parent 806787529f
commit f55ad67b1b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/target/adiv5.c
View File

@ -413,7 +413,17 @@ static void adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
addr &= 0xfffff000; /* Mask out base address */ addr &= 0xfffff000; /* Mask out base address */
if (addr == 0) /* No rom table on this AP */ if (addr == 0) /* No rom table on this AP */
return; return;
uint32_t cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET); volatile uint32_t cidr;
volatile struct exception e;
TRY_CATCH (e, EXCEPTION_TIMEOUT) {
cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET);
}
if (e.type) {
DEBUG_WARN("CIDR read timeout on AP%d, aborting.\n", num_entry);
adiv5_dp_abort(ap->dp, ADIV5_DP_ABORT_DAPABORT);
return;
}
if ((cidr & ~CID_CLASS_MASK) != CID_PREAMBLE) if ((cidr & ~CID_CLASS_MASK) != CID_PREAMBLE)
return; return;
#if defined(ENABLE_DEBUG) #if defined(ENABLE_DEBUG)