trusty: Add smp support

Add an unlocked nop call to allow multiple cpus to enter trusty.
Other standard calls are still serialized to avoid return codes
getting mixed up.
A new return code is used to indicate that the standard call is
running on another cpu.

Change-Id: Iccc0785138fbc3eb9daebf22fd79d6c1f9b23f6a
Signed-off-by: Arve Hjønnevåg <arve@android.com>

2 files changed, 18 insertions, 2 deletions

diff --git a/include/linux/trusty/sm_err.h b/include/linux/trusty/sm_err.h
index 7de09b46f..32ee08e49 100644
--- a/include/linux/trusty/sm_err.h
+++ b/include/linux/trusty/sm_err.h
@@ -36,5 +36,8 @@
 #define SM_ERR_END_OF_INPUT             -10
 #define SM_ERR_PANIC                    -11     /* Secure OS crashed */
 #define SM_ERR_FIQ_INTERRUPTED          -12     /* Got interrupted by FIQ. Call back with SMC_SC_RESTART_FIQ on same CPU */
+#define SM_ERR_CPU_IDLE                 -13     /* SMC call waiting for another CPU */
+#define SM_ERR_NOP_INTERRUPTED          -14     /* Got interrupted. Call back with new SMC_SC_NOP */
+#define SM_ERR_NOP_DONE                 -15     /* Cpu idle after SMC_SC_NOP (not an error) */
 
 #endif
diff --git a/include/linux/trusty/smcall.h b/include/linux/trusty/smcall.h
index 7d8950a88..2e43803d9 100644
--- a/include/linux/trusty/smcall.h
+++ b/include/linux/trusty/smcall.h
@@ -56,7 +56,7 @@
 
 /* FC = Fast call, SC = Standard call */
 #define SMC_SC_RESTART_LAST     SMC_STDCALL_NR  (SMC_ENTITY_SECURE_MONITOR, 0)
-#define SMC_SC_NOP              SMC_STDCALL_NR  (SMC_ENTITY_SECURE_MONITOR, 1)
+#define SMC_SC_LOCKED_NOP       SMC_STDCALL_NR  (SMC_ENTITY_SECURE_MONITOR, 1)
 
 /**
  * SMC_SC_RESTART_FIQ - Re-enter trusty after it was interrupted by an fiq
@@ -70,6 +70,18 @@
  */
 #define SMC_SC_RESTART_FIQ      SMC_STDCALL_NR  (SMC_ENTITY_SECURE_MONITOR, 2)
 
+/**
+ * SMC_SC_NOP - Enter trusty to run pending work.
+ *
+ * No arguments.
+ *
+ * Returns SM_ERR_NOP_INTERRUPTED or SM_ERR_NOP_DONE.
+ * If SM_ERR_NOP_INTERRUPTED is returned, the call must be repeated.
+ *
+ * Enable by selecting api version TRUSTY_API_VERSION_SMP (2) or later.
+ */
+#define SMC_SC_NOP              SMC_STDCALL_NR  (SMC_ENTITY_SECURE_MONITOR, 3)
+
 /*
  * Return from secure os to non-secure os with return value in r1
  */
@@ -107,7 +119,8 @@
  * This call must be made before any calls that are affected by the api version.
  */
 #define TRUSTY_API_VERSION_RESTART_FIQ  (1)
-#define TRUSTY_API_VERSION_CURRENT      (1)
+#define TRUSTY_API_VERSION_SMP          (2)
+#define TRUSTY_API_VERSION_CURRENT      (2)
 #define SMC_FC_API_VERSION      SMC_FASTCALL_NR (SMC_ENTITY_SECURE_MONITOR, 11)
 
 /* TRUSTED_OS entity calls */