Move TSP private declarations into separate header
authorDan Handley <dan.handley@arm.com>
Fri, 1 Aug 2014 16:58:27 +0000 (17:58 +0100)
committerDan Handley <dan.handley@arm.com>
Thu, 14 Aug 2014 10:25:41 +0000 (11:25 +0100)
Move the TSP private declarations out of tsp.h and into a new
header, tsp_private.h. This clarifies the TSP interface to the TSPD.

Change-Id: I39af346eeba3350cadcac56c02d97a5cb978c28b

bl32/tsp/aarch64/tsp_entrypoint.S
bl32/tsp/tsp_interrupt.c
bl32/tsp/tsp_main.c
bl32/tsp/tsp_private.h [new file with mode: 0644]
bl32/tsp/tsp_timer.c
include/bl32/payloads/tsp.h

index 75ee4434978ae485fdf3514d8561fc9fb576aaa7..555f120bae38177e45c81aa745ef0e37aa74224a 100644 (file)
@@ -32,6 +32,7 @@
 #include <asm_macros.S>
 #include <tsp.h>
 #include <xlat_tables.h>
+#include "../tsp_private.h"
 
 
        .globl  tsp_entrypoint
index 65c581f658b8ba9d0055abb26ab28490e0cee0c9..3ae54932c01e15a499ba727a2cfdae2a036da996 100644 (file)
 #include <assert.h>
 #include <debug.h>
 #include <gic_v2.h>
-#include <tsp.h>
 #include <platform.h>
 #include <platform_def.h>
+#include <tsp.h>
+#include "tsp_private.h"
 
 /*******************************************************************************
  * This function updates the TSP statistics for FIQs handled synchronously i.e
index 982bab2fb4a2afadd49e47f0a0175e779b482684..31808fcfb19add77edd5f3ddcc4a769fe9ced2ad 100644 (file)
@@ -35,6 +35,7 @@
 #include <platform_def.h>
 #include <spinlock.h>
 #include <tsp.h>
+#include "tsp_private.h"
 
 /*******************************************************************************
  * Declarations of linker defined symbols which will help us find the layout
diff --git a/bl32/tsp/tsp_private.h b/bl32/tsp/tsp_private.h
new file mode 100644 (file)
index 0000000..39fb5f6
--- /dev/null
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of ARM nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __TSP_PRIVATE_H__
+#define __TSP_PRIVATE_H__
+
+/* Definitions to help the assembler access the SMC/ERET args structure */
+#define TSP_ARGS_SIZE          0x40
+#define TSP_ARG0               0x0
+#define TSP_ARG1               0x8
+#define TSP_ARG2               0x10
+#define TSP_ARG3               0x18
+#define TSP_ARG4               0x20
+#define TSP_ARG5               0x28
+#define TSP_ARG6               0x30
+#define TSP_ARG7               0x38
+#define TSP_ARGS_END           0x40
+
+
+#ifndef __ASSEMBLY__
+
+#include <cassert.h>
+#include <platform_def.h> /* For CACHE_WRITEBACK_GRANULE */
+#include <spinlock.h>
+#include <stdint.h>
+#include <tsp.h>
+
+
+typedef struct work_statistics {
+       uint32_t fiq_count;             /* Number of FIQs on this cpu */
+       uint32_t irq_count;             /* Number of IRQs on this cpu */
+       uint32_t sync_fiq_count;        /* Number of sync. fiqs on this cpu */
+       uint32_t sync_fiq_ret_count;    /* Number of fiq returns on this cpu */
+       uint32_t smc_count;             /* Number of returns on this cpu */
+       uint32_t eret_count;            /* Number of entries on this cpu */
+       uint32_t cpu_on_count;          /* Number of cpu on requests */
+       uint32_t cpu_off_count;         /* Number of cpu off requests */
+       uint32_t cpu_suspend_count;     /* Number of cpu suspend requests */
+       uint32_t cpu_resume_count;      /* Number of cpu resume requests */
+} __aligned(CACHE_WRITEBACK_GRANULE) work_statistics_t;
+
+typedef struct tsp_args {
+       uint64_t _regs[TSP_ARGS_END >> 3];
+} __aligned(CACHE_WRITEBACK_GRANULE) tsp_args_t;
+
+/* Macros to access members of the above structure using their offsets */
+#define read_sp_arg(args, offset)      ((args)->_regs[offset >> 3])
+#define write_sp_arg(args, offset, val) (((args)->_regs[offset >> 3])  \
+                                        = val)
+/*
+ * Ensure that the assembler's view of the size of the tsp_args is the
+ * same as the compilers
+ */
+CASSERT(TSP_ARGS_SIZE == sizeof(tsp_args_t), assert_sp_args_size_mismatch);
+
+void tsp_get_magic(uint64_t args[4]);
+
+tsp_args_t *tsp_cpu_resume_main(uint64_t arg0,
+                               uint64_t arg1,
+                               uint64_t arg2,
+                               uint64_t arg3,
+                               uint64_t arg4,
+                               uint64_t arg5,
+                               uint64_t arg6,
+                               uint64_t arg7);
+tsp_args_t *tsp_cpu_suspend_main(uint64_t arg0,
+                                uint64_t arg1,
+                                uint64_t arg2,
+                                uint64_t arg3,
+                                uint64_t arg4,
+                                uint64_t arg5,
+                                uint64_t arg6,
+                                uint64_t arg7);
+tsp_args_t *tsp_cpu_on_main(void);
+tsp_args_t *tsp_cpu_off_main(uint64_t arg0,
+                            uint64_t arg1,
+                            uint64_t arg2,
+                            uint64_t arg3,
+                            uint64_t arg4,
+                            uint64_t arg5,
+                            uint64_t arg6,
+                            uint64_t arg7);
+
+/* Generic Timer functions */
+void tsp_generic_timer_start(void);
+void tsp_generic_timer_handler(void);
+void tsp_generic_timer_stop(void);
+void tsp_generic_timer_save(void);
+void tsp_generic_timer_restore(void);
+
+/* FIQ management functions */
+void tsp_update_sync_fiq_stats(uint32_t type, uint64_t elr_el3);
+
+
+/* Data structure to keep track of TSP statistics */
+extern spinlock_t console_lock;
+extern work_statistics_t tsp_stats[PLATFORM_CORE_COUNT];
+
+/* Vector table of jumps */
+extern tsp_vectors_t tsp_vector_table;
+
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __TSP_PRIVATE_H__ */
+
index a7fdfdafcecac87463319273841ea533d56e8874..d9460b69da11419dce0952df95353583f60dac5d 100644 (file)
@@ -30,7 +30,7 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <platform.h>
-#include <tsp.h>
+#include "tsp_private.h"
 
 /*******************************************************************************
  * Data structure to keep track of per-cpu secure generic timer context across
index 2db3b3467638231948754bda3cc282801b61cc6f..c0b191f79cbb448e31b6a06b4f24c22922f44e4e 100644 (file)
 /*                             0xbf00ff02 is reserved */
 #define TOS_CALL_VERSION       0xbf00ff03 /* Trusted OS Call Version */
 
