diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-04-19 01:18:48 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-04-27 18:35:02 +0900 |
| commit | 57d1e5faf21c160c2dd3f152f5195a13ba8c7c70 (patch) | |
| tree | 8182a07204157f4c04ff587641a2ba9df4bc9ade /services/spd/tlkd | |
| parent | 724fd958c3f4507b2282524665a878f0169de864 (diff) | |
Fix pointer type mismatch of handlers
Commit 4c0d03907652 ("Rework type usage in Trusted Firmware") changed
the type usage in struct declarations, but did not touch the definition
side. Fix the type mismatch.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'services/spd/tlkd')
| -rw-r--r-- | services/spd/tlkd/tlkd_main.c | 12 | ||||
| -rw-r--r-- | services/spd/tlkd/tlkd_pm.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c index 961fd1825..5090f063f 100644 --- a/services/spd/tlkd/tlkd_main.c +++ b/services/spd/tlkd/tlkd_main.c @@ -133,14 +133,14 @@ static int32_t tlkd_init(void) * will also return any information that the secure payload needs to do the * work assigned to it. ******************************************************************************/ -static uint64_t tlkd_smc_handler(uint32_t smc_fid, - uint64_t x1, - uint64_t x2, - uint64_t x3, - uint64_t x4, +static uintptr_t tlkd_smc_handler(uint32_t smc_fid, + u_register_t x1, + u_register_t x2, + u_register_t x3, + u_register_t x4, void *cookie, void *handle, - uint64_t flags) + u_register_t flags) { cpu_context_t *ns_cpu_context; gp_regs_t *gp_regs; diff --git a/services/spd/tlkd/tlkd_pm.c b/services/spd/tlkd/tlkd_pm.c index 8b4c45774..2cd2fbbe7 100644 --- a/services/spd/tlkd/tlkd_pm.c +++ b/services/spd/tlkd/tlkd_pm.c @@ -22,7 +22,7 @@ extern tlk_context_t tlk_ctx; * Return the type of payload TLKD is dealing with. Report the current * resident cpu (mpidr format) if it is a UP/UP migratable payload. ******************************************************************************/ -static int32_t cpu_migrate_info(uint64_t *resident_cpu) +static int32_t cpu_migrate_info(u_register_t *resident_cpu) { /* the payload runs only on CPU0 */ *resident_cpu = MPIDR_CPU0; @@ -35,7 +35,7 @@ static int32_t cpu_migrate_info(uint64_t *resident_cpu) * This cpu is being suspended. Inform TLK of the SYSTEM_SUSPEND event, so * that it can pass this information to its Trusted Apps. ******************************************************************************/ -static void cpu_suspend_handler(uint64_t suspend_level) +static void cpu_suspend_handler(u_register_t suspend_level) { gp_regs_t *gp_regs; int cpu = read_mpidr() & MPIDR_CPU_MASK; @@ -67,7 +67,7 @@ static void cpu_suspend_handler(uint64_t suspend_level) * This cpu is being resumed. Inform TLK of the SYSTEM_SUSPEND exit, so * that it can pass this information to its Trusted Apps. ******************************************************************************/ -static void cpu_resume_handler(uint64_t suspend_level) +static void cpu_resume_handler(u_register_t suspend_level) { gp_regs_t *gp_regs; int cpu = read_mpidr() & MPIDR_CPU_MASK; |