Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-18 18:44:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(psci): don't use PSCI_INVALID_PWR_LVL to signal OFF state

Browse source 
The target_pwrlvl field in the psci cpu data struct only stores the
highest power domain that a CPU_SUSPEND call affected, and is used to
resume those same domains on warm reset. If the cpu is otherwise OFF
(never turned on or CPU_OFF), then this needs to be the highest power
level because we don't know the highest level that will be off.

So skip the invalidation and always keep the field to the maximum value.
During suspend the field will be lowered to the appropriate value and
then put back after wakeup.

Also, do that in the suspend to standby path as well as it will have
been written before the sleep and it might end up incorrect.

Change-Id: I614272ec387e1d83023c94700780a0f538a9a6b6
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
This commit is contained in:
Boyan Karatotev 2024-09-30 11:31:55 +01:00
parent 39fba640de
commit 0c836554b2
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/lib/psci/psci.h
View file

@ -302,7 +302,7 @@ typedef struct psci_cpu_data {
/* /*
* Highest power level which takes part in a power management * Highest power level which takes part in a power management
* operation. * operation. May be lower while the core is in suspend state.
*/ */
unsigned int target_pwrlvl; unsigned int target_pwrlvl;

6
lib/psci/psci_common.c
View file

@ -260,13 +260,9 @@ static unsigned int get_power_on_target_pwrlvl(void)
/* /*
* Assume that this cpu was suspended and retrieve its target power * Assume that this cpu was suspended and retrieve its target power
* level. If it is invalid then it could only have been turned off * level. If it wasn't, the cpu is off so this will be PLAT_MAX_PWR_LVL.
* earlier. PLAT_MAX_PWR_LVL will be the highest power level a
* cpu can be turned off to.
*/ */
pwrlvl = psci_get_suspend_pwrlvl(); pwrlvl = psci_get_suspend_pwrlvl();
if (pwrlvl == PSCI_INVALID_PWR_LVL)
pwrlvl = PLAT_MAX_PWR_LVL;
assert(pwrlvl < PSCI_INVALID_PWR_LVL); assert(pwrlvl < PSCI_INVALID_PWR_LVL);
return pwrlvl; return pwrlvl;
} }

6
lib/psci/psci_setup.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2020, Arm Limited and Contributors. All rights reserved. * Copyright (c) 2013-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -68,8 +68,8 @@ static void __init psci_init_pwr_domain_node(uint16_t node_idx,
/* Set the Affinity Info for the cores as OFF */ /* Set the Affinity Info for the cores as OFF */
svc_cpu_data->aff_info_state = AFF_STATE_OFF; svc_cpu_data->aff_info_state = AFF_STATE_OFF;
/* Invalidate the suspend level for the cpu */ /* Default to the highest power level when the cpu is not suspending */
svc_cpu_data->target_pwrlvl = PSCI_INVALID_PWR_LVL; svc_cpu_data->target_pwrlvl = PLAT_MAX_PWR_LVL;
/* Set the power state to OFF state */ /* Set the power state to OFF state */
svc_cpu_data->local_state = PLAT_MAX_OFF_STATE; svc_cpu_data->local_state = PLAT_MAX_OFF_STATE;

9
lib/psci/psci_suspend.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -54,6 +54,9 @@ static void psci_suspend_to_standby_finisher(unsigned int cpu_idx,
*/ */
psci_plat_pm_ops->pwr_domain_suspend_finish(&state_info); psci_plat_pm_ops->pwr_domain_suspend_finish(&state_info);
/* This loses its meaning when not suspending, reset so it's correct for OFF */
psci_set_suspend_pwrlvl(PLAT_MAX_PWR_LVL);
/* /*
* Set the requested and target state of this CPU and all the higher * Set the requested and target state of this CPU and all the higher
* power domain levels for this CPU to run. * power domain levels for this CPU to run.
@ -363,8 +366,8 @@ void psci_cpu_suspend_finish(unsigned int cpu_idx, const psci_power_state_t *sta
psci_spd_pm->svc_suspend_finish(max_off_lvl); psci_spd_pm->svc_suspend_finish(max_off_lvl);
} }
/* Invalidate the suspend level for the cpu */ /* This loses its meaning when not suspending, reset so it's correct for OFF */
psci_set_suspend_pwrlvl(PSCI_INVALID_PWR_LVL); psci_set_suspend_pwrlvl(PLAT_MAX_PWR_LVL);
PUBLISH_EVENT(psci_suspend_pwrdown_finish); PUBLISH_EVENT(psci_suspend_pwrdown_finish);
} }