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

F-7064: give the erase-completion ACK its long timeout 

ERASE_TIMEOUT was defined but never used; the final erase ACK used
the plain short WAIT_CYCLES budget, so a slow remote flash made
ext_flash_erase() fail even when the erase succeeded. Factor
wait_ack_cycles() out of wait_ack() and use WAIT_CYCLES *
ERASE_TIMEOUT for the erase ACK, like uart_rx_timeout() does with
READ_TIMEOUT. Add unit tests for the success and timeout paths.
pull/909/head
Daniele Lacamera 2026-09-23 01:48:54 +02:00
parent 53f1d4e056
commit 2f9a8ea15d
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/uart_flash.c
View File

@ -47,17 +47,22 @@
int uart_tx(const uint8_t c);
int uart_rx(uint8_t *c);
static int wait_ack(void)
static int wait_ack_cycles(int cycles)
{
uint8_t c;
volatile int count = 0;
while(++count < WAIT_CYCLES) {
uint8_t c;
while(++count < cycles) {
if ((uart_rx(&c) == 1) && (c == CMD_ACK))
return 0;
}
return -1;
}
static int wait_ack(void)
{
return wait_ack_cycles(WAIT_CYCLES);
}
static int uart_rx_timeout(uint8_t *c)
{
volatile int count = 0;
@ -144,7 +149,7 @@ int ext_flash_erase(uintptr_t address, int len)
return -1;
}
/* Wait for extra ack at the end of Erase */
if (wait_ack() == 0)
if (wait_ack_cycles(WAIT_CYCLES * ERASE_TIMEOUT) == 0)
return 0;
return -1;
}

33
tools/unit-tests/unit-uart-flash.c
View File

@ -69,12 +69,45 @@ START_TEST(test_ext_flash_read_timeout_returns_error)
}
END_TEST
START_TEST(test_ext_flash_erase_success)
{
uint8_t script[11];
int ret;
/* 10 command ACKs + the erase-completion ACK */
memset(script, CMD_ACK, sizeof(script));
reset_uart_script(script, sizeof(script));
ret = ext_flash_erase(0x1000, 0x1000);
ck_assert_int_eq(ret, 0);
ck_assert_int_eq(rx_script_pos, 11);
}
END_TEST
START_TEST(test_ext_flash_erase_timeout_returns_error)
{
uint8_t script[10];
int ret;
/* Command ACKs only: the erase-completion ACK never arrives */
memset(script, CMD_ACK, sizeof(script));
reset_uart_script(script, sizeof(script));
ret = ext_flash_erase(0x1000, 0x1000);
ck_assert_int_eq(ret, -1);
}
END_TEST
Suite *wolfboot_suite(void)
{
Suite *s = suite_create("wolfBoot");
TCase *uart_flash = tcase_create("UART flash");
tcase_add_test(uart_flash, test_ext_flash_read_timeout_returns_error);
tcase_add_test(uart_flash, test_ext_flash_erase_success);
tcase_add_test(uart_flash, test_ext_flash_erase_timeout_returns_error);
tcase_set_timeout(uart_flash, 20);
suite_add_tcase(s, uart_flash);