commit eecbd8fd9250b32bd8048a0adda5ce43b6ce535e
author Chris Brand <chris.brand@cypress.com> Thu Mar 28 12:08:47 2024 -0700
committer Anton Komlev <Anton.Komlev@arm.com> Mon Apr 08 17:04:08 2024 +0200
tree cc3f41b2babe77d754d1a0292ffa756aef6673ad
parent 479bfde835f0e5d5bad918d28cd087654178b57e

FIH: Change fih_delay() to return int

This will facilitate its use in macros to enhance fault protection.

Signed-off-by: Chris Brand <chris.brand@cypress.com>
Change-Id: I880b5f64a3329debaa8bae2e4eeddbeb2703a103

secure_fw/partitions/idle_partition/idle_partition.c

diff --git a/secure_fw/partitions/idle_partition/idle_partition.c b/secure_fw/partitions/idle_partition/idle_partition.c
index 38ae349..8f45f94 100644
--- a/secure_fw/partitions/idle_partition/idle_partition.c
+++ b/secure_fw/partitions/idle_partition/idle_partition.c
@@ -1,5 +1,8 @@
 /*
  * Copyright (c) 2021-2024, Arm Limited. All rights reserved.
+ * Copyright (c) 2024 Cypress Semiconductor Corporation (an Infineon
+ * company) or an affiliate of Cypress Semiconductor Corporation. All rights
+ * reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -24,7 +27,7 @@
     }
 
 #ifdef TFM_FIH_PROFILE_ON
-    fih_delay();
+    (void)fih_delay();
 
     while (1) {
         /*

secure_fw/spm/core/arch/tfm_arch_v8m_base.c

diff --git a/secure_fw/spm/core/arch/tfm_arch_v8m_base.c b/secure_fw/spm/core/arch/tfm_arch_v8m_base.c
index 5cc587f..c66d8ac 100644
--- a/secure_fw/spm/core/arch/tfm_arch_v8m_base.c
+++ b/secure_fw/spm/core/arch/tfm_arch_v8m_base.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2024, Arm Limited. All rights reserved.
- * Copyright (c) 2022-2023 Cypress Semiconductor Corporation (an Infineon
+ * Copyright (c) 2022-2024 Cypress Semiconductor Corporation (an Infineon
  * company) or an affiliate of Cypress Semiconductor Corporation. All rights
  * reserved.
  *
@@ -277,7 +277,7 @@
     if ((scb->AIRCR & SCB_AIRCR_PRIS_Msk) !=  SCB_AIRCR_PRIS_Msk) {
         FIH_RET(FIH_FAILURE);
     }
-    fih_delay();
+    (void)fih_delay();
     if ((scb->AIRCR & SCB_AIRCR_PRIS_Msk) !=  SCB_AIRCR_PRIS_Msk) {
         FIH_RET(FIH_FAILURE);
     }

secure_fw/spm/core/arch/tfm_arch_v8m_main.c

diff --git a/secure_fw/spm/core/arch/tfm_arch_v8m_main.c b/secure_fw/spm/core/arch/tfm_arch_v8m_main.c
index ce41e37..5bde22d 100644
--- a/secure_fw/spm/core/arch/tfm_arch_v8m_main.c
+++ b/secure_fw/spm/core/arch/tfm_arch_v8m_main.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2024, Arm Limited. All rights reserved.
- * Copyright (c) 2022-2023 Cypress Semiconductor Corporation (an Infineon
+ * Copyright (c) 2022-2024 Cypress Semiconductor Corporation (an Infineon
  * company) or an affiliate of Cypress Semiconductor Corporation. All rights
  * reserved.
  *
@@ -245,7 +245,7 @@
     if ((scb->AIRCR & SCB_AIRCR_PRIS_Msk) != SCB_AIRCR_PRIS_Msk) {
         FIH_RET(FIH_FAILURE);
     }
-    fih_delay();
+    (void)fih_delay();
     if ((scb->AIRCR & SCB_AIRCR_PRIS_Msk) != SCB_AIRCR_PRIS_Msk) {
         FIH_RET(FIH_FAILURE);
     }

secure_fw/spm/core/utilities.c

diff --git a/secure_fw/spm/core/utilities.c b/secure_fw/spm/core/utilities.c
index c9a0c67..c8f0f67 100644
--- a/secure_fw/spm/core/utilities.c
+++ b/secure_fw/spm/core/utilities.c
@@ -1,5 +1,8 @@
 /*
  * Copyright (c) 2018-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2024 Cypress Semiconductor Corporation (an Infineon
+ * company) or an affiliate of Cypress Semiconductor Corporation. All rights
+ * reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -12,7 +15,7 @@
 
 void tfm_core_panic(void)
 {
-    fih_delay();
+    (void)fih_delay();
 
 #ifdef CONFIG_TFM_HALT_ON_CORE_PANIC
 
@@ -23,7 +26,7 @@
     tfm_hal_system_halt();
 
 #ifdef TFM_FIH_PROFILE_ON
-    fih_delay();
+    (void)fih_delay();
 
     tfm_hal_system_halt();
 #endif
@@ -40,7 +43,7 @@
     tfm_hal_system_reset();
 
 #ifdef TFM_FIH_PROFILE_ON
-    fih_delay();
+    (void)fih_delay();
 
     tfm_hal_system_reset();
 #endif