diff options
author | Roberto Vargas <roberto.vargas@arm.com> | 2018-09-24 17:14:46 +0100 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:31:52 +0100 |
commit | 871de5373dfc590ea8d3384094f6d5de570b9524 (patch) | |
tree | 8ca2c51cae7926b09fedd072c4bfa3717725bfc4 /include/lib/psci | |
parent | dadb16eac2692f9d43fcdc547650288d6aa9c9fa (diff) |
PSCI: Remove platform compatibility layer
Change-Id: I40d040aa05bcbf11536a96ce59827711456b93a8
Co-authored-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include/lib/psci')
-rw-r--r-- | include/lib/psci/psci.h | 3 | ||||
-rw-r--r-- | include/lib/psci/psci_compat.h | 93 |
2 files changed, 0 insertions, 96 deletions
diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index fa0da9fe..d08b38c5 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -10,9 +10,6 @@ #include <bakery_lock.h> #include <bl_common.h> #include <platform_def.h> /* for PLAT_NUM_PWR_DOMAINS */ -#if ENABLE_PLAT_COMPAT -#include <psci_compat.h> -#endif #include <psci_lib.h> /* To maintain compatibility for SPDs */ #include <utils_def.h> diff --git a/include/lib/psci/psci_compat.h b/include/lib/psci/psci_compat.h deleted file mode 100644 index 11ed16d0..00000000 --- a/include/lib/psci/psci_compat.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef PSCI_COMPAT_H -#define PSCI_COMPAT_H - -#include <arch.h> -#include <platform_def.h> -#include <utils_def.h> - -#ifndef __ASSEMBLY__ -/* - * The below declarations are to enable compatibility for the platform ports - * using the old platform interface and psci helpers. - */ -#define PLAT_MAX_PWR_LVL PLATFORM_MAX_AFFLVL -#define PLAT_NUM_PWR_DOMAINS PLATFORM_NUM_AFFS - -/******************************************************************************* - * PSCI affinity related constants. An affinity instance could - * be present or absent physically to cater for asymmetric topologies. - ******************************************************************************/ -#define PSCI_AFF_ABSENT 0x0 -#define PSCI_AFF_PRESENT 0x1 - -#define PSCI_STATE_ON U(0x0) -#define PSCI_STATE_OFF U(0x1) -#define PSCI_STATE_ON_PENDING U(0x2) -#define PSCI_STATE_SUSPEND U(0x3) - -/* - * Using the compatibility platform interfaces means that the local states - * used in psci_power_state_t need to only convey whether its power down - * or standby state. The onus is on the platform port to do the right thing - * including the state coordination in case multiple power down states are - * involved. Hence if we assume 3 generic states viz, run, standby and - * power down, we can assign 1 and 2 to standby and power down respectively. - */ -#define PLAT_MAX_RET_STATE U(1) -#define PLAT_MAX_OFF_STATE U(2) - -/* - * Macro to represent invalid affinity level within PSCI. - */ -#define PSCI_INVALID_DATA -1 - -#define psci_get_pstate_afflvl(pstate) psci_get_pstate_pwrlvl(pstate) - -/* - * This array stores the 'power_state' requests of each CPU during - * CPU_SUSPEND and SYSTEM_SUSPEND which will be populated by the - * compatibility layer when appropriate platform hooks are invoked. - */ -extern unsigned int psci_power_state_compat[PLATFORM_CORE_COUNT]; - -/******************************************************************************* - * Structure populated by platform specific code to export routines which - * perform common low level pm functions - ******************************************************************************/ -typedef struct plat_pm_ops { - void (*affinst_standby)(unsigned int power_state); - int (*affinst_on)(unsigned long mpidr, - unsigned long sec_entrypoint, - unsigned int afflvl, - unsigned int state); - void (*affinst_off)(unsigned int afflvl, unsigned int state); - void (*affinst_suspend)(unsigned long sec_entrypoint, - unsigned int afflvl, - unsigned int state); - 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); - unsigned int (*get_sys_suspend_power_state)(void); -} plat_pm_ops_t; - -/******************************************************************************* - * Function & Data prototypes to enable compatibility for older platform ports - ******************************************************************************/ -int psci_get_suspend_stateid_by_mpidr(unsigned long); -int psci_get_suspend_stateid(void); -int psci_get_suspend_powerstate(void); -unsigned int psci_get_max_phys_off_afflvl(void); -int psci_get_suspend_afflvl(void); - -#endif /* ____ASSEMBLY__ */ -#endif /* PSCI_COMPAT_H */ |