diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-13 03:26:22 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-13 03:26:22 +0000 |
| commit | 44664cf33c2715fcc80276b79213828864f622d9 (patch) | |
| tree | 76d9e0cabe45c1ed6d9ea87a5deb9c75c4345653 /lib/psci/psci_main.c | |
| parent | fb75a334a971078f2f231280ca87837aef5a2000 (diff) | |
| parent | cabe6937f2c9d0a50e4631c0545bddd650233ae8 (diff) | |
| download | platform_external_arm-trusted-firmware-44664cf33c2715fcc80276b79213828864f622d9.tar.gz platform_external_arm-trusted-firmware-44664cf33c2715fcc80276b79213828864f622d9.tar.bz2 platform_external_arm-trusted-firmware-44664cf33c2715fcc80276b79213828864f622d9.zip | |
Snap for 6188853 from cabe6937f2c9d0a50e4631c0545bddd650233ae8 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: Ie0bba25a1fe48ab1e066818d48000e4f68a0cb11
Diffstat (limited to 'lib/psci/psci_main.c')
| -rw-r--r-- | lib/psci/psci_main.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/psci/psci_main.c b/lib/psci/psci_main.c index 5c0e952a9..52a8b8a18 100644 --- a/lib/psci/psci_main.c +++ b/lib/psci/psci_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -219,16 +219,19 @@ int psci_cpu_off(void) int psci_affinity_info(u_register_t target_affinity, unsigned int lowest_affinity_level) { - int target_idx; + int ret; + unsigned int target_idx; /* We dont support level higher than PSCI_CPU_PWR_LVL */ if (lowest_affinity_level > PSCI_CPU_PWR_LVL) return PSCI_E_INVALID_PARAMS; /* Calculate the cpu index of the target */ - target_idx = plat_core_pos_by_mpidr(target_affinity); - if (target_idx == -1) + ret = plat_core_pos_by_mpidr(target_affinity); + if (ret == -1) { return PSCI_E_INVALID_PARAMS; + } + target_idx = (unsigned int)ret; /* * Generic management: @@ -245,7 +248,7 @@ int psci_affinity_info(u_register_t target_affinity, * target CPUs shutdown was not seen by the current CPU's cluster. And * so the cache may contain stale data for the target CPU. */ - flush_cpu_data_by_index((unsigned int)target_idx, + flush_cpu_data_by_index(target_idx, psci_svc_cpu_data.aff_info_state); return psci_get_aff_info_state_by_idx(target_idx); |