commit fc3bdab9852fc6603bdd3b89f99fe5b155db6b6d
author Lauren Wehrmeister <lauren.wehrmeister@arm.com> Thu Jan 26 21:18:22 2023 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Thu Jan 26 21:18:22 2023 +0100
tree 6230981ab2c5c0ff20cf90863357585b6f156845
parent d127d747643828b3845e9b84431c882727c6337d
parent 695a48b5b4366d1005f8b9a0fc83726914668fb5

Merge "fix(psci): tighten psci_power_down_wfi behaviour" into integration

lib/psci/aarch32/psci_helpers.S

diff --git a/lib/psci/aarch32/psci_helpers.S b/lib/psci/aarch32/psci_helpers.S
index 5cc192e..d28d469 100644
--- a/lib/psci/aarch32/psci_helpers.S
+++ b/lib/psci/aarch32/psci_helpers.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2023, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -143,6 +143,7 @@
  */
 func psci_power_down_wfi
 	dsb	sy		// ensure write buffer empty
+1:
 	wfi
-	no_ret	plat_panic_handler
+	b	1b
 endfunc psci_power_down_wfi

lib/psci/aarch64/psci_helpers.S

diff --git a/lib/psci/aarch64/psci_helpers.S b/lib/psci/aarch64/psci_helpers.S
index add968a..0bb1988 100644
--- a/lib/psci/aarch64/psci_helpers.S
+++ b/lib/psci/aarch64/psci_helpers.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2023, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -125,6 +125,7 @@
  */
 func psci_power_down_wfi
 	dsb	sy		// ensure write buffer empty
+1:
 	wfi
-	no_ret	plat_panic_handler
+	b	1b
 endfunc psci_power_down_wfi