diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-03-17 12:34:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 12:34:37 +0000 |
| commit | 510a9de79fe14460ec591bba4aa8790665c3f86a (patch) | |
| tree | e35d84d8351a885bf3154665b14554454e58d452 /lib/psci/psci_off.c | |
| parent | 28ee754d15a885c290a42827b5626df05f0a8676 (diff) | |
| parent | b0408e87f7dfbdfe3e00cd3c1421b2939dd209ca (diff) | |
Merge pull request #860 from jeenu-arm/hw-asstd-coh
Patches for platforms with hardware-assisted coherency
Diffstat (limited to 'lib/psci/psci_off.c')
| -rw-r--r-- | lib/psci/psci_off.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/psci/psci_off.c b/lib/psci/psci_off.c index 394aaa3b..4ba78656 100644 --- a/lib/psci/psci_off.c +++ b/lib/psci/psci_off.c @@ -119,10 +119,9 @@ int psci_do_cpu_off(unsigned int end_pwrlvl) #endif /* - * Arch. management. Perform the necessary steps to flush all - * cpu caches. + * Arch. management. Initiate power down sequence. */ - psci_do_pwrdown_cache_maintenance(psci_find_max_off_lvl(&state_info)); + psci_do_pwrdown_sequence(psci_find_max_off_lvl(&state_info)); #if ENABLE_RUNTIME_INSTRUMENTATION PMF_CAPTURE_TIMESTAMP(rt_instr_svc, @@ -154,17 +153,17 @@ exit: */ if (rc == PSCI_E_SUCCESS) { /* - * Set the affinity info state to OFF. This writes directly to - * main memory as caches are disabled, so cache maintenance is + * Set the affinity info state to OFF. When caches are disabled, + * this writes directly to main memory, so cache maintenance is * required to ensure that later cached reads of aff_info_state - * return AFF_STATE_OFF. A dsbish() ensures ordering of the + * return AFF_STATE_OFF. A dsbish() ensures ordering of the * update to the affinity info state prior to cache line * invalidation. */ - flush_cpu_data(psci_svc_cpu_data.aff_info_state); + psci_flush_cpu_data(psci_svc_cpu_data.aff_info_state); psci_set_aff_info_state(AFF_STATE_OFF); - dsbish(); - inv_cpu_data(psci_svc_cpu_data.aff_info_state); + psci_dsbish(); + psci_inv_cpu_data(psci_svc_cpu_data.aff_info_state); #if ENABLE_RUNTIME_INSTRUMENTATION |