arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 06:48:16 +00:00
Code Issues Releases Wiki Activity

bootloader: refactor flash erase after first chunk is received

Browse Source
This commit is contained in:
Pavol Rusnak 2018-01-26 13:41:32 +01:00
parent 5f1632c5fa
commit 6e81a68fbe
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embed/bootloader/bootui.c
View File

@ -175,7 +175,7 @@ void ui_screen_install(void)
void ui_screen_install_progress_erase(int pos, int len) void ui_screen_install_progress_erase(int pos, int len)
{ {
display_loader(250 * pos / len, -20, COLOR_BL_PROCESS, COLOR_WHITE, toi_icon_install, sizeof(toi_icon_install), COLOR_BLACK); display_loader(200 + 200 * pos / len, -20, COLOR_BL_PROCESS, COLOR_WHITE, toi_icon_install, sizeof(toi_icon_install), COLOR_BLACK);
} }
void ui_screen_install_progress_upload(int pos) void ui_screen_install_progress_upload(int pos)

1
embed/bootloader/main.c
View File

@ -189,6 +189,7 @@ static secbool bootloader_usb_loop(const vendor_header * const vhdr, const image
return secfalse; // shutdown return secfalse; // shutdown
} else } else
if (r == 0) { // last chunk received if (r == 0) { // last chunk received
ui_screen_install_progress_upload(1000);
ui_fadeout(); ui_fadeout();
ui_screen_done(4, sectrue); ui_screen_done(4, sectrue);
ui_fadein(); ui_fadein();

19
embed/bootloader/messages.c
View File

@ -279,14 +279,6 @@ void process_msg_FirmwareErase(uint8_t iface_num, uint32_t msg_size, uint8_t *bu
firmware_remaining = msg_recv.has_length ? msg_recv.length : 0; firmware_remaining = msg_recv.has_length ? msg_recv.length : 0;
if ((firmware_remaining > 0) && ((firmware_remaining % 4) == 0) && (firmware_remaining <= (FIRMWARE_SECTORS_COUNT * IMAGE_CHUNK_SIZE))) { if ((firmware_remaining > 0) && ((firmware_remaining % 4) == 0) && (firmware_remaining <= (FIRMWARE_SECTORS_COUNT * IMAGE_CHUNK_SIZE))) {
// erase flash
if (sectrue != flash_erase_sectors(firmware_sectors, FIRMWARE_SECTORS_COUNT, ui_screen_install_progress_erase)) {
MSG_SEND_INIT(Failure);
MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
MSG_SEND_ASSIGN_STRING(message, "Could not erase flash");
MSG_SEND(Failure);
return;
}
// request new firmware // request new firmware
chunk_requested = (firmware_remaining > IMAGE_CHUNK_SIZE) ? IMAGE_CHUNK_SIZE : firmware_remaining; chunk_requested = (firmware_remaining > IMAGE_CHUNK_SIZE) ? IMAGE_CHUNK_SIZE : firmware_remaining;
MSG_SEND_INIT(FirmwareRequest); MSG_SEND_INIT(FirmwareRequest);
@ -294,6 +286,7 @@ void process_msg_FirmwareErase(uint8_t iface_num, uint32_t msg_size, uint8_t *bu
MSG_SEND_ASSIGN_VALUE(length, chunk_requested); MSG_SEND_ASSIGN_VALUE(length, chunk_requested);
MSG_SEND(FirmwareRequest); MSG_SEND(FirmwareRequest);
} else { } else {
// invalid firmware size
MSG_SEND_INIT(Failure); MSG_SEND_INIT(Failure);
MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_DataError); MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_DataError);
MSG_SEND_ASSIGN_STRING(message, "Wrong firmware size"); MSG_SEND_ASSIGN_STRING(message, "Wrong firmware size");
@ -323,7 +316,14 @@ static bool _read_payload(pb_istream_t *stream, const pb_field_t *field, void **
while (stream->bytes_left) { while (stream->bytes_left) {
// update loader // update loader
ui_screen_install_progress_upload(250 + 750 * (firmware_block * IMAGE_CHUNK_SIZE + chunk_written) / (firmware_block * IMAGE_CHUNK_SIZE + firmware_remaining)); if (firmware_block == 0) {
// first chunk is 0 - 200
// followed by erase 200 - 400
ui_screen_install_progress_upload(200 * chunk_written / chunk_size);
} else {
// remaining chunks are 400 - 1000
ui_screen_install_progress_upload(400 + 600 * (firmware_block * IMAGE_CHUNK_SIZE + chunk_written) / (firmware_block * IMAGE_CHUNK_SIZE + firmware_remaining));
}
// read data // read data
if (!pb_read(stream, (pb_byte_t *)(chunk_buffer + chunk_written), (stream->bytes_left > BUFSIZE) ? BUFSIZE : stream->bytes_left)) { if (!pb_read(stream, (pb_byte_t *)(chunk_buffer + chunk_written), (stream->bytes_left > BUFSIZE) ? BUFSIZE : stream->bytes_left)) {
chunk_size = 0; chunk_size = 0;
@ -417,6 +417,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size, uint8_t *bu
}; };
ensure(flash_erase_sectors(sectors_storage, sizeof(sectors_storage), NULL), NULL); ensure(flash_erase_sectors(sectors_storage, sizeof(sectors_storage), NULL), NULL);
} }
ensure(flash_erase_sectors(firmware_sectors, FIRMWARE_SECTORS_COUNT, ui_screen_install_progress_erase), NULL);
firstskip = IMAGE_HEADER_SIZE + vhdr.hdrlen; firstskip = IMAGE_HEADER_SIZE + vhdr.hdrlen;
} }