diff --git a/docs/design/cpu-specific-build-macros.rst b/docs/design/cpu-specific-build-macros.rst index a8e8d61ab..6147c1f09 100644 --- a/docs/design/cpu-specific-build-macros.rst +++ b/docs/design/cpu-specific-build-macros.rst @@ -830,6 +830,9 @@ For Cortex-X4, the following errata build flags are defined : CPU. This needs to be enabled for revisions r0p0 and r0p1. It is fixed in r0p2. +- ``ERRATA_X4_2763018``: This applies errata 2763018 workaround to Cortex-X4 + CPU. This needs to be enabled for revisions r0p0 and r0p1. It is fixed in r0p2. + For Cortex-A510, the following errata build flags are defined : - ``ERRATA_A510_1922240``: This applies errata 1922240 workaround to diff --git a/include/lib/cpus/aarch64/cortex_x4.h b/include/lib/cpus/aarch64/cortex_x4.h index 17d07c8b1..433687bd2 100644 --- a/include/lib/cpus/aarch64/cortex_x4.h +++ b/include/lib/cpus/aarch64/cortex_x4.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, Arm Limited. All rights reserved. + * Copyright (c) 2022-2024, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -23,4 +23,9 @@ #define CORTEX_X4_CPUPWRCTLR_EL1 S3_0_C15_C2_7 #define CORTEX_X4_CPUPWRCTLR_EL1_CORE_PWRDN_BIT U(1) +/******************************************************************************* + * CPU Auxiliary control register specific definitions + ******************************************************************************/ +#define CORTEX_X4_CPUACTLR3_EL1 S3_0_C15_C1_2 + #endif /* CORTEX_X4_H */ diff --git a/lib/cpus/aarch64/cortex_x4.S b/lib/cpus/aarch64/cortex_x4.S index 29c7a4a60..20f1ae18d 100644 --- a/lib/cpus/aarch64/cortex_x4.S +++ b/lib/cpus/aarch64/cortex_x4.S @@ -33,6 +33,12 @@ workaround_runtime_end cortex_x4, ERRATUM(2740089) check_erratum_ls cortex_x4, ERRATUM(2740089), CPU_REV(0, 1) +workaround_reset_start cortex_x4, ERRATUM(2763018), ERRATA_X4_2763018 + sysreg_bit_set CORTEX_X4_CPUACTLR3_EL1, BIT(47) +workaround_reset_end cortex_x4, ERRATUM(2763018) + +check_erratum_ls cortex_x4, ERRATUM(2763018), CPU_REV(0, 1) + workaround_reset_start cortex_x4, CVE(2022, 23960), WORKAROUND_CVE_2022_23960 #if IMAGE_BL31 /* diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index 5478e57b8..f736b5a6f 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -827,6 +827,10 @@ CPU_FLAG_LIST += ERRATA_X4_2701112 # applies to all revisions <= r0p1 of the Cortex-X4 cpu, it is fixed in r0p2. CPU_FLAG_LIST += ERRATA_X4_2740089 +# Flag to apply erratum 2763018 workaround on reset. This erratum applies +# to revisions r0p0 and r0p1 of the Cortex-X4 cpu. It is fixed in r0p2. +CPU_FLAG_LIST += ERRATA_X4_2763018 + # Flag to apply erratum 1922240 workaround during reset. This erratum applies # to revision r0p0 of the Cortex-A510 cpu and is fixed in r0p1. CPU_FLAG_LIST += ERRATA_A510_1922240