proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-30 03:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dfu: Correctly erase STM32 devices when transfer size is less than sector size

Browse Source
This commit is contained in:
Richard Hughes 2021-03-01 10:04:48 +00:00
parent f32e4c0666
commit f6ee6043c5
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
plugins/dfu/fu-dfu-target-stm.c
View File

@ -276,35 +276,38 @@ fu_dfu_target_stm_download_element (FuDfuTarget *target,
/* for DfuSe devices we need to handle the erase and setting /* for DfuSe devices we need to handle the erase and setting
* the sectory address manually */ * the sectory address manually */
offset_dev = fu_chunk_get_address (chk) + (i * transfer_size); offset_dev = i * transfer_size;
sector = fu_dfu_target_get_sector_for_addr (target, offset_dev); while (offset_dev < (i + 1) * transfer_size) {
if (sector == NULL) { sector = fu_dfu_target_get_sector_for_addr (target, fu_chunk_get_address (chk) + offset_dev);
g_set_error (error, if (sector == NULL) {
FWUPD_ERROR, g_set_error (error,
FWUPD_ERROR_NOT_SUPPORTED, FWUPD_ERROR,
"no memory sector at 0x%04x", FWUPD_ERROR_NOT_SUPPORTED,
(guint) offset_dev); "no memory sector at 0x%04x",
return FALSE; (guint) fu_chunk_get_address (chk) + offset_dev);
} return FALSE;
if (!fu_dfu_sector_has_cap (sector, DFU_SECTOR_CAP_WRITEABLE)) { }
g_set_error (error, if (!fu_dfu_sector_has_cap (sector, DFU_SECTOR_CAP_WRITEABLE)) {
FWUPD_ERROR, g_set_error (error,
FWUPD_ERROR_NOT_SUPPORTED, FWUPD_ERROR,
"memory sector at 0x%04x is not writable", FWUPD_ERROR_NOT_SUPPORTED,
(guint) offset_dev); "memory sector at 0x%04x is not writable",
return FALSE; (guint) fu_chunk_get_address (chk) + offset_dev);
} return FALSE;
}
/* if it's erasable and not yet blanked */ /* if it's erasable and not yet blanked */
if (fu_dfu_sector_has_cap (sector, DFU_SECTOR_CAP_ERASEABLE) && if (fu_dfu_sector_has_cap (sector, DFU_SECTOR_CAP_ERASEABLE) &&
g_hash_table_lookup (sectors_hash, sector) == NULL) { g_hash_table_lookup (sectors_hash, sector) == NULL) {
g_hash_table_insert (sectors_hash, g_hash_table_insert (sectors_hash,
sector, sector,
GINT_TO_POINTER (1)); GINT_TO_POINTER (1));
g_ptr_array_add (sectors_array, sector); g_ptr_array_add (sectors_array, sector);
g_debug ("marking sector 0x%04x-%04x to be erased", g_debug ("marking sector 0x%04x-%04x to be erased",
fu_dfu_sector_get_address (sector), fu_dfu_sector_get_address (sector),
fu_dfu_sector_get_address (sector) + fu_dfu_sector_get_size (sector)); fu_dfu_sector_get_address (sector) + fu_dfu_sector_get_size (sector));
}
offset_dev += fu_dfu_sector_get_size (sector);
} }
} }