diff --git a/docs/design/cpu-specific-build-macros.rst b/docs/design/cpu-specific-build-macros.rst index e6ca54225..5230cdcb5 100644 --- a/docs/design/cpu-specific-build-macros.rst +++ b/docs/design/cpu-specific-build-macros.rst @@ -840,6 +840,9 @@ For Cortex-X4, the following errata build flags are defined : - ``ERRATA_X4_2816013``: This applies errata 2816013 workaround to Cortex-X4 CPU. This needs to be enabled for revisions r0p0 and r0p1. It is fixed in r0p2. +- ``ERRATA_X4_2897503``: This applies errata 2897503 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 4b6af8beb..b16170c85 100644 --- a/include/lib/cpus/aarch64/cortex_x4.h +++ b/include/lib/cpus/aarch64/cortex_x4.h @@ -27,6 +27,7 @@ * CPU Auxiliary control register specific definitions ******************************************************************************/ #define CORTEX_X4_CPUACTLR3_EL1 S3_0_C15_C1_2 +#define CORTEX_X4_CPUACTLR4_EL1 S3_0_C15_C1_3 /******************************************************************************* * CPU Auxiliary control register 5 specific definitions diff --git a/lib/cpus/aarch64/cortex_x4.S b/lib/cpus/aarch64/cortex_x4.S index 1220d38b8..75b276677 100644 --- a/lib/cpus/aarch64/cortex_x4.S +++ b/lib/cpus/aarch64/cortex_x4.S @@ -69,6 +69,12 @@ workaround_reset_end cortex_x4, ERRATUM(2816013) check_erratum_ls cortex_x4, ERRATUM(2816013), CPU_REV(0, 1) +workaround_reset_start cortex_x4, ERRATUM(2897503), ERRATA_X4_2897503 + sysreg_bit_set CORTEX_X4_CPUACTLR4_EL1, BIT(8) +workaround_reset_end cortex_x4, ERRATUM(2897503) + +check_erratum_ls cortex_x4, ERRATUM(2897503), 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 c55597ae9..2cbbdd265 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -839,6 +839,10 @@ CPU_FLAG_LIST += ERRATA_X4_2763018 # to revisions r0p0 and r0p1 of the Cortex-X4 cpu. It is fixed in r0p2. CPU_FLAG_LIST += ERRATA_X4_2816013 +# Flag to apply erratum 2897503 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_2897503 + # 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