diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2018-11-29 16:05:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 16:05:50 +0100 |
| commit | 37e8ab53236c9b547149a17947a391cb5b1071a9 (patch) | |
| tree | acc6ab548b34444d2f7dde73c4cfd3748a16785b /lib | |
| parent | 3af48da77120248aa7159eb929fabcced8390012 (diff) | |
| parent | 9edd89127928708b9f4dd36bd3c5d16b62d27cb5 (diff) | |
| download | platform_external_arm-trusted-firmware-37e8ab53236c9b547149a17947a391cb5b1071a9.tar.gz platform_external_arm-trusted-firmware-37e8ab53236c9b547149a17947a391cb5b1071a9.tar.bz2 platform_external_arm-trusted-firmware-37e8ab53236c9b547149a17947a391cb5b1071a9.zip | |
Merge pull request #1688 from JoelHutton/jh/variant_1_mitigations
Initial Spectre V1 mitigations (CVE-2017-5753).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/psci/psci_stat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/psci/psci_stat.c b/lib/psci/psci_stat.c index 421db4430..6f6a7d4f8 100644 --- a/lib/psci/psci_stat.c +++ b/lib/psci/psci_stat.c @@ -206,9 +206,9 @@ static int psci_get_stat(u_register_t target_cpu, unsigned int power_state, if (pwrlvl > PSCI_CPU_PWR_LVL) { /* Get the power domain index */ - parent_idx = psci_cpu_pd_nodes[target_idx].parent_node; + parent_idx = SPECULATION_SAFE_VALUE(psci_cpu_pd_nodes[target_idx].parent_node); for (lvl = PSCI_CPU_PWR_LVL + 1U; lvl < pwrlvl; lvl++) - parent_idx = psci_non_cpu_pd_nodes[parent_idx].parent_node; + parent_idx = SPECULATION_SAFE_VALUE(psci_non_cpu_pd_nodes[parent_idx].parent_node); /* Get the non cpu power domain stats */ *psci_stat = psci_non_cpu_stat[parent_idx][stat_idx]; |