mirrors/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-08-18 21:11:11 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1171 from Leo-Yan/hikey960-change-use-recommend-state-id

Browse Source 
Hikey960: Change to use recommended power state id format
This commit is contained in:
davidcunado-arm 2017-12-06 22:20:05 +00:00 committed by GitHub
commit 64b978fb1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
plat/hisilicon/hikey960/hikey960_pm.c
View File

@ -26,6 +26,38 @@
#define SYSTEM_PWR_STATE(state) \ #define SYSTEM_PWR_STATE(state) \
((state)->pwr_domain_state[PLAT_MAX_PWR_LVL]) ((state)->pwr_domain_state[PLAT_MAX_PWR_LVL])
#define PSTATE_WIDTH 4
#define PSTATE_MASK ((1 << PSTATE_WIDTH) - 1)
#define MAKE_PWRSTATE(lvl2_state, lvl1_state, lvl0_state, pwr_lvl, type) \
(((lvl2_state) << (PSTATE_ID_SHIFT + PSTATE_WIDTH * 2)) | \
((lvl1_state) << (PSTATE_ID_SHIFT + PSTATE_WIDTH)) | \
((lvl0_state) << (PSTATE_ID_SHIFT)) | \
((pwr_lvl) << PSTATE_PWR_LVL_SHIFT) | \
((type) << PSTATE_TYPE_SHIFT))
/*
* The table storing the valid idle power states. Ensure that the
* array entries are populated in ascending order of state-id to
* enable us to use binary search during power state validation.
* The table must be terminated by a NULL entry.
*/
const unsigned int hikey960_pwr_idle_states[] = {
/* State-id - 0x001 */
MAKE_PWRSTATE(PLAT_MAX_RUN_STATE, PLAT_MAX_RUN_STATE,
PLAT_MAX_STB_STATE, MPIDR_AFFLVL0, PSTATE_TYPE_STANDBY),
/* State-id - 0x002 */
MAKE_PWRSTATE(PLAT_MAX_RUN_STATE, PLAT_MAX_RUN_STATE,
PLAT_MAX_RET_STATE, MPIDR_AFFLVL0, PSTATE_TYPE_STANDBY),
/* State-id - 0x003 */
MAKE_PWRSTATE(PLAT_MAX_RUN_STATE, PLAT_MAX_RUN_STATE,
PLAT_MAX_OFF_STATE, MPIDR_AFFLVL0, PSTATE_TYPE_POWERDOWN),
/* State-id - 0x033 */
MAKE_PWRSTATE(PLAT_MAX_RUN_STATE, PLAT_MAX_OFF_STATE,
PLAT_MAX_OFF_STATE, MPIDR_AFFLVL1, PSTATE_TYPE_POWERDOWN),
0,
};
#define DMAC_GLB_REG_SEC 0x694 #define DMAC_GLB_REG_SEC 0x694
#define AXI_CONF_BASE 0x820 #define AXI_CONF_BASE 0x820
@ -36,16 +68,21 @@ static void hikey960_pwr_domain_standby(plat_local_state_t cpu_state)
unsigned long scr; unsigned long scr;
unsigned int val = 0; unsigned int val = 0;
assert(cpu_state == PLAT_MAX_RET_STATE); assert(cpu_state == PLAT_MAX_STB_STATE ||
cpu_state == PLAT_MAX_RET_STATE);
scr = read_scr_el3(); scr = read_scr_el3();
/* Enable Physical IRQ and FIQ to wake the CPU*/ /* Enable Physical IRQ and FIQ to wake the CPU*/
write_scr_el3(scr | SCR_IRQ_BIT | SCR_FIQ_BIT); write_scr_el3(scr | SCR_IRQ_BIT | SCR_FIQ_BIT);
set_retention_ticks(val); if (cpu_state == PLAT_MAX_RET_STATE)
set_retention_ticks(val);
wfi(); wfi();
clr_retention_ticks(val);
if (cpu_state == PLAT_MAX_RET_STATE)
clr_retention_ticks(val);
/* /*
* Restore SCR to the original value, synchronisazion of * Restore SCR to the original value, synchronisazion of
@ -124,38 +161,34 @@ static void __dead2 hikey960_system_reset(void)
int hikey960_validate_power_state(unsigned int power_state, int hikey960_validate_power_state(unsigned int power_state,
psci_power_state_t *req_state) psci_power_state_t *req_state)
{ {
int pstate = psci_get_pstate_type(power_state); unsigned int state_id;
int pwr_lvl = psci_get_pstate_pwrlvl(power_state);
int i; int i;
assert(req_state); assert(req_state);
if (pwr_lvl > PLAT_MAX_PWR_LVL) /*
return PSCI_E_INVALID_PARAMS; * Currently we are using a linear search for finding the matching
* entry in the idle power state array. This can be made a binary
/* Sanity check the requested state */ * search if the number of entries justify the additional complexity.
if (pstate == PSTATE_TYPE_STANDBY) { */
/* for (i = 0; !!hikey960_pwr_idle_states[i]; i++) {
* It's possible to enter standby only on power level 0 if (power_state == hikey960_pwr_idle_states[i])
* Ignore any other power level. break;
*/
if (pwr_lvl != MPIDR_AFFLVL0)
return PSCI_E_INVALID_PARAMS;
req_state->pwr_domain_state[MPIDR_AFFLVL0] =
PLAT_MAX_RET_STATE;
} else {
for (i = MPIDR_AFFLVL0; i <= pwr_lvl; i++)
req_state->pwr_domain_state[i] =
PLAT_MAX_OFF_STATE;
} }
/* /* Return error if entry not found in the idle state array */
* We expect the 'state id' to be zero. if (!hikey960_pwr_idle_states[i])
*/
if (psci_get_pstate_id(power_state))
return PSCI_E_INVALID_PARAMS; return PSCI_E_INVALID_PARAMS;
i = 0;
state_id = psci_get_pstate_id(power_state);
/* Parse the State ID and populate the state info parameter */
while (state_id) {
req_state->pwr_domain_state[i++] = state_id & PSTATE_MASK;
state_id >>= PSTATE_WIDTH;
}
return PSCI_E_SUCCESS; return PSCI_E_SUCCESS;
} }

6
plat/hisilicon/hikey960/include/platform_def.h
View File

@ -31,8 +31,10 @@
#define PLAT_NUM_PWR_DOMAINS (PLATFORM_CORE_COUNT + \ #define PLAT_NUM_PWR_DOMAINS (PLATFORM_CORE_COUNT + \
PLATFORM_CLUSTER_COUNT + 1) PLATFORM_CLUSTER_COUNT + 1)
#define PLAT_MAX_RET_STATE 1 #define PLAT_MAX_RUN_STATE 0
#define PLAT_MAX_OFF_STATE 2 #define PLAT_MAX_STB_STATE 1
#define PLAT_MAX_RET_STATE 2
#define PLAT_MAX_OFF_STATE 3
#define MAX_IO_DEVICES 3 #define MAX_IO_DEVICES 3
#define MAX_IO_HANDLES 4 #define MAX_IO_HANDLES 4