andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #986 from jagadeeshujja/jagujj/fix-get-power-state 

CSS:Fix scpi "get_power_state" when ARM_PLAT_MT is set
This commit is contained in:
davidcunado-arm 2017-06-16 09:17:28 +01:00 committed by GitHub
parent 5808ed8502 878a8bdfde
commit 3b6947ec55
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plat/arm/css/drivers/scp/css_pm_scpi.c
View File

@ -93,7 +93,16 @@ int css_scp_get_power_state(u_register_t mpidr, unsigned int power_level)
* The CPU state returned by SCP is an 8-bit bit mask
* corresponding to each CPU in the cluster
*/
#if ARM_PLAT_MT
/*
* The current SCPI driver only caters for single-threaded
* platforms. Hence we ignore the thread ID (which is always 0)
* for such platforms.
*/
element = (mpidr >> MPIDR_AFF1_SHIFT) & MPIDR_AFFLVL_MASK;
#else
element = mpidr & MPIDR_AFFLVL_MASK;
#endif /* ARM_PLAT_MT */
return CSS_CPU_PWR_STATE(cpu_state, element) ==
CSS_CPU_PWR_STATE_ON ? HW_ON : HW_OFF;
} else {

9
plat/arm/css/drivers/scpi/css_scpi.c
View File

@ -183,8 +183,17 @@ int scpi_get_css_power_state(unsigned int mpidr, unsigned int *cpu_state_p,
* Extract CPU and cluster membership of the given MPIDR. SCPI caters
* for only up to 0xf clusters, and 8 CPUs per cluster
*/
#if ARM_PLAT_MT
/*
* The current SCPI driver only caters for single-threaded platforms.
* Hence we ignore the thread ID (which is always 0) for such platforms.
*/
cpu = (mpidr >> MPIDR_AFF1_SHIFT) & MPIDR_AFFLVL_MASK;
cluster = (mpidr >> MPIDR_AFF2_SHIFT) & MPIDR_AFFLVL_MASK;
#else
cpu = mpidr & MPIDR_AFFLVL_MASK;
cluster = (mpidr >> MPIDR_AFF1_SHIFT) & MPIDR_AFFLVL_MASK;
#endif /* ARM_PLAT_MT */
if (cpu >= 8 || cluster >= 0xf)
return -1;