diff --git a/docs/design/cpu-specific-build-macros.rst b/docs/design/cpu-specific-build-macros.rst index 0e5c7a05d..208d7cf2d 100644 --- a/docs/design/cpu-specific-build-macros.rst +++ b/docs/design/cpu-specific-build-macros.rst @@ -580,6 +580,9 @@ For Neoverse V2, the following errata build flags are defined : For Neoverse V3, the following errata build flags are defined : +- ``ERRATA_V3_2970647``: This applies errata 2970647 workaround to Neoverse-V3 + CPU. This needs to be enabled for revision r0p0. It is fixed in r0p1. + - ``ERRATA_V3_3701767``: This applies errata 3701767 workaround to Neoverse-V3 CPU. This needs to be enabled for revisions r0p0, r0p1, r0p2 of the CPU and is still open. diff --git a/lib/cpus/aarch64/neoverse_v3.S b/lib/cpus/aarch64/neoverse_v3.S index 7fe2d7fa2..dad37099c 100644 --- a/lib/cpus/aarch64/neoverse_v3.S +++ b/lib/cpus/aarch64/neoverse_v3.S @@ -28,6 +28,21 @@ add_erratum_entry neoverse_v3, ERRATUM(3701767), ERRATA_V3_3701767, NO_APPLY_AT_ check_erratum_ls neoverse_v3, ERRATUM(3701767), CPU_REV(0, 2) +workaround_reset_start neoverse_v3, ERRATUM(2970647), ERRATA_V3_2970647 + /* Add ISB before MRS reads of MPIDR_EL1/MIDR_EL1 */ + ldr x0, =0x1 + msr S3_6_c15_c8_0, x0 /* msr CPUPSELR_EL3, X0 */ + ldr x0, =0xd5380000 + msr S3_6_c15_c8_2, x0 /* msr CPUPOR_EL3, X0 */ + ldr x0, =0xFFFFFF40 + msr S3_6_c15_c8_3,x0 /* msr CPUPMR_EL3, X0 */ + ldr x0, =0x000080010033f + msr S3_6_c15_c8_1, x0 /* msr CPUPCR_EL3, X0 */ + isb +workaround_reset_end neoverse_v3, ERRATUM(2970647) + +check_erratum_ls neoverse_v3, ERRATUM(2970647), CPU_REV(0, 0) + #if WORKAROUND_CVE_2022_23960 wa_cve_2022_23960_bhb_vector_table NEOVERSE_V3_BHB_LOOP_COUNT, neoverse_v3 #endif /* WORKAROUND_CVE_2022_23960 */ diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index 38abbc7ea..3ee507496 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -564,6 +564,10 @@ CPU_FLAG_LIST += ERRATA_V1_2743233 # still open. CPU_FLAG_LIST += ERRATA_V1_2779461 +# Flag to apply erratum 2970647 workaround during reset. This erratum applies +# to revisions r0p0 of the Neoverse V3 cpu and is fixed in r0p1. +CPU_FLAG_LIST += ERRATA_V3_2970647 + # Flag to apply erratum 3701767 workaround during context save/restore of # ICH_VMCR_EL2 reg. This erratum applies to revisions r0p0, r0p1 and r0p2 of # the Neoverse V3 cpu and is still open.