From 31d202b3f626f624d28e33de785029da99c9d1f6 Mon Sep 17 00:00:00 2001
From: itayzafrir <itay.zafrir@arm.com>
Date: Wed, 27 Feb 2019 11:59:20 +0200
Subject: [PATCH] Change error code handling of calls to psa_call

---
 .../COMPONENT_PSA_SRV_IPC/test_partition_proxy.c           | 4 ----
 .../crypto_access_control/COMPONENT_SPE/test_partition.c   | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/TESTS/psa/crypto_access_control/COMPONENT_PSA_SRV_IPC/test_partition_proxy.c b/TESTS/psa/crypto_access_control/COMPONENT_PSA_SRV_IPC/test_partition_proxy.c
index b2e10695fb..f03a05d1df 100644
--- a/TESTS/psa/crypto_access_control/COMPONENT_PSA_SRV_IPC/test_partition_proxy.c
+++ b/TESTS/psa/crypto_access_control/COMPONENT_PSA_SRV_IPC/test_partition_proxy.c
@@ -34,10 +34,6 @@ static psa_status_t invoke_ipc_call(uint32_t sid, psa_invec *in_vec, size_t in_v
     status = psa_call(handle, in_vec, in_vec_size, out_vec, out_vec_size);
     psa_close(handle);
 
-    if (status < 0) {
-        status = PSA_ERROR_COMMUNICATION_FAILURE;
-    }
-
     return (status);
 }
 
diff --git a/TESTS/psa/crypto_access_control/COMPONENT_SPE/test_partition.c b/TESTS/psa/crypto_access_control/COMPONENT_SPE/test_partition.c
index db4bebc6b0..e01b19482c 100644
--- a/TESTS/psa/crypto_access_control/COMPONENT_SPE/test_partition.c
+++ b/TESTS/psa/crypto_access_control/COMPONENT_SPE/test_partition.c
@@ -23,6 +23,13 @@
 
 typedef psa_status_t (*SignalHandler)(psa_msg_t *);
 
+#if defined(TARGET_TFM)
+#define SPM_PANIC(format, ...) \
+{ \
+    while(1){}; \
+}
+#endif
+
 static void read_input_param_from_message(psa_msg_t *msg, uint8_t param_index, void *param_ptr)
 {
     size_t bytes_read = psa_read(msg->handle, param_index, param_ptr, msg->in_size[param_index]);