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

[efm32] Assume Device Identification (DI) version 1 if we don't know the OUI (#402) 

* [efm32] Assume Device Identification (DI) version 1 if we don't know the OUI

Silabs are using some additional OUIs we don't know about. Reported in issue #389
These should use a DI version 1 layout, so assume version 1 layout for OUIs we don't
know. However do print a notice about this on DEBUG() as suggested by @UweBonnes

The IDCODE value is sufficient to make a positive identification of an EFM32 device.
See AN0062 Section 2.2. Therefore accepting any OUI is reasonable behaviour.
Additionally the part familiy is checked, and the target rejected if not in the
`efm32_devices` table. This commit makes that rejection explicit, although it does
not change the logical behaviour here.

Note that the important registers (part number, part family, flash size) are at the
same addresses in both layouts anyhow. Currently only `efm32_cmd_serial` and
`efm32_cmd_efm_info` functions use registers that differ between DI versions.

* [efm32] tidy format warning about portability UB

* [efm32] Simplify OUI checking

* Only read the OUI once
* Accept the device even if the OU is unknown, as silabs have been using
  a variety of OUIs
* Perform fewer register reads before checking the device family is valid
This commit is contained in:
Richard Meadows 2019-01-15 20:58:59 +00:00 committed by Gareth McMullin
parent 488436c46a
commit 0b28232f72
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/target/efm32.c
View File

@ -563,7 +563,7 @@ bool efm32_probe(target *t)
ADIv5_AP_t *ap = cortexm_ap(t);
uint32_t ap_idcode = ap->dp->idcode;
/* Check the idcode is silabs. See AN0062 Section 2.2 */
/* Check the idcode. See AN0062 Section 2.2 */
if (ap_idcode == 0x2BA01477) {
/* Cortex M3, Cortex M4 */
} else if (ap_idcode == 0x0BC11477) {
@ -572,26 +572,24 @@ bool efm32_probe(target *t)
return false;
}
/* Check the EUI is silabs. Identify the Device Identification (DI) version */
if (((efm32_v1_read_eui64(t) >> 40) & 0xFFFFFF) == EFM32_V1_DI_EUI_SILABS) {
/* Check the OUI in the EUI is silabs or energymicro.
* Use this to identify the Device Identification (DI) version */
uint64_t oui24 = ((efm32_v1_read_eui64(t) >> 40) & 0xFFFFFF);
if (oui24 == EFM32_V1_DI_EUI_SILABS) {
/* Device Identification (DI) version 1 */
di_version = 1;
} else if (((efm32_v2_read_eui48(t) >> 24) & 0xFFFFFF) == EFM32_V2_DI_EUI_ENERGYMICRO) {
} else if (oui24 == EFM32_V2_DI_EUI_ENERGYMICRO) {
/* Device Identification (DI) version 2 */
di_version = 2;
} else {
/* unknown device */
/* sprintf(variant_string, */
/* "EFM32 DI Version ?? 0x%016llx 0x%016llx", */
/* efm32_v1_read_eui64(t), efm32_v2_read_eui48(t)); */
return false;
/* Unknown OUI - assume version 1 */
di_version = 1;
}
/* Read the part number and family */
uint16_t part_number = efm32_read_part_number(t, di_version);
/* Read the part family, and reject if unknown */
size_t device_index = efm32_lookup_device_index(t, di_version);
if (device_index > (127-32)) {
/* too big to encode in printable ascii */
/* unknown device family */
return false;
}
efm32_device_t const* device = &efm32_devices[device_index];
@ -599,6 +597,8 @@ bool efm32_probe(target *t)
return false;
}
uint16_t part_number = efm32_read_part_number(t, di_version);
/* Read memory sizes, convert to bytes */
uint16_t flash_kib = efm32_read_flash_size(t, di_version);
uint32_t flash_size = flash_kib * 0x400;