core: arm: kernel: make thread_core_local public

Move the struture of thread_core_local from thread_private.h to thread.h to make it public. Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
OP-TEE · Sep 18, 2017 · df34b18 · df34b18
1 parent 1b181fb
commit df34b18
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/core/arch/arm/include/kernel/thread.h b/core/arch/arm/include/kernel/thread.h
@@ -45,6 +45,33 @@
 #define THREAD_RPC_MAX_NUM_PARAMS	4
 
 #ifndef ASM
+
+#ifdef ARM64
+/*
+ * struct thread_core_local needs to have alignment suitable for a stack
+ * pointer since SP_EL1 points to this
+ */
+#define THREAD_CORE_LOCAL_ALIGNED __aligned(16)
+#else
+#define THREAD_CORE_LOCAL_ALIGNED
+#endif
+
+struct thread_core_local {
+	vaddr_t tmp_stack_va_end;
+	int curr_thread;
+	uint32_t flags;
+	vaddr_t abt_stack_va_end;
+#ifdef ARM32
+	uint32_t r[2];
+#endif
+#ifdef ARM64
+	uint64_t x[4];
+#endif
+#ifdef CFG_TEE_CORE_DEBUG
+	unsigned int locked_count; /* Number of spinlocks held */
+#endif
+} THREAD_CORE_LOCAL_ALIGNED;
+
 struct thread_vector_table {
 	uint32_t std_smc_entry;
 	uint32_t fast_smc_entry;
@@ -252,6 +279,8 @@ struct thread_handlers {
 void thread_init_primary(const struct thread_handlers *handlers);
 void thread_init_per_cpu(void);
 
+struct thread_core_local *thread_get_core_local(void);
+
 /*
  * Sets the stacks to be used by the different threads. Use THREAD_ID_0 for
  * first stack, THREAD_ID_0 + 1 for the next and so on.

diff --git a/core/arch/arm/kernel/thread.c b/core/arch/arm/kernel/thread.c
@@ -89,7 +89,7 @@
 
 struct thread_ctx threads[CFG_NUM_THREADS];
 
-static struct thread_core_local thread_core_local[CFG_TEE_CORE_NB_CORE];
+struct thread_core_local thread_core_local[CFG_TEE_CORE_NB_CORE];
 
 #ifdef CFG_WITH_STACK_CANARIES
 #ifdef ARM32

diff --git a/core/arch/arm/kernel/thread_private.h b/core/arch/arm/kernel/thread_private.h
@@ -117,33 +117,6 @@ struct thread_ctx {
 	struct mutex_head mutexes;
 	struct thread_specific_data tsd;
 };
-
-#ifdef ARM64
-/*
- * struct thread_core_local need to have alignment suitable for a stack
- * pointer since SP_EL1 points to this
- */
-#define THREAD_CORE_LOCAL_ALIGNED __aligned(16)
-#else
-#define THREAD_CORE_LOCAL_ALIGNED
-#endif
-
-struct thread_core_local {
-	vaddr_t tmp_stack_va_end;
-	int curr_thread;
-	uint32_t flags;
-	vaddr_t abt_stack_va_end;
-#ifdef ARM32
-	uint32_t r[2];
-#endif
-#ifdef ARM64
-	uint64_t x[4];
-#endif
-#ifdef CFG_TEE_CORE_DEBUG
-	unsigned int locked_count; /* Number of spinlocks held */
-#endif
-} THREAD_CORE_LOCAL_ALIGNED;
-
 #endif /*ASM*/
 
 #ifdef ARM64
@@ -190,8 +163,6 @@ void thread_init_vbar(void);
 /* Handles a stdcall, r0-r7 holds the parameters */
 void thread_std_smc_entry(void);
 
-struct thread_core_local *thread_get_core_local(void);
-
 /*
  * Resumes execution of currently active thread by restoring context and
  * jumping to the instruction where to continue execution.