diff options
| -rw-r--r-- | include/bl31/services/psci.h | 13 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_entry.S | 1 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_private.h | 13 | ||||
| -rw-r--r-- | services/std_svc/std_svc_setup.c | 1 |
4 files changed, 13 insertions, 15 deletions
diff --git a/include/bl31/services/psci.h b/include/bl31/services/psci.h index e290793..351453f 100644 --- a/include/bl31/services/psci.h +++ b/include/bl31/services/psci.h @@ -191,6 +191,19 @@ extern void psci_register_spd_pm_hook(const spd_pm_ops *); extern int psci_get_suspend_stateid(unsigned long mpidr); extern int psci_get_suspend_afflvl(unsigned long mpidr); +extern uint64_t psci_smc_handler(uint32_t smc_fid, + uint64_t x1, + uint64_t x2, + uint64_t x3, + uint64_t x4, + void *cookie, + void *handle, + uint64_t flags); + +/* PSCI setup function */ +extern int32_t psci_setup(void); + + #endif /*__ASSEMBLY__*/ diff --git a/services/std_svc/psci/psci_entry.S b/services/std_svc/psci/psci_entry.S index 8a73e8b..51d9b57 100644 --- a/services/std_svc/psci/psci_entry.S +++ b/services/std_svc/psci/psci_entry.S @@ -30,7 +30,6 @@ #include <arch.h> #include <platform.h> -#include <psci.h> #include <runtime_svc.h> #include <asm_macros.S> #include <cm_macros.S> diff --git a/services/std_svc/psci/psci_private.h b/services/std_svc/psci/psci_private.h index 8cb3aab..72d4612 100644 --- a/services/std_svc/psci/psci_private.h +++ b/services/std_svc/psci/psci_private.h @@ -156,19 +156,6 @@ extern int psci_afflvl_suspend(unsigned long, int); extern unsigned int psci_afflvl_suspend_finish(unsigned long, int, int); -/* Private exported functions from psci_main.c */ -extern uint64_t psci_smc_handler(uint32_t smc_fid, - uint64_t x1, - uint64_t x2, - uint64_t x3, - uint64_t x4, - void *cookie, - void *handle, - uint64_t flags); - -/* PSCI setup function */ -extern int32_t psci_setup(void); - #endif /*__ASSEMBLY__*/ #endif /* __PSCI_PRIVATE_H__ */ diff --git a/services/std_svc/std_svc_setup.c b/services/std_svc/std_svc_setup.c index 7d5527a..40d7096 100644 --- a/services/std_svc/std_svc_setup.c +++ b/services/std_svc/std_svc_setup.c @@ -35,7 +35,6 @@ #include <std_svc.h> #include <psci.h> #include <debug.h> -#include "psci/psci_private.h" /* Standard Service UUID */ DEFINE_SVC_UUID(arm_svc_uid, |