-/* Definitions to help the assembler access the SMC/ERET args structure */
-#define TSP_ARGS_SIZE          0x40
-#define TSP_ARG0               0x0
-#define TSP_ARG1               0x8
-#define TSP_ARG2               0x10
-#define TSP_ARG3               0x18
-#define TSP_ARG4               0x20
-#define TSP_ARG5               0x28
-#define TSP_ARG6               0x30
-#define TSP_ARG7               0x38
-#define TSP_ARGS_END           0x40
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
-#include <platform_def.h> /* For CACHE_WRITEBACK_GRANULE */
-#include <spinlock.h>
 #include <stdint.h>
 
+
 typedef uint32_t tsp_vector_isn_t;
 
 typedef struct tsp_vectors {
@@ -129,79 +116,7 @@ typedef struct tsp_vectors {
        tsp_vector_isn_t fiq_entry;
 } tsp_vectors_t;
 
-typedef struct work_statistics {
-       uint32_t fiq_count;             /* Number of FIQs on this cpu */
-       uint32_t irq_count;             /* Number of IRQs on this cpu */
-       uint32_t sync_fiq_count;        /* Number of sync. fiqs on this cpu */
-       uint32_t sync_fiq_ret_count;    /* Number of fiq returns on this cpu */
-       uint32_t smc_count;             /* Number of returns on this cpu */
-       uint32_t eret_count;            /* Number of entries on this cpu */
-       uint32_t cpu_on_count;          /* Number of cpu on requests */
-       uint32_t cpu_off_count;         /* Number of cpu off requests */
-       uint32_t cpu_suspend_count;     /* Number of cpu suspend requests */
-       uint32_t cpu_resume_count;      /* Number of cpu resume requests */
-} __aligned(CACHE_WRITEBACK_GRANULE) work_statistics_t;
-
-typedef struct tsp_args {
-       uint64_t _regs[TSP_ARGS_END >> 3];
-} __aligned(CACHE_WRITEBACK_GRANULE) tsp_args_t;
-
-/* Macros to access members of the above structure using their offsets */
-#define read_sp_arg(args, offset)      ((args)->_regs[offset >> 3])
-#define write_sp_arg(args, offset, val) (((args)->_regs[offset >> 3])  \
-                                        = val)
-
-/*
- * Ensure that the assembler's view of the size of the tsp_args is the
- * same as the compilers
- */
-CASSERT(TSP_ARGS_SIZE == sizeof(tsp_args_t), assert_sp_args_size_mismatch);
-
-void tsp_get_magic(uint64_t args[4]);
-
-tsp_args_t *tsp_cpu_resume_main(uint64_t arg0,
-                               uint64_t arg1,
-                               uint64_t arg2,
-                               uint64_t arg3,
-                               uint64_t arg4,
-                               uint64_t arg5,
-                               uint64_t arg6,
-                               uint64_t arg7);
-tsp_args_t *tsp_cpu_suspend_main(uint64_t arg0,
-                                uint64_t arg1,
-                                uint64_t arg2,
-                                uint64_t arg3,
-                                uint64_t arg4,
-                                uint64_t arg5,
-                                uint64_t arg6,
-                                uint64_t arg7);
-tsp_args_t *tsp_cpu_on_main(void);
-tsp_args_t *tsp_cpu_off_main(uint64_t arg0,
-                            uint64_t arg1,
-                            uint64_t arg2,
-                            uint64_t arg3,
-                            uint64_t arg4,
-                            uint64_t arg5,
-                            uint64_t arg6,
-                            uint64_t arg7);
-
-/* Generic Timer functions */
-void tsp_generic_timer_start(void);
-void tsp_generic_timer_handler(void);
-void tsp_generic_timer_stop(void);
-void tsp_generic_timer_save(void);
-void tsp_generic_timer_restore(void);
-
-/* FIQ management functions */
-void tsp_update_sync_fiq_stats(uint32_t type, uint64_t elr_el3);
-
-/* Data structure to keep track of TSP statistics */
-extern spinlock_t console_lock;
-extern work_statistics_t tsp_stats[PLATFORM_CORE_COUNT];
-
-/* Vector table of jumps */
-extern tsp_vectors_t tsp_vector_table;
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __BL2_H__ */
+#endif /* __TSP_H__ */