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

fix(core): remove unnecessary non-secure variant of irq_lock/unlock

Browse Source 
[no changelog]
This commit is contained in:
cepetr 2025-06-12 16:47:22 +02:00 committed by cepetr
parent ecbb71232e
commit ff2d4edaef
2 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/embed/sys/irq/inc/sys/irq.h
View File

@ -89,38 +89,6 @@ static inline void irq_unlock(irq_key_t key) {
); );
} }
#if defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
// Disables non-secure interrupts and returns the previous interrupt state.
//
// see irq_lock() for more details.
static inline irq_key_t irq_lock_ns(void) {
uint32_t key;
const uint32_t tmp = 1;
__asm volatile(
"MRS %0, PRIMASK_NS\n"
"MSR PRIMASK_NS, %1\n"
: "=r"(key)
: "r"(tmp)
: "memory" // Clobber memory to ensure correct memory operations
);
return key;
}
// Restores the non-secure interrupt state to what it was before `irq_lock`.
//
// see irq_unlock() for more details.
static inline void irq_unlock_ns(irq_key_t key) {
__asm volatile(
"MSR PRIMASK_NS, %0\n"
:
: "r"(key)
: "memory" // Clobber memory to ensure correct memory operations
);
}
#endif // defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
// IRQ priority levels used throughout the system // IRQ priority levels used throughout the system
// Highest priority in the system (only RESET, NMI, and // Highest priority in the system (only RESET, NMI, and

8
core/embed/sys/power_save/stm32u5/power_save.c
View File

@ -71,10 +71,6 @@ void power_save_suspend_cpu(void) {
// PRIMASK is cleared again. This is necessary to restore the system clock // PRIMASK is cleared again. This is necessary to restore the system clock
// immediately after exiting STOP2 mode. // immediately after exiting STOP2 mode.
#ifdef SECMON
irq_key_t irq_key_ns = irq_lock_ns();
#endif
irq_key_t irq_key = irq_lock(); irq_key_t irq_key = irq_lock();
// The PWR clock is disabled after system initialization. // The PWR clock is disabled after system initialization.
@ -91,10 +87,6 @@ void power_save_suspend_cpu(void) {
SystemInit(); SystemInit();
irq_unlock(irq_key); irq_unlock(irq_key);
#ifdef SECMON
irq_unlock_ns(irq_key_ns);
#endif
} }
void power_save_suspend_secure_io() { void power_save_suspend_secure_io() {