diff options
| author | Achin Gupta <achin.gupta@arm.com> | 2013-12-05 16:33:10 +0000 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-01-20 18:45:04 +0000 |
| commit | 75f7367b4c5419634004bfae9c1e47ca45937396 (patch) | |
| tree | af71b2527ec14db0996a0371f292df826b971c6f /common/psci/psci_private.h | |
| parent | a45e39738bcfb8ad49f581c92c747e159aa23892 (diff) | |
psci: fix affinity level upgrade issue
The psci implementation does not track target affinity level requests
specified during cpu_suspend calls correctly as per the following
example.
1. cpu0.cluster0 calls cpu_suspend with the target affinity level as 0
2. Only the cpu0.cluster0 is powered down while cluster0 remains
powered up
3. cpu1.cluster0 calls cpu_off to power itself down to highest
possible affinity level
4. cluster0 will be powered off even though cpu0.cluster0 does not
allow cluster shutdown
This patch introduces reference counts at affinity levels > 0 to track
the number of cpus which want an affinity instance at level X to
remain powered up. This instance can be turned off only if its
reference count is 0. Cpus still undergo the normal state transitions
(ON, OFF, ON_PENDING, SUSPEND) but the higher levels can only be
either ON or OFF depending upon their reference count.
The above issue is thus fixed as follows:
1. cluster0's reference count is incremented by two when cpu0 and cpu1
are initially powered on.
2. cpu0.cluster0 calls cpu_suspend with the target affinity level as
0. This does not affect the cluster0 reference count.
3. Only the cpu0.cluster0 is powered down while cluster0 remains
powered up as it has a non-zero reference count.
4. cpu1.cluster0 call cpu_off to power itself down to highest possible
affinity level. This decrements the cluster0 reference count.
5. cluster0 is still not powered off since its reference count will at
least be 1 due to the restriction placed by cpu0.
Change-Id: I433dfe82b946f5f6985b1602c2de87800504f7a9
Diffstat (limited to 'common/psci/psci_private.h')
| -rw-r--r-- | common/psci/psci_private.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/common/psci/psci_private.h b/common/psci/psci_private.h index 1cc71049..9b5c552e 100644 --- a/common/psci/psci_private.h +++ b/common/psci/psci_private.h @@ -57,8 +57,9 @@ typedef struct { ******************************************************************************/ typedef struct { unsigned long mpidr; + unsigned short ref_count; unsigned char state; - char level; + unsigned char level; unsigned int data; bakery_lock lock; } aff_map_node; @@ -100,12 +101,11 @@ extern afflvl_power_on_finisher psci_afflvl_sus_finish_handlers[]; ******************************************************************************/ /* Private exported functions from psci_common.c */ extern int get_max_afflvl(void); -extern unsigned int psci_get_phys_state(unsigned int); -extern unsigned int psci_get_aff_phys_state(aff_map_node *); -extern unsigned int psci_calculate_affinity_state(aff_map_node *); +extern unsigned short psci_get_state(aff_map_node *node); +extern unsigned short psci_get_phys_state(aff_map_node *node); +extern void psci_set_state(aff_map_node *node, unsigned short state); extern void psci_get_ns_entry_info(unsigned int index); extern unsigned long mpidr_set_aff_inst(unsigned long,unsigned char, int); -extern int psci_change_state(mpidr_aff_map_nodes, int, int, unsigned int); extern int psci_validate_mpidr(unsigned long, int); extern int get_power_on_target_afflvl(unsigned long mpidr); extern void psci_afflvl_power_on_finish(unsigned long, @@ -115,9 +115,6 @@ extern void psci_afflvl_power_on_finish(unsigned long, extern int psci_set_ns_entry_info(unsigned int index, unsigned long entrypoint, unsigned long context_id); -extern int psci_get_first_present_afflvl(unsigned long, - int, int, - aff_map_node **); extern int psci_check_afflvl_range(int start_afflvl, int end_afflvl); extern void psci_acquire_afflvl_locks(unsigned long mpidr, int start_afflvl, |