mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-18 10:34:19 +00:00
fix(cpus): workaround for Neoverse V2 erratum 2331132
Neoverse V2 erratum 2331132 is a Cat B erratum that applies to all revisions <= r0p2 and is still open. The workaround is to write the value 4'b1001 to the PF_MODE bits in the IMP_CPUECTLR2_EL1 register which will place the data prefetcher in the most conservative mode instead of disabling it. SDEN documentation: https://developer.arm.com/documentation/SDEN2332927/latest Signed-off-by: Bipin Ravi <bipin.ravi@arm.com> Change-Id: Ic6c76375df465a4ad2e20dd7add7037477d973c1
This commit is contained in:
parent
88b2d81345
commit
8852fb5b7d
5 changed files with 28 additions and 4 deletions
|
@ -523,6 +523,10 @@ For Neoverse V1, the following errata build flags are defined :
|
||||||
|
|
||||||
For Neoverse V2, the following errata build flags are defined :
|
For Neoverse V2, the following errata build flags are defined :
|
||||||
|
|
||||||
|
- ``ERRATA_V2_2331132``: This applies errata 2331132 workaround to Neoverse-V2
|
||||||
|
CPU. This needs to be enabled for revisions r0p0, r0p1 and r0p2. It is still
|
||||||
|
open.
|
||||||
|
|
||||||
- ``ERRATA_V2_2719103``: This applies errata 2719103 workaround to Neoverse-V2
|
- ``ERRATA_V2_2719103``: This applies errata 2719103 workaround to Neoverse-V2
|
||||||
CPU, this affects system configurations that do not use and ARM interconnect
|
CPU, this affects system configurations that do not use and ARM interconnect
|
||||||
IP. This needs to be enabled for revisions r0p0 and r0p1. It has been fixed
|
IP. This needs to be enabled for revisions r0p0 and r0p1. It has been fixed
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2021-2022, Arm Limited. All rights reserved.
|
* Copyright (c) 2021-2023, Arm Limited. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -23,4 +23,12 @@
|
||||||
#define NEOVERSE_V2_CPUPWRCTLR_EL1 S3_0_C15_C2_7
|
#define NEOVERSE_V2_CPUPWRCTLR_EL1 S3_0_C15_C2_7
|
||||||
#define NEOVERSE_V2_CPUPWRCTLR_EL1_CORE_PWRDN_BIT U(1)
|
#define NEOVERSE_V2_CPUPWRCTLR_EL1_CORE_PWRDN_BIT U(1)
|
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
* CPU Extended Control register 2 specific definitions.
|
||||||
|
******************************************************************************/
|
||||||
|
#define NEOVERSE_V2_CPUECTLR2_EL1 S3_0_C15_C1_5
|
||||||
|
#define NEOVERSE_V2_CPUECTLR2_EL1_PF_MODE_CNSRV ULL(9)
|
||||||
|
#define NEOVERSE_V2_CPUECTLR2_EL1_PF_MODE_LSB U(11)
|
||||||
|
#define NEOVERSE_V2_CPUECTLR2_EL1_PF_MODE_WIDTH U(4)
|
||||||
|
|
||||||
#endif /* NEOVERSE_V2_H */
|
#endif /* NEOVERSE_V2_H */
|
||||||
|
|
|
@ -22,6 +22,13 @@
|
||||||
#error "Neoverse V2 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
|
#error "Neoverse V2 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
workaround_reset_start neoverse_v2, ERRATUM(2331132), ERRATA_V2_2331132
|
||||||
|
sysreg_bitfield_insert NEOVERSE_V2_CPUECTLR2_EL1, NEOVERSE_V2_CPUECTLR2_EL1_PF_MODE_CNSRV, \
|
||||||
|
NEOVERSE_V2_CPUECTLR2_EL1_PF_MODE_LSB, NEOVERSE_V2_CPUECTLR2_EL1_PF_MODE_WIDTH
|
||||||
|
workaround_reset_end neoverse_v2, ERRATUM(2331132)
|
||||||
|
|
||||||
|
check_erratum_ls neoverse_v2, ERRATUM(2331132), CPU_REV(0, 2)
|
||||||
|
|
||||||
workaround_runtime_start neoverse_v2, ERRATUM(2801372), ERRATA_V2_2801372
|
workaround_runtime_start neoverse_v2, ERRATUM(2801372), ERRATA_V2_2801372
|
||||||
/* dsb before isb of power down sequence */
|
/* dsb before isb of power down sequence */
|
||||||
dsb sy
|
dsb sy
|
||||||
|
|
|
@ -786,6 +786,10 @@ CPU_FLAG_LIST += ERRATA_A510_2666669
|
||||||
# Cortex-A510 cpu and is fixed in r1p3.
|
# Cortex-A510 cpu and is fixed in r1p3.
|
||||||
CPU_FLAG_LIST += ERRATA_A510_2684597
|
CPU_FLAG_LIST += ERRATA_A510_2684597
|
||||||
|
|
||||||
|
# Flag to apply erratum 2331132 workaround during reset. This erratum applies
|
||||||
|
# to revisions r0p0, r0p1 and r0p2. It is still open.
|
||||||
|
CPU_FLAG_LIST += ERRATA_V2_2331132
|
||||||
|
|
||||||
# Flag to apply erratum 2719103 workaround for non-arm interconnect ip. This
|
# Flag to apply erratum 2719103 workaround for non-arm interconnect ip. This
|
||||||
# erratum applies to revisions r0p0, rop1. Fixed in r0p2.
|
# erratum applies to revisions r0p0, rop1. Fixed in r0p2.
|
||||||
CPU_FLAG_LIST += ERRATA_V2_2719103
|
CPU_FLAG_LIST += ERRATA_V2_2719103
|
||||||
|
|
|
@ -399,10 +399,11 @@ struct em_cpu_list cpu_list[] = {
|
||||||
{
|
{
|
||||||
.cpu_partnumber = NEOVERSE_V2_MIDR,
|
.cpu_partnumber = NEOVERSE_V2_MIDR,
|
||||||
.cpu_errata_list = {
|
.cpu_errata_list = {
|
||||||
[0] = {2719103, 0x00, 0x01, ERRATA_V2_2719103, \
|
[0] = {2331132, 0x00, 0x02, ERRATA_V2_2331132},
|
||||||
|
[1] = {2719103, 0x00, 0x01, ERRATA_V2_2719103, \
|
||||||
ERRATA_NON_ARM_INTERCONNECT},
|
ERRATA_NON_ARM_INTERCONNECT},
|
||||||
[1] = {2801372, 0x00, 0x01, ERRATA_V2_2801372},
|
[2] = {2801372, 0x00, 0x01, ERRATA_V2_2801372},
|
||||||
[2 ... ERRATA_LIST_END] = UNDEF_ERRATA,
|
[3 ... ERRATA_LIST_END] = UNDEF_ERRATA,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
#endif /* NEOVERSE_V2_H_INC */
|
#endif /* NEOVERSE_V2_H_INC */
|
||||||
|
|
Loading…
Add table
Reference in a new issue