commit f36faa71578a14a8c9910aaa57e761f0256ccd52
author Lauren Wehrmeister <lauren.wehrmeister@arm.com> Tue Mar 12 19:17:49 2024 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Mar 12 19:17:49 2024 +0100
tree f28420f865a72d228aa3959d623fc21a914bd216
parent 8dad296d636ae031a4a144d0c477f641696742fb
parent 57ab6d897656f71d229268d80e41b26e62179400

Merge "fix(cpus): fix a defect in Cortex-A715 erratum 2561034" into integration

lib/cpus/aarch64/cortex_a715.S

diff --git a/lib/cpus/aarch64/cortex_a715.S b/lib/cpus/aarch64/cortex_a715.S
index 6974e5f..abd649c 100644
--- a/lib/cpus/aarch64/cortex_a715.S
+++ b/lib/cpus/aarch64/cortex_a715.S
@@ -85,9 +85,9 @@
 
 check_erratum_range cortex_a715, ERRATUM(2429384), CPU_REV(1, 0), CPU_REV(1, 0)
 
-workaround_runtime_start cortex_a715, ERRATUM(2561034), ERRATA_A715_2561034
+workaround_reset_start cortex_a715, ERRATUM(2561034), ERRATA_A715_2561034
 	sysreg_bit_set	CORTEX_A715_CPUACTLR2_EL1, BIT(26)
-workaround_runtime_end cortex_a715, ERRATUM(2561034), NO_ISB
+workaround_reset_end cortex_a715, ERRATUM(2561034)
 
 check_erratum_range cortex_a715, ERRATUM(2561034), CPU_REV(1, 0), CPU_REV(1, 0)