Skip to content

Commit

Permalink
core: arm: kernel_spmc: correct CFG_SECURE_PARTITION test
Browse files Browse the repository at this point in the history
Replace occurrences of #if CFG_SECURE_PARTITION to a #ifdef test
as boolean CFG_ configuration switches do not have a meaningful value.

Fixes: 4d02884 ("core: spmc: handle non-secure interrupts")
Reviewed-by: Jerome Forissier <[email protected]>
Reviewed-by: Jens Wiklander <[email protected]>
Signed-off-by: Etienne Carriere <[email protected]>
  • Loading branch information
etienne-lms committed Dec 21, 2023
1 parent 4a0e0f3 commit 3b4a785
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/arch/arm/kernel/thread_spmc_a64.S
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <kernel/thread.h>
#include <optee_ffa.h>

#if CFG_SECURE_PARTITION
#ifdef CFG_SECURE_PARTITION
LOCAL_FUNC thread_ffa_interrupt , :
mov_imm x0, FFA_INTERRUPT /* FID */
/* X1: Endpoint/vCPU IDs is set by caller */
Expand Down Expand Up @@ -197,7 +197,7 @@ FUNC thread_foreign_intr_exit , :
adr_l x2, threads
madd x2, x1, x0, x2
ldr w1, [x2, #THREAD_CTX_TSD_RPC_TARGET_INFO]
#if CFG_SECURE_PARTITION
#ifdef CFG_SECURE_PARTITION
/* load threads[w0].flags into w2 */
ldr w2, [x2, #THREAD_CTX_FLAGS]
and w2, w2, #THREAD_FLAGS_FFA_ONLY
Expand Down

0 comments on commit 3b4a785

Please sign in to comment.