diff options
Diffstat (limited to 'include/bl31/services/psci.h')
| -rw-r--r-- | include/bl31/services/psci.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/include/bl31/services/psci.h b/include/bl31/services/psci.h index 7513326f..3804bf2c 100644 --- a/include/bl31/services/psci.h +++ b/include/bl31/services/psci.h @@ -89,12 +89,12 @@ #define PSTATE_TYPE_STANDBY 0x0 #define PSTATE_TYPE_POWERDOWN 0x1 -#define psci_get_pstate_id(pstate) (pstate >> PSTATE_ID_SHIFT) & \ - PSTATE_ID_MASK -#define psci_get_pstate_type(pstate) (pstate >> PSTATE_TYPE_SHIFT) & \ - PSTATE_TYPE_MASK -#define psci_get_pstate_afflvl(pstate) (pstate >> PSTATE_AFF_LVL_SHIFT) & \ - PSTATE_AFF_LVL_MASK +#define psci_get_pstate_id(pstate) ((pstate >> PSTATE_ID_SHIFT) & \ + PSTATE_ID_MASK) +#define psci_get_pstate_type(pstate) ((pstate >> PSTATE_TYPE_SHIFT) & \ + PSTATE_TYPE_MASK) +#define psci_get_pstate_afflvl(pstate) ((pstate >> PSTATE_AFF_LVL_SHIFT) & \ + PSTATE_AFF_LVL_MASK) /******************************************************************************* * PSCI version @@ -161,20 +161,22 @@ typedef struct psci_cpu_data { * perform common low level pm functions ******************************************************************************/ typedef struct plat_pm_ops { - int (*affinst_standby)(unsigned int power_state); + void (*affinst_standby)(unsigned int power_state); int (*affinst_on)(unsigned long mpidr, unsigned long sec_entrypoint, unsigned int afflvl, unsigned int state); - int (*affinst_off)(unsigned int afflvl, unsigned int state); - int (*affinst_suspend)(unsigned long sec_entrypoint, + void (*affinst_off)(unsigned int afflvl, unsigned int state); + void (*affinst_suspend)(unsigned long sec_entrypoint, unsigned int afflvl, unsigned int state); - int (*affinst_on_finish)(unsigned int afflvl, unsigned int state); - int (*affinst_suspend_finish)(unsigned int afflvl, + void (*affinst_on_finish)(unsigned int afflvl, unsigned int state); + void (*affinst_suspend_finish)(unsigned int afflvl, unsigned int state); void (*system_off)(void) __dead2; void (*system_reset)(void) __dead2; + int (*validate_power_state)(unsigned int power_state); + int (*validate_ns_entrypoint)(unsigned long ns_entrypoint); } plat_pm_ops_t; /******************************************************************************* |