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

adiv5: Check Debug Base Address early

Browse Source 
Reduces printout when scanning the romtable
This commit is contained in:
Uwe Bonnes 2020-06-07 15:21:46 +02:00 committed by UweBonnes
parent 747336e927
commit be40d2b851
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/target/adiv5.c
View File

@ -302,7 +302,9 @@ uint64_t adiv5_ap_read_pidr(ADIv5_AP_t *ap, uint32_t addr)
static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion, int num_entry) static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion, int num_entry)
{ {
(void) num_entry; (void) num_entry;
addr &= ~3; addr &= 0xfffff000; /* Mask out base address */
if (addr == 0) /* No rom table on this AP */
return false;
uint64_t pidr = adiv5_ap_read_pidr(ap, addr); uint64_t pidr = adiv5_ap_read_pidr(ap, addr);
uint32_t cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET); uint32_t cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET);
bool res = false; bool res = false;
@ -454,6 +456,14 @@ ADIv5_AP_t *adiv5_new_ap(ADIv5_DP_t *dp, uint8_t apsel)
tmpap.apsel = apsel; tmpap.apsel = apsel;
tmpap.idr = adiv5_ap_read(&tmpap, ADIV5_AP_IDR); tmpap.idr = adiv5_ap_read(&tmpap, ADIV5_AP_IDR);
tmpap.base = adiv5_ap_read(&tmpap, ADIV5_AP_BASE); tmpap.base = adiv5_ap_read(&tmpap, ADIV5_AP_BASE);
/* Check the Debug Base Address register. See ADIv5
* Specification C2.6.1 */
if (tmpap.base == 0xffffffff) {
/* Debug Base Address not present in this MEM-AP */
/* No debug entries... useless AP */
/* AP0 on STM32MP157C reads 0x00000002 */
return NULL;
}
if(!tmpap.idr) /* IDR Invalid */ if(!tmpap.idr) /* IDR Invalid */
return NULL; return NULL;
@ -467,7 +477,6 @@ ADIv5_AP_t *adiv5_new_ap(ADIv5_DP_t *dp, uint8_t apsel)
memcpy(ap, &tmpap, sizeof(*ap)); memcpy(ap, &tmpap, sizeof(*ap));
adiv5_dp_ref(dp); adiv5_dp_ref(dp);
ap->base = adiv5_ap_read(ap, ADIV5_AP_BASE);
ap->csw = adiv5_ap_read(ap, ADIV5_AP_CSW) & ap->csw = adiv5_ap_read(ap, ADIV5_AP_CSW) &
~(ADIV5_AP_CSW_SIZE_MASK | ADIV5_AP_CSW_ADDRINC_MASK); ~(ADIV5_AP_CSW_SIZE_MASK | ADIV5_AP_CSW_ADDRINC_MASK);
@ -611,16 +620,6 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
extern void efm32_aap_probe(ADIv5_AP_t *); extern void efm32_aap_probe(ADIv5_AP_t *);
efm32_aap_probe(ap); efm32_aap_probe(ap);
/* Check the Debug Base Address register. See ADIv5
* Specification C2.6.1 */
if (!(ap->base & ADIV5_AP_BASE_PRESENT) ||
(ap->base == 0xffffffff)) {
/* Debug Base Address not present in this MEM-AP */
/* No debug entries... useless AP */
adiv5_ap_unref(ap);
continue;
}
/* Should probe further here to make sure it's a valid target. /* Should probe further here to make sure it's a valid target.
* AP should be unref'd if not valid. * AP should be unref'd if not valid.
*/ */