commit fc7b7717aebe7c5d00ba581bb9968af23fd8279e
author Kevin Peng <kevin.peng@arm.com> Sat May 08 13:42:56 2021 +0800
committer Kevin Peng <kevin.peng@arm.com> Thu May 20 04:03:39 2021 +0200
tree 3098fcc59f2e3a611e458640458ba064d158bd61
parent 211f5d6a6b1d766eaa1dc1deba32304e91665b5b

SPM: Convert SVC number to uint8_t

SVC number encoded in SVC instruction is 8-bit long.
Currently it relies on the short-enum compiler option to have a
8-bit long SVC number type.

This patch converts the enum to uint8_t for SVC number and divids
the SVC numbers to two parts for IPC model:
 - 0x0 ~ 0x7F for SVC calls only allowed from Thread Mode
 - 0x80 ~ 0xFF for SVC calls only allowed from interrupt handling

Note: For library model, the SVC numbers have no restrictions.

Since the requirements for SVC number assignment are different,
this patch also split the SVC number header for IPC and Library models.

Change-Id: I0fb4dd110be6bab05e1c4b9a8fc55e1b8bfbc0eb
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

interface/src/psa/psa_client.c

diff --git a/interface/src/psa/psa_client.c b/interface/src/psa/psa_client.c
index 2d92182..00d95ee 100644
--- a/interface/src/psa/psa_client.c
+++ b/interface/src/psa/psa_client.c
@@ -6,9 +6,10 @@
  */
 
 #include <inttypes.h>
-#include "tfm/tfm_core_svc.h"
 #include "psa/client.h"
+#include "svc_num.h"
 #include "tfm_api.h"
+#include "tfm_hal_device_header.h"
 #include "tfm_psa_call_param.h"
 
 __attribute__((naked))

interface/src/psa/psa_lifecycle.c

diff --git a/interface/src/psa/psa_lifecycle.c b/interface/src/psa/psa_lifecycle.c
index 313bfd5..cee7dfd 100644
--- a/interface/src/psa/psa_lifecycle.c
+++ b/interface/src/psa/psa_lifecycle.c
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 #include <inttypes.h>
 #include "psa/lifecycle.h"
-#include "tfm/tfm_core_svc.h"
+#include "svc_num.h"
+#include "tfm_hal_device_header.h"
 
 __attribute__((naked))
 uint32_t psa_rot_lifecycle_state(void)

interface/src/psa/psa_service.c

diff --git a/interface/src/psa/psa_service.c b/interface/src/psa/psa_service.c
index 7ae3bd1..a8ecef4 100644
--- a/interface/src/psa/psa_service.c
+++ b/interface/src/psa/psa_service.c
@@ -7,9 +7,10 @@
 
 #include <inttypes.h>
 #include <stdio.h>
-#include "tfm/tfm_core_svc.h"
 #include "psa/client.h"
 #include "psa/service.h"
+#include "svc_num.h"
+#include "tfm_hal_device_header.h"
 
 __attribute__((naked))
 psa_signal_t psa_wait(psa_signal_t signal_mask, uint32_t timeout)