fw/system/firmware_storage: fix slot invalidation

gmarull · gmarull · commit 9527f3e5d965 · 2026-01-21T16:18:24.000+08:00
To invalidate a slot it is sufficient to erase its first sector. Reading the
firmware header is pointless (and dangerous without any validation!), e.g. if
already erased.

Signed-off-by: Gerard Marull-Paretas &lt;gerard@teslabs.com&gt;
diff --git a/src/fw/system/firmware_storage.c b/src/fw/system/firmware_storage.c
@@ -76,11 +76,10 @@ void firmware_storage_invalidate_firmware_slot(uint8_t slot) {
     slot_start = FLASH_REGION_FIRMWARE_SLOT_1_BEGIN;
   }
 
-  FirmwareHeader hdr = firmware_storage_read_firmware_header(slot_start);
   flash_region_erase_optimal_range(slot_start,
                                    slot_start,
-                                   ROUND_TO_MOD_CEIL((slot_start + hdr.fw_start), SUBSECTOR_SIZE_BYTES),
-                                   ROUND_TO_MOD_CEIL((slot_start + hdr.fw_start), SUBSECTOR_SIZE_BYTES));
+                                   slot_start + SUBSECTOR_SIZE_BYTES,
+                                   slot_start + SUBSECTOR_SIZE_BYTES);
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,10 @@ void firmware_storage_invalidate_firmware_slot(uint8_t slot) {`
`76`	`76`	`slot_start = FLASH_REGION_FIRMWARE_SLOT_1_BEGIN;`
`77`	`77`	`}`
`78`	`78`
`79`		`- FirmwareHeader hdr = firmware_storage_read_firmware_header(slot_start);`
`80`	`79`	`flash_region_erase_optimal_range(slot_start,`
`81`	`80`	`slot_start,`
`82`		`- ROUND_TO_MOD_CEIL((slot_start + hdr.fw_start), SUBSECTOR_SIZE_BYTES),`
`83`		`- ROUND_TO_MOD_CEIL((slot_start + hdr.fw_start), SUBSECTOR_SIZE_BYTES));`
	`81`	`+ slot_start + SUBSECTOR_SIZE_BYTES,`
	`82`	`+ slot_start + SUBSECTOR_SIZE_BYTES);`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`#endif`