arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-31 19:08:28 +00:00
Code Issues Releases Wiki Activity

feat(core): respect manufacturing mode in power on sequence

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2025-05-09 08:42:52 +02:00 committed by kopecdav
parent 2e23349419
commit a4eaf4dc27
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core/embed/projects/bootloader/main.c
View File

@ -89,7 +89,22 @@ void failed_jump_to_firmware(void);
CONFIDENTIAL volatile secbool dont_optimize_out_true = sectrue;
CONFIDENTIAL void (*volatile firmware_jump_fn)(void) = failed_jump_to_firmware;
static void drivers_init(secbool *touch_initialized) {
static secbool is_manufacturing_mode(void) {
unit_properties_init();
#if (defined TREZOR_MODEL_T3T1 || defined TREZOR_MODEL_T3W1)
// on T3T1 and T3W1, tester needs to run without touch and tamper, so making
// an exception until unit variant is written in OTP
const secbool manufacturing_mode =
unit_properties()->locked ? secfalse : sectrue;
#else
const secbool manufacturing_mode = secfalse;
#endif
return manufacturing_mode;
}
static void boot_sequence(secbool manufacturing_mode) {
#ifdef USE_BACKUP_RAM
backup_ram_init();
#endif
@ -111,6 +126,10 @@ static void drivers_init(secbool *touch_initialized) {
(cmd == BOOT_COMMAND_INSTALL_UPGRADE || cmd == BOOT_COMMAND_REBOOT ||
cmd == BOOT_COMMAND_SHOW_RSOD || cmd == BOOT_COMMAND_STOP_AND_WAIT);
if (sectrue == manufacturing_mode && cmd != BOOT_COMMAND_POWER_OFF) {
turn_on = true;
}
while (!button_is_down(BTN_POWER) && !turn_on) {
pm_state_t state;
pm_get_state(&state);
@ -139,7 +158,10 @@ static void drivers_init(secbool *touch_initialized) {
}
#endif
}
static void drivers_init(secbool manufacturing_mode,
secbool *touch_initialized) {
random_delays_init();
#ifdef USE_PVD
pvd_init();
@ -148,17 +170,6 @@ static void drivers_init(secbool *touch_initialized) {
hash_processor_init();
#endif
display_init(DISPLAY_RESET_CONTENT);
unit_properties_init();
#if (defined TREZOR_MODEL_T3T1 || defined TREZOR_MODEL_T3W1)
// on T3T1 and T3W1, tester needs to run without touch and tamper, so making
// an exception until unit variant is written in OTP
const secbool manufacturing_mode =
unit_properties()->locked ? secfalse : sectrue;
#else
const secbool manufacturing_mode = secfalse;
(void)manufacturing_mode; // suppress unused variable warning
#endif
#ifdef USE_TAMPER
tamper_init();
@ -317,7 +328,11 @@ int bootloader_main(void) {
system_init(&rsod_panic_handler);
drivers_init(&touch_initialized);
secbool manufacturing_mode = is_manufacturing_mode();
boot_sequence(manufacturing_mode);
drivers_init(manufacturing_mode, &touch_initialized);
ui_screen_boot_stage_1(false);

4
core/embed/sys/startup/inc/sys/bootargs.h
View File

@ -25,7 +25,7 @@
// Defines boot command processed in bootloader on next reboot
typedef enum {
// Normal boot sequence
// Default boot sequence
BOOT_COMMAND_NONE = 0x00000000,
// Stop and wait for further instructions
BOOT_COMMAND_STOP_AND_WAIT = 0x0FC35A96,
@ -35,6 +35,8 @@ typedef enum {
BOOT_COMMAND_SHOW_RSOD = 0x7CD945A0,
// Reboot the device as if it was powered on
BOOT_COMMAND_REBOOT = 0xA5C3D4E2,
// Power of the device
BOOT_COMMAND_POWER_OFF = 0x24EEE8828,
} boot_command_t;
// Maximum size boot_args array

2
core/embed/sys/startup/stm32/bootutils.c
View File

@ -217,7 +217,7 @@ __attribute__((noreturn)) void reboot_device(void) {
}
__attribute__((noreturn)) void reboot_to_off(void) {
reboot_with_args(BOOT_COMMAND_NONE, NULL, 0);
reboot_with_args(BOOT_COMMAND_POWER_OFF, NULL, 0);
}
__attribute__((noreturn)) void reboot_or_halt_after_rsod(void) {