sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adiv5.c: Reduce number of errors if reading cidr fails.

This commit is contained in:
Uwe Bonnes 2020-09-29 21:06:58 +02:00 committed by UweBonnes
parent be40d2b851
commit 014abf6cc9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/adiv5.c
View File

@ -305,7 +305,6 @@ static bool 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 false; return false;
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;
#if defined(ENABLE_DEBUG) #if defined(ENABLE_DEBUG)
@ -328,6 +327,7 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
return false; return false;
} }
uint64_t pidr = adiv5_ap_read_pidr(ap, addr);
/* Extract Component ID class nibble */ /* Extract Component ID class nibble */
uint32_t cid_class = (cidr & CID_CLASS_MASK) >> CID_CLASS_SHIFT; uint32_t cid_class = (cidr & CID_CLASS_MASK) >> CID_CLASS_SHIFT;