Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(cpus): workaround for Cortex X3 erratum 2743088" into integration

Browse source
This commit is contained in:
Bipin Ravi 2023-12-21 18:07:00 +01:00 • committed by TrustedFirmware Code Review
commit 9ac42bf263
4 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/design/cpu-specific-build-macros.rst
View file

@ -783,6 +783,10 @@ For Cortex-X3, the following errata build flags are defined :
Cortex-X3 CPU. This needs to be enabled only for revisions r0p0, r1p0 and Cortex-X3 CPU. This needs to be enabled only for revisions r0p0, r1p0 and
r1p1. It is fixed in r1p2. r1p1. It is fixed in r1p2.
- ``ERRATA_X3_2743088``: This applies errata 2743088 workaround to Cortex-X3
CPU. This needs to be enabled only for revisions r0p0, r1p0 and r1p1. It is
fixed in r1p2.
- ``ERRATA_X3_2779509``: This applies errata 2779509 workaround to Cortex-X3 - ``ERRATA_X3_2779509``: This applies errata 2779509 workaround to Cortex-X3
CPU. This needs to be enabled only for revisions r0p0, r1p0 and r1p1 of the CPU. This needs to be enabled only for revisions r0p0, r1p0 and r1p1 of the
CPU. It is fixed in r1p2. CPU. It is fixed in r1p2.

10
lib/cpus/aarch64/cortex_x3.S
View file

@ -57,6 +57,13 @@ workaround_reset_end cortex_x3, ERRATUM(2742421)
check_erratum_ls cortex_x3, ERRATUM(2742421), CPU_REV(1, 1) check_erratum_ls cortex_x3, ERRATUM(2742421), CPU_REV(1, 1)
workaround_runtime_start cortex_x3, ERRATUM(2743088), ERRATA_X3_2743088
/* dsb before isb of power down sequence */
dsb sy
workaround_runtime_end cortex_x3, ERRATUM(2743088), NO_ISB
check_erratum_ls cortex_x3, ERRATUM(2743088), CPU_REV(1, 1)
workaround_reset_start cortex_x3, ERRATUM(2779509), ERRATA_X3_2779509 workaround_reset_start cortex_x3, ERRATUM(2779509), ERRATA_X3_2779509
/* Set CPUACTLR3_EL1 bit 47 */ /* Set CPUACTLR3_EL1 bit 47 */
sysreg_bit_set CORTEX_X3_CPUACTLR3_EL1, CORTEX_X3_CPUACTLR3_EL1_BIT_47 sysreg_bit_set CORTEX_X3_CPUACTLR3_EL1, CORTEX_X3_CPUACTLR3_EL1_BIT_47
@ -82,12 +89,13 @@ cpu_reset_func_end cortex_x3
* ---------------------------------------------------- * ----------------------------------------------------
*/ */
func cortex_x3_core_pwr_dwn func cortex_x3_core_pwr_dwn
apply_erratum cortex_x3, ERRATUM(2313909), ERRATA_X3_2313909 apply_erratum cortex_x3, ERRATUM(2313909), ERRATA_X3_2313909
/* --------------------------------------------------- /* ---------------------------------------------------
* Enable CPU power down bit in power control register * Enable CPU power down bit in power control register
* --------------------------------------------------- * ---------------------------------------------------
*/ */
sysreg_bit_set CORTEX_X3_CPUPWRCTLR_EL1, CORTEX_X3_CPUPWRCTLR_EL1_CORE_PWRDN_BIT sysreg_bit_set CORTEX_X3_CPUPWRCTLR_EL1, CORTEX_X3_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
apply_erratum cortex_x3, ERRATUM(2743088), ERRATA_X3_2743088
isb isb
ret ret
endfunc cortex_x3_core_pwr_dwn endfunc cortex_x3_core_pwr_dwn

4
lib/cpus/cpu-ops.mk
View file

@ -786,6 +786,10 @@ CPU_FLAG_LIST += ERRATA_X3_2615812
# to revisions r0p0, r1p0 and r1p1 of the Cortex-X3 cpu, it is fixed in r1p2. # to revisions r0p0, r1p0 and r1p1 of the Cortex-X3 cpu, it is fixed in r1p2.
CPU_FLAG_LIST += ERRATA_X3_2742421 CPU_FLAG_LIST += ERRATA_X3_2742421
# Flag to apply erratum 2743088 workaround on powerdown. This erratum applies
# to revisions r0p0, r1p0 and r1p1 of the Cortex-X3 cpu, it is fixed in r1p2.
CPU_FLAG_LIST += ERRATA_X3_2743088
# Flag to apply erratum 2779509 workaround on reset. This erratum applies # Flag to apply erratum 2779509 workaround on reset. This erratum applies
# to revisions r0p0, r1p0, r1p1 of the Cortex-X3 cpu, it is fixed in r1p2. # to revisions r0p0, r1p0, r1p1 of the Cortex-X3 cpu, it is fixed in r1p2.
CPU_FLAG_LIST += ERRATA_X3_2779509 CPU_FLAG_LIST += ERRATA_X3_2779509

5
services/std_svc/errata_abi/errata_abi_main.c
View file

@ -449,8 +449,9 @@ struct em_cpu_list cpu_list[] = {
[1] = {2313909, 0x00, 0x10, ERRATA_X3_2313909}, [1] = {2313909, 0x00, 0x10, ERRATA_X3_2313909},
[2] = {2615812, 0x00, 0x11, ERRATA_X3_2615812}, [2] = {2615812, 0x00, 0x11, ERRATA_X3_2615812},
[3] = {2742421, 0x00, 0x11, ERRATA_X3_2742421}, [3] = {2742421, 0x00, 0x11, ERRATA_X3_2742421},
[4] = {2779509, 0x00, 0x11, ERRATA_X3_2779509}, [4] = {2743088, 0x00, 0x11, ERRATA_X3_2743088},
[5 ... ERRATA_LIST_END] = UNDEF_ERRATA, [5] = {2779509, 0x00, 0x11, ERRATA_X3_2779509},
[6 ... ERRATA_LIST_END] = UNDEF_ERRATA,
} }
}, },
#endif /* CORTEX_X3_H_INC */ #endif /* CORTEX_X3_H_INC */