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

Fix memleaks. 

Happened e.g. when Stlink could not enter debug or when cortexm_prepare timed out.
This commit is contained in:
Uwe Bonnes 2020-11-07 17:43:35 +01:00 committed by UweBonnes
parent 9ac5adfcef
commit cda83d3084
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platforms/hosted/platform.c
View File

@ -351,7 +351,9 @@ int platform_adiv5_swdp_scan(void)
{ {
target_list_free(); target_list_free();
ADIv5_DP_t *dp = (void*)calloc(1, sizeof(*dp)); ADIv5_DP_t *dp = (void*)calloc(1, sizeof(*dp));
if (!stlink_enter_debug_swd(&info, dp)) { if (stlink_enter_debug_swd(&info, dp)) {
free(dp);
} else {
adiv5_dp_init(dp); adiv5_dp_init(dp);
if (target_list) if (target_list)
return 1; return 1;
@ -363,7 +365,9 @@ int platform_adiv5_swdp_scan(void)
{ {
target_list_free(); target_list_free();
ADIv5_DP_t *dp = (void*)calloc(1, sizeof(*dp)); ADIv5_DP_t *dp = (void*)calloc(1, sizeof(*dp));
if (!dap_enter_debug_swd(dp)) { if (dap_enter_debug_swd(dp)) {
free(dp);
} else {
adiv5_dp_init(dp); adiv5_dp_init(dp);
if (target_list) if (target_list)
return 1; return 1;

40
src/target/adiv5.c
View File

@ -402,23 +402,22 @@ static bool cortexm_prepare(ADIv5_AP_t *ap)
} }
/* Return true if we find a debuggable device.*/ /* Return true if we find a debuggable device.*/
static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion, int num_entry) static void adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion, int num_entry)
{ {
(void) num_entry; (void) num_entry;
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;
uint32_t cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET); uint32_t cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET);
if ((cidr & ~CID_CLASS_MASK) != CID_PREAMBLE) { if ((cidr & ~CID_CLASS_MASK) != CID_PREAMBLE) {
/* Maybe caused by a not halted CortexM */ /* Maybe caused by a not halted CortexM */
if ((ap->idr & 0xf) == ARM_AP_TYPE_AHB) { if ((ap->idr & 0xf) == ARM_AP_TYPE_AHB) {
if (!cortexm_prepare(ap)) if (!cortexm_prepare(ap))
return false; /* Halting failed! */ return; /* Halting failed! */
/* CPU now halted, read cidr again. */ /* CPU now halted, read cidr again. */
cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET); cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET);
} }
} }
bool res = false;
#if defined(ENABLE_DEBUG) #if defined(ENABLE_DEBUG)
char indent[recursion + 1]; char indent[recursion + 1];
@ -428,7 +427,7 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
if (adiv5_dp_error(ap->dp)) { if (adiv5_dp_error(ap->dp)) {
DEBUG_WARN("%sFault reading ID registers\n", indent); DEBUG_WARN("%sFault reading ID registers\n", indent);
return false; return;
} }
/* CIDR preamble sanity check */ /* CIDR preamble sanity check */
@ -436,7 +435,7 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
DEBUG_WARN("%s%d 0x%08" PRIx32": 0x%08" PRIx32 DEBUG_WARN("%s%d 0x%08" PRIx32": 0x%08" PRIx32
" <- does not match preamble (0x%X)\n", " <- does not match preamble (0x%X)\n",
indent + 1, num_entry, addr, cidr, CID_PREAMBLE); indent + 1, num_entry, addr, cidr, CID_PREAMBLE);
return false; return;
} }
uint64_t pidr = adiv5_ap_read_pidr(ap, addr); uint64_t pidr = adiv5_ap_read_pidr(ap, addr);
@ -463,10 +462,8 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
if (recursion == 0) { if (recursion == 0) {
ap->ap_designer = designer; ap->ap_designer = designer;
ap->ap_partno = partno; ap->ap_partno = partno;
if ((ap->ap_designer == AP_DESIGNER_ATMEL) && (ap->ap_partno == 0xcd0)) { if ((ap->ap_designer == AP_DESIGNER_ATMEL) && (ap->ap_partno == 0xcd0))
cortexm_probe(ap); cortexm_probe(ap);
return true;
}
} }
for (int i = 0; i < 960; i++) { for (int i = 0; i < 960; i++) {
adiv5_dp_error(ap->dp); adiv5_dp_error(ap->dp);
@ -486,7 +483,7 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
} }
/* Probe recursively */ /* Probe recursively */
res = adiv5_component_probe( adiv5_component_probe(
ap, addr + (entry & ADIV5_ROM_ROMENTRY_OFFSET), ap, addr + (entry & ADIV5_ROM_ROMENTRY_OFFSET),
recursion + 1, i); recursion + 1, i);
} }
@ -499,7 +496,7 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
DEBUG_WARN("%s0x%" PRIx32 ": 0x%02" PRIx32 "%08" PRIx32 DEBUG_WARN("%s0x%" PRIx32 ": 0x%02" PRIx32 "%08" PRIx32
" <- does not match ARM JEP-106\n", " <- does not match ARM JEP-106\n",
indent, addr, (uint32_t)(pidr >> 32), (uint32_t)pidr); indent, addr, (uint32_t)(pidr >> 32), (uint32_t)pidr);
return false; return;
} }
/* ADIv6: For CoreSight components, read DEVTYPE and ARCHID */ /* ADIv6: For CoreSight components, read DEVTYPE and ARCHID */
@ -544,11 +541,11 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
switch (pidr_pn_bits[i].arch) { switch (pidr_pn_bits[i].arch) {
case aa_cortexm: case aa_cortexm:
DEBUG_INFO("%s-> cortexm_probe\n", indent + 1); DEBUG_INFO("%s-> cortexm_probe\n", indent + 1);
res = cortexm_probe(ap); cortexm_probe(ap);
break; break;
case aa_cortexa: case aa_cortexa:
DEBUG_INFO("\n -> cortexa_probe\n"); DEBUG_INFO("\n -> cortexa_probe\n");
res = cortexa_probe(ap, addr); cortexa_probe(ap, addr);
break; break;
default: default:
DEBUG_INFO("\n"); DEBUG_INFO("\n");
@ -564,7 +561,7 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
(uint32_t)(pidr >> 32), (uint32_t)pidr, dev_type, arch_id); (uint32_t)(pidr >> 32), (uint32_t)pidr, dev_type, arch_id);
} }
} }
return res; return;
} }
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)
@ -663,6 +660,7 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
break; break;
if (platform_timeout_is_expired(&timeout)) { if (platform_timeout_is_expired(&timeout)) {
DEBUG_INFO("DEBUG Power-Up failed\n"); DEBUG_INFO("DEBUG Power-Up failed\n");
free(dp); /* No AP that referenced this DP so long*/
return; return;
} }
} }
@ -693,7 +691,6 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
} }
} }
bool res = false;
uint32_t dp_idcode = adiv5_dp_read(dp, ADIV5_DP_IDCODE); uint32_t dp_idcode = adiv5_dp_read(dp, ADIV5_DP_IDCODE);
if ((dp_idcode & ADIV5_DP_VERSION_MASK) == ADIV5_DPv2) { if ((dp_idcode & ADIV5_DP_VERSION_MASK) == ADIV5_DPv2) {
/* Read TargetID. Can be done with device in WFI, sleep or reset!*/ /* Read TargetID. Can be done with device in WFI, sleep or reset!*/
@ -705,6 +702,7 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
/* Probe for APs on this DP */ /* Probe for APs on this DP */
uint32_t last_base = 0; uint32_t last_base = 0;
int void_aps = 0; int void_aps = 0;
dp->refcnt++;
for(int i = 0; (i < 256) && (void_aps < 8); i++) { for(int i = 0; (i < 256) && (void_aps < 8); i++) {
ADIv5_AP_t *ap = NULL; ADIv5_AP_t *ap = NULL;
#if PC_HOSTED == 1 #if PC_HOSTED == 1
@ -719,10 +717,12 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
if (dp->ap_cleanup) if (dp->ap_cleanup)
dp->ap_cleanup(i); dp->ap_cleanup(i);
#endif #endif
if (i == 0) if (i == 0) {
adiv5_dp_unref(dp);
return; return;
else } else {
continue; continue;
}
} }
if (ap->base == last_base) { if (ap->base == last_base) {
DEBUG_WARN("AP %d: Duplicate base\n", i); DEBUG_WARN("AP %d: Duplicate base\n", i);
@ -749,14 +749,14 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
*/ */
/* The rest should only be added after checking ROM table */ /* The rest should only be added after checking ROM table */
res = adiv5_component_probe(ap, ap->base, 0, 0); adiv5_component_probe(ap, ap->base, 0, 0);
if (!res) adiv5_ap_unref(ap);
adiv5_ap_unref(ap);
} }
/* We halted at least CortexM for Romtable scan. /* We halted at least CortexM for Romtable scan.
* Release the devices now. Attach() will halt them again.*/ * Release the devices now. Attach() will halt them again.*/
for (target *t = target_list; t; t = t->next) for (target *t = target_list; t; t = t->next)
target_halt_resume(t, false); target_halt_resume(t, false);
adiv5_dp_unref(dp);
} }
#define ALIGNOF(x) (((x) & 3) == 0 ? ALIGN_WORD : \ #define ALIGNOF(x) (((x) & 3) == 0 ? ALIGN_WORD : \