commit a16228b6dd9fd26c24db417254d42f01754fd6bd
author Xinyu Zhang <xinyu.zhang@arm.com> Thu Jan 12 14:54:04 2023 +0800
committer Ken Liu <ken.liu@arm.com> Tue Jan 31 06:07:31 2023 +0100
tree b68c06c194e3056849549e814e2a1f5fb077646e
parent 4331b765f625f489e2881351c7adc7b8f884174a

SPM: Use CMSIS defined EXC_RETURN macros

Every EXC_RETURN macro references have been renamed
according to CMSIS.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Signed-off-by: Dávid Házi <david.hazi@arm.com>
Change-Id: I326d654a63ca5bb95e059c563a6d56cdaa165cc3

secure_fw/spm/ffm/backend_sfn.c

diff --git a/secure_fw/spm/ffm/backend_sfn.c b/secure_fw/spm/ffm/backend_sfn.c
index b2650c2..336fec1 100644
--- a/secure_fw/spm/ffm/backend_sfn.c
+++ b/secure_fw/spm/ffm/backend_sfn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2023, Arm Limited. All rights reserved.
  * Copyright (c) 2022 Cypress Semiconductor Corporation (an Infineon
  * company) or an affiliate of Cypress Semiconductor Corporation. All rights
  * reserved.
@@ -146,7 +146,7 @@
 
 uint32_t backend_system_run(void)
 {
-    return EXC_RETURN_THREAD_S_PSP;
+    return EXC_RETURN_THREAD_PSP;
 }
 
 psa_signal_t backend_wait(struct partition_t *p_pt, psa_signal_t signal_mask)

secure_fw/spm/ffm/interrupt.c

diff --git a/secure_fw/spm/ffm/interrupt.c b/secure_fw/spm/ffm/interrupt.c
index 72e7383..1f28123 100644
--- a/secure_fw/spm/ffm/interrupt.c
+++ b/secure_fw/spm/ffm/interrupt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2023, Arm Limited. All rights reserved.
  * Copyright (c) 2022 Cypress Semiconductor Corporation (an Infineon
  * company) or an affiliate of Cypress Semiconductor Corporation. All rights
  * reserved.
@@ -112,7 +112,7 @@
     /* Set FLIH result to the ISR */
     p_ctx_flih_ret->state_ctx.r0 = (uint32_t)result;
 
-    return EXC_RETURN_HANDLER_S_MSP;
+    return EXC_RETURN_HANDLER;
 }
 #endif