diff options
| author | laurenw-arm <lauren.wehrmeister@arm.com> | 2023-06-27 14:41:38 -0500 |
|---|---|---|
| committer | laurenw-arm <lauren.wehrmeister@arm.com> | 2023-07-18 10:49:23 -0500 |
| commit | 1ca5c887ba22c829ae06ff82270804c147c44e0a (patch) | |
| tree | 0ee2526d039ff83051d35c98fa56a09dc4f75544 /lib/cpus/aarch64/neoverse_n1.S | |
| parent | 291bb2f4d019d206eb1483f324952987dac76da5 (diff) | |
refactor(cpus): reorder Neoverse-N1 .S file
Moving neoverse_n1_disable_speculative_loads function before reset
function to maintain git blame with refactor to new framework.
Change-Id: I79a4de9955a6f37e289456a743b946c0c4c8c27f
Signed-off-by: Lauren Wehrmeister <lauren.wehrmeister@arm.com>
Diffstat (limited to 'lib/cpus/aarch64/neoverse_n1.S')
| -rw-r--r-- | lib/cpus/aarch64/neoverse_n1.S | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/lib/cpus/aarch64/neoverse_n1.S b/lib/cpus/aarch64/neoverse_n1.S index 2cf94c758..b73df88b8 100644 --- a/lib/cpus/aarch64/neoverse_n1.S +++ b/lib/cpus/aarch64/neoverse_n1.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2022, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2023, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -62,26 +62,6 @@ func check_errata_1043202 endfunc check_errata_1043202 /* -------------------------------------------------- - * Disable speculative loads if Neoverse N1 supports - * SSBS. - * - * Shall clobber: x0. - * -------------------------------------------------- - */ -func neoverse_n1_disable_speculative_loads - /* Check if the PE implements SSBS */ - mrs x0, id_aa64pfr1_el1 - tst x0, #(ID_AA64PFR1_EL1_SSBS_MASK << ID_AA64PFR1_EL1_SSBS_SHIFT) - b.eq 1f - - /* Disable speculative loads */ - msr SSBS, xzr - -1: - ret -endfunc neoverse_n1_disable_speculative_loads - -/* -------------------------------------------------- * Errata Workaround for Neoverse N1 Errata #1073348 * This applies to revision r0p0 and r1p0 of Neoverse N1. * Inputs: @@ -501,6 +481,26 @@ func check_errata_cve_2022_23960 ret endfunc check_errata_cve_2022_23960 +/* -------------------------------------------------- + * Disable speculative loads if Neoverse N1 supports + * SSBS. + * + * Shall clobber: x0. + * -------------------------------------------------- + */ +func neoverse_n1_disable_speculative_loads + /* Check if the PE implements SSBS */ + mrs x0, id_aa64pfr1_el1 + tst x0, #(ID_AA64PFR1_EL1_SSBS_MASK << ID_AA64PFR1_EL1_SSBS_SHIFT) + b.eq 1f + + /* Disable speculative loads */ + msr SSBS, xzr + +1: + ret +endfunc neoverse_n1_disable_speculative_loads + func neoverse_n1_reset_func mov x19, x30 |