diff options
| author | danh-arm <dan.handley@arm.com> | 2016-05-27 11:08:45 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-05-27 11:08:45 +0100 |
| commit | 2ff900f28df5f975e1c1746e59610df5ccabf7aa (patch) | |
| tree | c55b402e1ffa2779efe3f2613275245a79a89c73 /services/std_svc/psci | |
| parent | 8c94f82c678312fcdfc3eee8b819ca1c0da723fb (diff) | |
| parent | ac1cc8eb76c39bca445478c2dffa9cd18829cff4 (diff) | |
Merge pull request #633 from soby-mathew/sm/psci_wfi_hook
PSCI: Add pwr_domain_pwr_down_wfi() hook in plat_psci_ops
Diffstat (limited to 'services/std_svc/psci')
| -rw-r--r-- | services/std_svc/psci/psci_entry.S | 3 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_off.c | 15 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_suspend.c | 9 |
3 files changed, 18 insertions, 9 deletions
diff --git a/services/std_svc/psci/psci_entry.S b/services/std_svc/psci/psci_entry.S index 5f4f91c5..f8c0afa2 100644 --- a/services/std_svc/psci/psci_entry.S +++ b/services/std_svc/psci/psci_entry.S @@ -106,7 +106,6 @@ endfunc psci_entrypoint func psci_power_down_wfi dsb sy // ensure write buffer empty wfi -wfi_spill: - b wfi_spill + bl plat_panic_handler endfunc psci_power_down_wfi diff --git a/services/std_svc/psci/psci_off.c b/services/std_svc/psci/psci_off.c index cef66689..686666d5 100644 --- a/services/std_svc/psci/psci_off.c +++ b/services/std_svc/psci/psci_off.c @@ -138,11 +138,16 @@ exit: dsbish(); inv_cpu_data(psci_svc_cpu_data.aff_info_state); - /* - * Enter a wfi loop which will allow the power controller to - * physically power down this cpu. - */ - psci_power_down_wfi(); + if (psci_plat_pm_ops->pwr_domain_pwr_down_wfi) { + /* This function must not return */ + psci_plat_pm_ops->pwr_domain_pwr_down_wfi(&state_info); + } else { + /* + * Enter a wfi loop which will allow the power + * controller to physically power down this cpu. + */ + psci_power_down_wfi(); + } } return rc; diff --git a/services/std_svc/psci/psci_suspend.c b/services/std_svc/psci/psci_suspend.c index 367bb32a..8c6ab6b4 100644 --- a/services/std_svc/psci/psci_suspend.c +++ b/services/std_svc/psci/psci_suspend.c @@ -189,8 +189,13 @@ exit: if (skip_wfi) return; - if (is_power_down_state) - psci_power_down_wfi(); + if (is_power_down_state) { + /* The function calls below must not return */ + if (psci_plat_pm_ops->pwr_domain_pwr_down_wfi) + psci_plat_pm_ops->pwr_domain_pwr_down_wfi(state_info); + else + psci_power_down_wfi(); + } /* * We will reach here if only retention/standby states have been |