WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

F-6758: hal_flash_write: derive DW base from address+i in else branch 

The 64-bit partial write indexed a fixed base with i>>2, so an
unaligned start crossing a double-word boundary programmed the
wrong, misaligned DW pair. Adopt the stm32g4/stm32c0 form:
recompute unit_addr = (address+i) & ~0x07 and use dst[0]/dst[1].
pull/909/head
Daniele Lacamera 2026-09-23 02:46:15 +02:00
parent 769c3885f0
commit 7b4a2ec99c
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hal/stm32g0.c
View File

@ -150,18 +150,17 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
flash_wait_complete();
i+=8;
} else {
uint32_t unit_addr = (address + i) & (~0x07);
int off = (address + i) - unit_addr;
uint32_t val[2];
uint8_t *vbytes = (uint8_t *)(val);
int off = (address + i) - (((address + i) >> 3) << 3);
uint32_t base_addr = address & (~0x07); /* aligned to 64 bit */
int u32_idx = (i >> 2);
dst = (uint32_t *)(base_addr);
val[0] = dst[u32_idx];
val[1] = dst[u32_idx + 1];
dst = (uint32_t *)unit_addr;
val[0] = dst[0];
val[1] = dst[1];
while ((off < 8) && (i < len))
vbytes[off++] = data[i++];
dst[u32_idx] = val[0];
dst[u32_idx + 1] = val[1];
dst[0] = val[0];
dst[1] = val[1];
flash_wait_complete();
}
}

15
hal/stm32l4.c
View File

@ -146,18 +146,17 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
flash_wait_complete();
i+=8;
} else {
uint32_t unit_addr = (address + i) & (~0x07);
int off = (address + i) - unit_addr;
uint32_t val[2];
uint8_t *vbytes = (uint8_t *)(val);
int off = (address + i) - (((address + i) >> 3) << 3);
uint32_t base_addr = address & (~0x07); /* aligned to 64 bit */
int u32_idx = (i >> 2);
dst = (uint32_t *)(base_addr);
val[0] = dst[u32_idx];
val[1] = dst[u32_idx + 1];
dst = (uint32_t *)unit_addr;
val[0] = dst[0];
val[1] = dst[1];
while ((off < 8) && (i < len))
vbytes[off++] = data[i++];
dst[u32_idx] = val[0];
dst[u32_idx + 1] = val[1];
dst[0] = val[0];
dst[1] = val[1];
flash_wait_complete();
}
}

15
hal/stm32wb.c
View File

@ -204,18 +204,17 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
flash_wait_complete();
i+=8;
} else {
uint32_t unit_addr = (address + i) & (~0x07);
int off = (address + i) - unit_addr;
uint32_t val[2];
uint8_t *vbytes = (uint8_t *)(val);
int off = (address + i) - (((address + i) >> 3) << 3);
uint32_t base_addr = address & (~0x07); /* aligned to 64 bit */
int u32_idx = (i >> 2);
dst = (uint32_t *)(base_addr);
val[0] = dst[u32_idx];
val[1] = dst[u32_idx + 1];
dst = (uint32_t *)unit_addr;
val[0] = dst[0];
val[1] = dst[1];
while ((off < 8) && (i < len))
vbytes[off++] = data[i++];
dst[u32_idx] = val[0];
dst[u32_idx + 1] = val[1];
dst[0] = val[0];
dst[1] = val[1];
flash_wait_complete();
}
}