From 3f9df2c6ad053172c5dab74cd12d82a5b2c93c34 Mon Sep 17 00:00:00 2001 From: Bipin Ravi Date: Wed, 20 Dec 2023 14:32:02 -0600 Subject: [PATCH 1/3] fix(cpus): workaround for Cortex-X3 erratum 2302506 Cortex-X3 erratum 2302506 is a cat B erratum that applies to revisions r0p0-r1p1 and is fixed in r1p2. The workaround is to set bit[0] of CPUACTLR2 which will force PLDW/PFRM ST to behave like PLD/PRFM LD and not cause invalidation to other PE caches. There might be a small performance degradation to this workaround for certain workloads that share data. SDEN can be found here: https://developer.arm.com/documentation/2055130/latest Change-Id: I048b830867915b88afa36582c6da05734a56d22a Signed-off-by: Bipin Ravi --- docs/design/cpu-specific-build-macros.rst | 6 +++++- lib/cpus/aarch64/cortex_x3.S | 8 +++++++- lib/cpus/cpu-ops.mk | 6 +++++- services/std_svc/errata_abi/errata_abi_main.c | 15 ++++++++------- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/docs/design/cpu-specific-build-macros.rst b/docs/design/cpu-specific-build-macros.rst index 905b0161f..3a75dbd39 100644 --- a/docs/design/cpu-specific-build-macros.rst +++ b/docs/design/cpu-specific-build-macros.rst @@ -771,6 +771,10 @@ For Cortex-X3, the following errata build flags are defined : CPU. This needs to be enabled only for revisions r0p0, r1p0, r1p1 and r1p2 of the CPU and is still open. +- ``ERRATA_X3_2302506``: This applies errata 2302506 workaround to the Cortex-X3 + CPU. This needs to be enabled only for revisions r0p0, r1p0 and r1p1, it is + fixed in r1p2. + - ``ERRATA_X3_2313909``: This applies errata 2313909 workaround to Cortex-X3 CPU. This needs to be enabled only for revisions r0p0 and r1p0 of the CPU, it is fixed in r1p1. @@ -946,7 +950,7 @@ GIC Errata Workarounds -------------- -*Copyright (c) 2014-2023, Arm Limited and Contributors. All rights reserved.* +*Copyright (c) 2014-2024, Arm Limited and Contributors. All rights reserved.* .. _CVE-2017-5715: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5715 .. _CVE-2018-3639: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-3639 diff --git a/lib/cpus/aarch64/cortex_x3.S b/lib/cpus/aarch64/cortex_x3.S index 7e9a7fcf6..bd19269cd 100644 --- a/lib/cpus/aarch64/cortex_x3.S +++ b/lib/cpus/aarch64/cortex_x3.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, Arm Limited. All rights reserved. + * Copyright (c) 2021-2024, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -33,6 +33,12 @@ workaround_reset_end cortex_x3, ERRATUM(2070301) check_erratum_ls cortex_x3, ERRATUM(2070301), CPU_REV(1, 2) +workaround_runtime_start cortex_x3, ERRATUM(2302506), ERRATA_X3_2302506 + sysreg_bit_set CORTEX_X3_CPUACTLR2_EL1, BIT(0) +workaround_runtime_end cortex_x3, ERRATUM(2302506), NO_ISB + +check_erratum_ls cortex_x3, ERRATUM(2302506), CPU_REV(1, 1) + workaround_runtime_start cortex_x3, ERRATUM(2313909), ERRATA_X3_2313909 sysreg_bit_set CORTEX_X3_CPUACTLR2_EL1, CORTEX_X3_CPUACTLR2_EL1_BIT_36 workaround_runtime_end cortex_x3, ERRATUM(2313909), NO_ISB diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index 0ad5e7819..c134c0397 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2023, Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2014-2024, Arm Limited and Contributors. All rights reserved. # Copyright (c) 2020-2022, NVIDIA Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause @@ -774,6 +774,10 @@ CPU_FLAG_LIST += ERRATA_X2_2778471 # still open. CPU_FLAG_LIST += ERRATA_X3_2070301 +# Flag to apply erratum 2302506 workaround during reset. This erratum applies +# to revisions r0p0, r1p0 and r1p1 of the Cortex-X3 cpu, it is fixed in r1p2. +CPU_FLAG_LIST += ERRATA_X3_2302506 + # Flag to apply erratum 2313909 workaround on powerdown. This erratum applies # to revisions r0p0 and r1p0 of the Cortex-X3 cpu, it is fixed in r1p1. CPU_FLAG_LIST += ERRATA_X3_2313909 diff --git a/services/std_svc/errata_abi/errata_abi_main.c b/services/std_svc/errata_abi/errata_abi_main.c index 537cb5cfc..8255d331e 100644 --- a/services/std_svc/errata_abi/errata_abi_main.c +++ b/services/std_svc/errata_abi/errata_abi_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -446,12 +446,13 @@ struct em_cpu_list cpu_list[] = { .cpu_partnumber = CORTEX_X3_MIDR, .cpu_errata_list = { [0] = {2070301, 0x00, 0x12, ERRATA_X3_2070301}, - [1] = {2313909, 0x00, 0x10, ERRATA_X3_2313909}, - [2] = {2615812, 0x00, 0x11, ERRATA_X3_2615812}, - [3] = {2742421, 0x00, 0x11, ERRATA_X3_2742421}, - [4] = {2743088, 0x00, 0x11, ERRATA_X3_2743088}, - [5] = {2779509, 0x00, 0x11, ERRATA_X3_2779509}, - [6 ... ERRATA_LIST_END] = UNDEF_ERRATA, + [1] = {2302506, 0x00, 0x11, ERRATA_X3_2302506}, + [2] = {2313909, 0x00, 0x10, ERRATA_X3_2313909}, + [3] = {2615812, 0x00, 0x11, ERRATA_X3_2615812}, + [4] = {2742421, 0x00, 0x11, ERRATA_X3_2742421}, + [5] = {2743088, 0x00, 0x11, ERRATA_X3_2743088}, + [6] = {2779509, 0x00, 0x11, ERRATA_X3_2779509}, + [7 ... ERRATA_LIST_END] = UNDEF_ERRATA, } }, #endif /* CORTEX_X3_H_INC */ From a65c5ba351178e6119299fa935a3576453cf900b Mon Sep 17 00:00:00 2001 From: Bipin Ravi Date: Wed, 20 Dec 2023 14:53:37 -0600 Subject: [PATCH 2/3] fix(cpus): workaround for Cortex-X3 erratum 2266875 Cortex-X3 erratum 2266875 is a Cat B erratum that applies to all revisions <= r1p0 and is fixed in r1p1. The workaround is to set CPUACTLR_EL1[22]=1 which will cause the CFP instruction to invalidate all branch predictor resources regardless of context. SDEN Documentation: https://developer.arm.com/documentation/2055130/latest Change-Id: I9c610777e222f57f520d223bb03fc5ad05af1077 Signed-off-by: Bipin Ravi --- docs/design/cpu-specific-build-macros.rst | 4 ++++ include/lib/cpus/aarch64/cortex_x3.h | 7 ++++++- lib/cpus/aarch64/cortex_x3.S | 6 ++++++ lib/cpus/cpu-ops.mk | 4 ++++ services/std_svc/errata_abi/errata_abi_main.c | 15 ++++++++------- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/design/cpu-specific-build-macros.rst b/docs/design/cpu-specific-build-macros.rst index 3a75dbd39..287d32b6c 100644 --- a/docs/design/cpu-specific-build-macros.rst +++ b/docs/design/cpu-specific-build-macros.rst @@ -771,6 +771,10 @@ For Cortex-X3, the following errata build flags are defined : CPU. This needs to be enabled only for revisions r0p0, r1p0, r1p1 and r1p2 of the CPU and is still open. +- ``ERRATA_X3_2266875``: This applies errata 2266875 workaround to the Cortex-X3 + CPU. This needs to be enabled only for revisions r0p0 and r1p0 of the CPU, it + is fixed in r1p1. + - ``ERRATA_X3_2302506``: This applies errata 2302506 workaround to the Cortex-X3 CPU. This needs to be enabled only for revisions r0p0, r1p0 and r1p1, it is fixed in r1p2. diff --git a/include/lib/cpus/aarch64/cortex_x3.h b/include/lib/cpus/aarch64/cortex_x3.h index 4a3ac775e..542907877 100644 --- a/include/lib/cpus/aarch64/cortex_x3.h +++ b/include/lib/cpus/aarch64/cortex_x3.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, Arm Limited. All rights reserved. + * Copyright (c) 2021-2024, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -25,6 +25,11 @@ #define CORTEX_X3_CPUPWRCTLR_EL1_WFI_RET_CTRL_BITS_SHIFT U(4) #define CORTEX_X3_CPUPWRCTLR_EL1_WFE_RET_CTRL_BITS_SHIFT U(7) +/******************************************************************************* + * CPU Auxiliary Control register specific definitions. + ******************************************************************************/ +#define CORTEX_X3_CPUACTLR_EL1 S3_0_C15_C1_0 + /******************************************************************************* * CPU Auxiliary Control register 2 specific definitions. ******************************************************************************/ diff --git a/lib/cpus/aarch64/cortex_x3.S b/lib/cpus/aarch64/cortex_x3.S index bd19269cd..ea8926796 100644 --- a/lib/cpus/aarch64/cortex_x3.S +++ b/lib/cpus/aarch64/cortex_x3.S @@ -33,6 +33,12 @@ workaround_reset_end cortex_x3, ERRATUM(2070301) check_erratum_ls cortex_x3, ERRATUM(2070301), CPU_REV(1, 2) +workaround_reset_start cortex_x3, ERRATUM(2266875), ERRATA_X3_2266875 + sysreg_bit_set CORTEX_X3_CPUACTLR_EL1, BIT(22) +workaround_reset_end cortex_x3, ERRATUM(2266875) + +check_erratum_ls cortex_x3, ERRATUM(2266875), CPU_REV(1, 0) + workaround_runtime_start cortex_x3, ERRATUM(2302506), ERRATA_X3_2302506 sysreg_bit_set CORTEX_X3_CPUACTLR2_EL1, BIT(0) workaround_runtime_end cortex_x3, ERRATUM(2302506), NO_ISB diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index c134c0397..f83fe1931 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -774,6 +774,10 @@ CPU_FLAG_LIST += ERRATA_X2_2778471 # still open. CPU_FLAG_LIST += ERRATA_X3_2070301 +# Flag to apply erratum 2266875 workaround during reset. This erratum applies +# to revisions r0p0 and r1p0 of the Cortex-X3 cpu, it is fixed in r1p1. +CPU_FLAG_LIST += ERRATA_X3_2266875 + # Flag to apply erratum 2302506 workaround during reset. This erratum applies # to revisions r0p0, r1p0 and r1p1 of the Cortex-X3 cpu, it is fixed in r1p2. CPU_FLAG_LIST += ERRATA_X3_2302506 diff --git a/services/std_svc/errata_abi/errata_abi_main.c b/services/std_svc/errata_abi/errata_abi_main.c index 8255d331e..18c0c88b1 100644 --- a/services/std_svc/errata_abi/errata_abi_main.c +++ b/services/std_svc/errata_abi/errata_abi_main.c @@ -446,13 +446,14 @@ struct em_cpu_list cpu_list[] = { .cpu_partnumber = CORTEX_X3_MIDR, .cpu_errata_list = { [0] = {2070301, 0x00, 0x12, ERRATA_X3_2070301}, - [1] = {2302506, 0x00, 0x11, ERRATA_X3_2302506}, - [2] = {2313909, 0x00, 0x10, ERRATA_X3_2313909}, - [3] = {2615812, 0x00, 0x11, ERRATA_X3_2615812}, - [4] = {2742421, 0x00, 0x11, ERRATA_X3_2742421}, - [5] = {2743088, 0x00, 0x11, ERRATA_X3_2743088}, - [6] = {2779509, 0x00, 0x11, ERRATA_X3_2779509}, - [7 ... ERRATA_LIST_END] = UNDEF_ERRATA, + [1] = {2266875, 0x00, 0x10, ERRATA_X3_2266875}, + [2] = {2302506, 0x00, 0x11, ERRATA_X3_2302506}, + [3] = {2313909, 0x00, 0x10, ERRATA_X3_2313909}, + [4] = {2615812, 0x00, 0x11, ERRATA_X3_2615812}, + [5] = {2742421, 0x00, 0x11, ERRATA_X3_2742421}, + [6] = {2743088, 0x00, 0x11, ERRATA_X3_2743088}, + [7] = {2779509, 0x00, 0x11, ERRATA_X3_2779509}, + [8 ... ERRATA_LIST_END] = UNDEF_ERRATA, } }, #endif /* CORTEX_X3_H_INC */ From 68cac6a0f273dbe4f44563b467c996fafef07016 Mon Sep 17 00:00:00 2001 From: Bipin Ravi Date: Wed, 20 Dec 2023 15:40:44 -0600 Subject: [PATCH 3/3] fix(cpus): workaround for Cortex-A78C erratum 2683027 Cortex-A78C erratum 2683027 is a cat B erratum that applies to revisions r0p1 - r0p2 and is still open. The workaround is to execute a specific code sequence in EL3 during reset. SDEN can be found here: https://developer.arm.com/documentation/SDEN-2004089/latest Change-Id: I2bf9e675f48b62b4cd203100f7df40f4846aafa8 Signed-off-by: Bipin Ravi --- docs/design/cpu-specific-build-macros.rst | 4 ++++ lib/cpus/aarch64/cortex_a78c.S | 15 ++++++++++++++- lib/cpus/cpu-ops.mk | 4 ++++ services/std_svc/errata_abi/errata_abi_main.c | 11 ++++++----- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/docs/design/cpu-specific-build-macros.rst b/docs/design/cpu-specific-build-macros.rst index 287d32b6c..3485dc910 100644 --- a/docs/design/cpu-specific-build-macros.rst +++ b/docs/design/cpu-specific-build-macros.rst @@ -384,6 +384,10 @@ For Cortex-A78C, the following errata build flags are defined : Cortex-A78C CPU. This needs to be enabled for revisions r0p1 and r0p2. This erratum is still open. +- ``ERRATA_A78C_2683027`` : This applies errata 2683027 workaround to + Cortex-A78C CPU. This needs to be enabled for revisions r0p1 and r0p2. This + erratum is still open. + - ``ERRATA_A78C_2712575`` : This applies erratum 2712575 workaround to Cortex-A78C CPU, this erratum affects system configurations that do not use an ARM interconnect IP. This needs to be enabled for revisions r0p1 and r0p2 diff --git a/lib/cpus/aarch64/cortex_a78c.S b/lib/cpus/aarch64/cortex_a78c.S index 2e6e8b6a9..0dc34f7ac 100644 --- a/lib/cpus/aarch64/cortex_a78c.S +++ b/lib/cpus/aarch64/cortex_a78c.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, Arm Limited. All rights reserved. + * Copyright (c) 2021-2024, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -72,6 +72,19 @@ workaround_reset_end cortex_a78c, ERRATUM(2395411) check_erratum_range cortex_a78c, ERRATUM(2395411), CPU_REV(0, 1), CPU_REV(0, 2) +workaround_reset_start cortex_a78c, ERRATUM(2683027), ERRATA_A78C_2683027 + ldr x0, =0x3 + msr CORTEX_A78C_IMP_CPUPSELR_EL3, x0 + ldr x0, =0xEE010F10 + msr CORTEX_A78C_IMP_CPUPOR_EL3, x0 + ldr x0, =0xFF1F0FFE + msr CORTEX_A78C_IMP_CPUPMR_EL3, x0 + ldr x0, =0x100000004003FF + msr CORTEX_A78C_IMP_CPUPCR_EL3, x0 +workaround_reset_end cortex_a78c, ERRATUM(2683027) + +check_erratum_range cortex_a78c, ERRATUM(2683027), CPU_REV(0, 1), CPU_REV(0, 2) + workaround_reset_start cortex_a78c, ERRATUM(2743232), ERRATA_A78C_2743232 /* Set CPUACTLR5_EL1[56:55] to 2'b01 */ sysreg_bit_set CORTEX_A78C_ACTLR5_EL1, BIT(55) diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index f83fe1931..a99c08295 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -388,6 +388,10 @@ CPU_FLAG_LIST += ERRATA_A78C_2376749 # to revisions r0p1 and r0p2 of the A78C cpu. It is still open. CPU_FLAG_LIST += ERRATA_A78C_2395411 +# Flag to apply erratum 2683027 workaround during reset. This erratum applies +# to revisions r0p1 and r0p2 of the A78C cpu. It is still open. +CPU_FLAG_LIST += ERRATA_A78C_2683027 + # Flag to apply erratum 2712575 workaround for non-arm interconnect ip. This # erratum applies to revisions r0p1 and r0p2 of the A78C cpu. # It is still open. diff --git a/services/std_svc/errata_abi/errata_abi_main.c b/services/std_svc/errata_abi/errata_abi_main.c index 18c0c88b1..f1342ad13 100644 --- a/services/std_svc/errata_abi/errata_abi_main.c +++ b/services/std_svc/errata_abi/errata_abi_main.c @@ -237,12 +237,13 @@ struct em_cpu_list cpu_list[] = { [3] = {2242638, 0x01, 0x02, ERRATA_A78C_2242638}, [4] = {2376749, 0x01, 0x02, ERRATA_A78C_2376749}, [5] = {2395411, 0x01, 0x02, ERRATA_A78C_2395411}, - [6] = {2712575, 0x01, 0x02, ERRATA_A78C_2712575, \ + [6] = {2683027, 0x01, 0x02, ERRATA_A78C_2683027}, + [7] = {2712575, 0x01, 0x02, ERRATA_A78C_2712575, \ ERRATA_NON_ARM_INTERCONNECT}, - [7] = {2743232, 0x01, 0x02, ERRATA_A78C_2743232}, - [8] = {2772121, 0x00, 0x02, ERRATA_A78C_2772121}, - [9] = {2779484, 0x01, 0x02, ERRATA_A78C_2779484}, - [10 ... ERRATA_LIST_END] = UNDEF_ERRATA, + [8] = {2743232, 0x01, 0x02, ERRATA_A78C_2743232}, + [9] = {2772121, 0x00, 0x02, ERRATA_A78C_2772121}, + [10] = {2779484, 0x01, 0x02, ERRATA_A78C_2779484}, + [11 ... ERRATA_LIST_END] = UNDEF_ERRATA, } }, #endif /* CORTEX_A78C_H_INC */