diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2015-07-01 16:16:20 +0100 |
|---|---|---|
| committer | Achin Gupta <achin.gupta@arm.com> | 2015-08-13 23:48:06 +0100 |
| commit | 38dce70f51fb83b27958ba3e2ad15f5635cb1061 (patch) | |
| tree | e1af6c60f1fb1d92c233f78bd1ce6f8f3d67a381 /include | |
| parent | 85a181ce3878187ba684f28b3c93cc098bc971fc (diff) | |
PSCI: Migrate ARM reference platforms to new platform API
This patch migrates ARM reference platforms, Juno and FVP, to the new platform
API mandated by the new PSCI power domain topology and composite power state
frameworks. The platform specific makefiles now exports the build flag
ENABLE_PLAT_COMPAT=0 to disable the platform compatibility layer.
Change-Id: I3040ed7cce446fc66facaee9c67cb54a8cd7ca29
Diffstat (limited to 'include')
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 37 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 9 |
2 files changed, 41 insertions, 5 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 4447af2c..377bfaa2 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -30,6 +30,7 @@ #ifndef __ARM_DEF_H__ #define __ARM_DEF_H__ +#include <arch.h> #include <common_def.h> #include <platform_def.h> #include <tbbr_img_def.h> @@ -47,6 +48,25 @@ #define ARM_CACHE_WRITEBACK_SHIFT 6 +/* + * Macros mapping the MPIDR Affinity levels to ARM Platform Power levels. The + * power levels have a 1:1 mapping with the MPIDR affinity levels. + */ +#define ARM_PWR_LVL0 MPIDR_AFFLVL0 +#define ARM_PWR_LVL1 MPIDR_AFFLVL1 + +/* + * Macros for local power states in ARM platforms encoded by State-ID field + * within the power-state parameter. + */ +/* Local power state for power domains in Run state. */ +#define ARM_LOCAL_STATE_RUN 0 +/* Local power state for retention. Valid only for CPU power domains */ +#define ARM_LOCAL_STATE_RET 1 +/* Local power state for OFF/power-down. Valid for CPU and cluster power + domains */ +#define ARM_LOCAL_STATE_OFF 2 + /* Memory location options for TSP */ #define ARM_TRUSTED_SRAM_ID 0 #define ARM_TRUSTED_DRAM_ID 1 @@ -163,9 +183,22 @@ #define ADDR_SPACE_SIZE (1ull << 32) -#define PLATFORM_NUM_AFFS (ARM_CLUSTER_COUNT + \ +#define PLAT_NUM_PWR_DOMAINS (ARM_CLUSTER_COUNT + \ PLATFORM_CORE_COUNT) -#define PLATFORM_MAX_AFFLVL MPIDR_AFFLVL1 +#define PLAT_MAX_PWR_LVL ARM_PWR_LVL1 + +/* + * This macro defines the deepest retention state possible. A higher state + * id will represent an invalid or a power down state. + */ +#define PLAT_MAX_RET_STATE ARM_LOCAL_STATE_RET + +/* + * This macro defines the deepest power down states possible. Any state ID + * higher than this is invalid. + */ +#define PLAT_MAX_OFF_STATE ARM_LOCAL_STATE_OFF + #define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER0_CORE_COUNT + \ PLAT_ARM_CLUSTER1_CORE_COUNT) diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index d7eaac1d..29f1c905 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -159,8 +159,11 @@ void arm_io_setup(void); void arm_tzc_setup(void); /* PM utility functions */ -int32_t arm_do_affinst_actions(unsigned int afflvl, unsigned int state); -int arm_validate_power_state(unsigned int power_state); +int arm_validate_power_state(unsigned int power_state, + psci_power_state_t *req_state); + +/* Topology utility function */ +int arm_check_mpidr(u_register_t mpidr); /* BL1 utility functions */ void arm_bl1_early_platform_setup(void); @@ -199,7 +202,7 @@ int plat_arm_get_alt_image_source( unsigned int image_id, uintptr_t *dev_handle, uintptr_t *image_spec); -void plat_arm_topology_setup(void); +unsigned int plat_arm_calc_core_pos(u_register_t mpidr); #endif /* __PLAT_ARM_H__ */ |