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

Merge commit '66e357d51762f3bf93b549a5626554b2f8de4379' into sam-update

Browse Source 
# Conflicts:
#	src/target/adiv5.c
This commit is contained in:
Jason Kotzin 2022-08-01 19:20:32 -07:00
commit 447bdc50a0
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/target/adiv5.c
View File

@ -263,11 +263,12 @@ uint64_t adiv5_ap_read_pidr(ADIv5_AP_t *ap, uint32_t addr)
return pidr; return pidr;
} }
static void adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr) static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr)
{ {
addr &= ~3; addr &= ~3;
uint64_t pidr = 0; uint64_t pidr = 0;
uint32_t cidr = 0; uint32_t cidr = 0;
bool res = false;
/* Assemble logical Product ID register value. */ /* Assemble logical Product ID register value. */
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
@ -287,14 +288,14 @@ static void adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr)
if (adiv5_dp_error(ap->dp)) { if (adiv5_dp_error(ap->dp)) {
DEBUG("Fault reading ID registers\n"); DEBUG("Fault reading ID registers\n");
return; return false;
} }
/* CIDR preamble sanity check */ /* CIDR preamble sanity check */
if ((cidr & ~CID_CLASS_MASK) != CID_PREAMBLE) { if ((cidr & ~CID_CLASS_MASK) != CID_PREAMBLE) {
DEBUG("0x%"PRIx32": 0x%"PRIx32" <- does not match preamble (0x%X)\n", DEBUG("0x%"PRIx32": 0x%"PRIx32" <- does not match preamble (0x%X)\n",
addr, cidr, CID_PREAMBLE); addr, cidr, CID_PREAMBLE);
return; return false;
} }
/* Extract Component ID class nibble */ /* Extract Component ID class nibble */
@ -313,7 +314,7 @@ static void adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr)
if ((entry & 1) == 0) if ((entry & 1) == 0)
continue; continue;
adiv5_component_probe(ap, addr + (entry & ~0xfff)); res |= adiv5_component_probe(ap, addr + (entry & ~0xfff));
} }
} else { } else {
/* Check if the component was designed by ARM, we currently do not support, /* Check if the component was designed by ARM, we currently do not support,
@ -322,7 +323,7 @@ static void adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr)
if ((pidr & ~(PIDR_REV_MASK | PIDR_PN_MASK)) != PIDR_ARM_BITS) { if ((pidr & ~(PIDR_REV_MASK | PIDR_PN_MASK)) != PIDR_ARM_BITS) {
DEBUG("0x%"PRIx32": 0x%"PRIx64" <- does not match ARM JEP-106\n", DEBUG("0x%"PRIx32": 0x%"PRIx64" <- does not match ARM JEP-106\n",
addr, pidr); addr, pidr);
return; return false;
} }
/* Extract part number from the part id register. */ /* Extract part number from the part id register. */
@ -346,6 +347,7 @@ static void adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr)
cidc_debug_strings[cid_class], cidc_debug_strings[cid_class],
cidc_debug_strings[pidr_pn_bits[i].cidc]); cidc_debug_strings[pidr_pn_bits[i].cidc]);
} }
res = true;
switch (pidr_pn_bits[i].arch) { switch (pidr_pn_bits[i].arch) {
case aa_cortexm: case aa_cortexm:
DEBUG("-> cortexm_probe\n"); DEBUG("-> cortexm_probe\n");
@ -366,6 +368,7 @@ static void adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr)
cidc_debug_strings[cid_class], pidr); cidc_debug_strings[cid_class], pidr);
} }
} }
return res;
} }
ADIv5_AP_t *adiv5_new_ap(ADIv5_DP_t *dp, uint8_t apsel) ADIv5_AP_t *adiv5_new_ap(ADIv5_DP_t *dp, uint8_t apsel)
@ -405,6 +408,7 @@ ADIv5_AP_t *adiv5_new_ap(ADIv5_DP_t *dp, uint8_t apsel)
void adiv5_dp_init(ADIv5_DP_t *dp) void adiv5_dp_init(ADIv5_DP_t *dp)
{ {
volatile bool probed = false;
volatile uint32_t ctrlstat = 0; volatile uint32_t ctrlstat = 0;
adiv5_dp_ref(dp); adiv5_dp_ref(dp);
@ -469,7 +473,11 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
*/ */
/* The rest sould only be added after checking ROM table */ /* The rest sould only be added after checking ROM table */
adiv5_component_probe(ap, ap->base); probed |= adiv5_component_probe(ap, ap->base);
if (!probed && (dp->idcode & 0xfff) == 0x477) {
DEBUG("-> cortexm_probe forced\n");
cortexm_probe(ap);
}
} }
adiv5_dp_unref(dp); adiv5_dp_unref(dp);
} }