adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

modules: tfm: interface: handle ISR context

Browse source 
Don't attempt to take a mutex if operating from inside an ISR. The only
expected use-case where this should occur is when attempting to reboot
via `tfm_platform_system_reset` from an exception handler.

Fixes #79687.

Signed-off-by: Jordan Yates <jordan@embeint.com>
This commit is contained in:
Jordan Yates 2024-10-11 14:35:04 +10:00 committed by David Leach
parent dd7cfbc92e
commit f31439991d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/trusted-firmware-m/interface/interface.c
View file

@ -28,11 +28,11 @@ int32_t tfm_ns_interface_dispatch(veneer_fn fn,
uint32_t arg0, uint32_t arg1,
uint32_t arg2, uint32_t arg3)
{
int32_t result;
bool is_pre_kernel = k_is_pre_kernel();
bool isr_mode = k_is_in_isr() || k_is_pre_kernel();
int tfm_ns_saved_prio;
int32_t result;
if (!is_pre_kernel) {
if (!isr_mode) {
/* TF-M request protected by NS lock */
if (k_mutex_lock(&tfm_mutex, K_FOREVER) != 0) {
return (int32_t)PSA_ERROR_GENERIC_ERROR;
@ -61,7 +61,7 @@ int32_t tfm_ns_interface_dispatch(veneer_fn fn,
z_arm_restore_fp_context(&context_buffer);
if (!is_pre_kernel) {
if (!isr_mode) {
#if !defined(CONFIG_ARM_NONSECURE_PREEMPTIBLE_SECURE_CALLS)
/* Restore thread priority, to allow the thread to be preempted. */
k_thread_priority_set(k_current_get(), tfm_ns_saved_prio);