mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-17 18:14:24 +00:00
refactor(cpus): convert the Cortex-A78C to use the errata framework
Testing:
- Manual comparison of disassembly with and without conversion.
- Using the test script in gerrit - 19136
- Building with errata and stepping through from ArmDS and running tftf.
Change-Id: Ib361cdfa43fc1c88d97e346d41b1cbf211c045d9
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
This commit is contained in:
Govindraj Raja
parent
1c857218b2
commit
3c8de370a0
1 changed files with 36 additions and 276 deletions
|
|
@ -21,75 +21,25 @@
|
|||
wa_cve_2022_23960_bhb_vector_table CORTEX_A78C_BHB_LOOP_COUNT, cortex_a78c
|
||||
#endif /* WORKAROUND_CVE_2022_23960 */
|
||||
|
||||
/* --------------------------------------------------
|
||||
* Errata Workaround for A78C Erratum 1827430.
|
||||
* This applies to revision r0p0 of the Cortex A78C
|
||||
* processor and is fixed in r0p1.
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x17
|
||||
* --------------------------------------------------
|
||||
*/
|
||||
func errata_a78c_1827430_wa
|
||||
mov x17, x30
|
||||
bl check_errata_1827430
|
||||
cbz x0, 1f
|
||||
|
||||
workaround_reset_start cortex_a78c, ERRATUM(1827430), ERRATA_A78C_1827430
|
||||
/* Disable allocation of splintered pages in the L2 TLB */
|
||||
mrs x1, CORTEX_A78C_CPUECTLR_EL1
|
||||
orr x1, x1, CORTEX_A78C_CPUECTLR_EL1_MM_ASP_EN
|
||||
msr CORTEX_A78C_CPUECTLR_EL1, x1
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a78c_1827430_wa
|
||||
workaround_reset_end cortex_a78c, ERRATUM(1827430)
|
||||
|
||||
func check_errata_1827430
|
||||
/* Applies to revision r0p0 only */
|
||||
mov x1, #0x00
|
||||
b cpu_rev_var_ls
|
||||
endfunc check_errata_1827430
|
||||
|
||||
/* --------------------------------------------------
|
||||
* Errata Workaround for A78C Erratum 1827440.
|
||||
* This applies to revision r0p0 of the Cortex A78C
|
||||
* processor and is fixed in r0p1.
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x17
|
||||
* --------------------------------------------------
|
||||
*/
|
||||
func errata_a78c_1827440_wa
|
||||
mov x17, x30
|
||||
bl check_errata_1827440
|
||||
cbz x0, 1f
|
||||
check_erratum_ls cortex_a78c, ERRATUM(1827430), CPU_REV(0, 0)
|
||||
|
||||
workaround_reset_start cortex_a78c, ERRATUM(1827440), ERRATA_A78C_1827440
|
||||
/* Force Atomic Store to WB memory be done in L1 data cache */
|
||||
mrs x1, CORTEX_A78C_CPUACTLR2_EL1
|
||||
orr x1, x1, #BIT(2)
|
||||
msr CORTEX_A78C_CPUACTLR2_EL1, x1
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a78c_1827440_wa
|
||||
workaround_reset_end cortex_a78c, ERRATUM(1827440)
|
||||
|
||||
func check_errata_1827440
|
||||
/* Applies to revision r0p0 only */
|
||||
mov x1, #0x00
|
||||
b cpu_rev_var_ls
|
||||
endfunc check_errata_1827440
|
||||
|
||||
/* --------------------------------------------------
|
||||
* Errata Workaround for A78C Erratum 2132064.
|
||||
* This applies to revisions r0p1 and r0p2 of A78C
|
||||
* and is still open.
|
||||
* Inputs:
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x17
|
||||
* --------------------------------------------------
|
||||
*/
|
||||
func errata_a78c_2132064_wa
|
||||
/* Compare x0 against revisions r0p0 - r0p1 */
|
||||
mov x17, x30
|
||||
bl check_errata_2132064
|
||||
cbz x0, 1f
|
||||
check_erratum_ls cortex_a78c, ERRATUM(1827440), CPU_REV(0, 0)
|
||||
|
||||
workaround_reset_start cortex_a78c, ERRATUM(2132064), ERRATA_A78C_2132064
|
||||
/* --------------------------------------------------------
|
||||
* Place the data prefetcher in the most conservative mode
|
||||
* to reduce prefetches by writing the following bits to
|
||||
|
|
@ -100,32 +50,11 @@ func errata_a78c_2132064_wa
|
|||
orr x0, x0, #CORTEX_A78C_CPUECTLR_EL1_BIT_6
|
||||
orr x0, x0, #CORTEX_A78C_CPUECTLR_EL1_BIT_7
|
||||
msr CORTEX_A78C_CPUECTLR_EL1, x0
|
||||
isb
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a78c_2132064_wa
|
||||
workaround_reset_end cortex_a78c, ERRATUM(2132064)
|
||||
|
||||
func check_errata_2132064
|
||||
/* Applies to revisions r0p1 and r0p2. */
|
||||
mov x1, #CPU_REV(0, 1)
|
||||
mov x2, #CPU_REV(0, 2)
|
||||
b cpu_rev_var_range
|
||||
endfunc check_errata_2132064
|
||||
|
||||
/* ----------------------------------------------------------
|
||||
* Errata Workaround for A78C Erratum 2242638.
|
||||
* This applies to revisions r0p1 and r0p2 of the Cortex A78C
|
||||
* processor and is still open.
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x17
|
||||
* ----------------------------------------------------------
|
||||
*/
|
||||
func errata_a78c_2242638_wa
|
||||
/* Compare x0 against revisions r0p1 - r0p2 */
|
||||
mov x17, x30
|
||||
bl check_errata_2242638
|
||||
cbz x0, 1f
|
||||
check_erratum_range cortex_a78c, ERRATUM(2132064), CPU_REV(0, 1), CPU_REV(0, 2)
|
||||
|
||||
workaround_reset_start cortex_a78c, ERRATUM(2242638), ERRATA_A78C_2242638
|
||||
ldr x0, =0x5
|
||||
msr CORTEX_A78C_IMP_CPUPSELR_EL3, x0
|
||||
ldr x0, =0x10F600E000
|
||||
|
|
@ -134,198 +63,61 @@ func errata_a78c_2242638_wa
|
|||
msr CORTEX_A78C_IMP_CPUPMR_EL3, x0
|
||||
ldr x0, =0x80000000003FF
|
||||
msr CORTEX_A78C_IMP_CPUPCR_EL3, x0
|
||||
workaround_reset_end cortex_a78c, ERRATUM(2242638)
|
||||
|
||||
isb
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a78c_2242638_wa
|
||||
check_erratum_range cortex_a78c, ERRATUM(2242638), CPU_REV(0, 1), CPU_REV(0, 2)
|
||||
|
||||
func check_errata_2242638
|
||||
/* Applies to revisions r0p1-r0p2. */
|
||||
mov x1, #CPU_REV(0, 1)
|
||||
mov x2, #CPU_REV(0, 2)
|
||||
b cpu_rev_var_range
|
||||
endfunc check_errata_2242638
|
||||
|
||||
/* --------------------------------------------------
|
||||
* Errata Workaround for Cortex A78C Erratum 2376749.
|
||||
* This applies to revision r0p1 and r0p2 of the A78C
|
||||
* and is currently open. It is a Cat B erratum.
|
||||
* Inputs:
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x4, x17
|
||||
* --------------------------------------------------
|
||||
*/
|
||||
func errata_a78c_2376749_wa
|
||||
/* Check revision */
|
||||
mov x17, x30
|
||||
bl check_errata_2376749
|
||||
cbz x0, 1f
|
||||
workaround_reset_start cortex_a78c, ERRATUM(2376749), ERRATA_A78C_2376749
|
||||
/* Set CPUACTLR2_EL1[0] to 1. */
|
||||
mrs x1, CORTEX_A78C_CPUACTLR2_EL1
|
||||
orr x1, x1, #CORTEX_A78C_CPUACTLR2_EL1_BIT_0
|
||||
msr CORTEX_A78C_CPUACTLR2_EL1, x1
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a78c_2376749_wa
|
||||
workaround_reset_end cortex_a78c, ERRATUM(2376749)
|
||||
|
||||
func check_errata_2376749
|
||||
/* Applies to r0p1 and r0p2*/
|
||||
mov x1, #0x01
|
||||
mov x2, #0x02
|
||||
b cpu_rev_var_range
|
||||
endfunc check_errata_2376749
|
||||
|
||||
/* --------------------------------------------------
|
||||
* Errata Workaround for Cortex A78C Erratum 2395411.
|
||||
* This applies to revision r0p1 and r0p2 of the A78C
|
||||
* and is currently open. It is a Cat B erratum.
|
||||
* Inputs:
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x4, x17
|
||||
* --------------------------------------------------
|
||||
*/
|
||||
func errata_a78c_2395411_wa
|
||||
/* Check revision. */
|
||||
mov x17, x30
|
||||
bl check_errata_2395411
|
||||
cbz x0, 1f
|
||||
check_erratum_range cortex_a78c, ERRATUM(2376749), CPU_REV(0, 1), CPU_REV(0, 2)
|
||||
|
||||
workaround_reset_start cortex_a78c, ERRATUM(2395411), ERRATA_A78C_2395411
|
||||
/* Set CPUACTRL2_EL1[40] to 1. */
|
||||
mrs x1, CORTEX_A78C_CPUACTLR2_EL1
|
||||
orr x1, x1, #CORTEX_A78C_CPUACTLR2_EL1_BIT_40
|
||||
msr CORTEX_A78C_CPUACTLR2_EL1, x1
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a78c_2395411_wa
|
||||
workaround_reset_end cortex_a78c, ERRATUM(2395411)
|
||||
|
||||
func check_errata_2395411
|
||||
/* Applies to r0p1 and r0p2 */
|
||||
mov x1, #0x01
|
||||
mov x2, #0x02
|
||||
b cpu_rev_var_range
|
||||
endfunc check_errata_2395411
|
||||
|
||||
/* ----------------------------------------------------------------
|
||||
* Errata Workaround for A78C Erratum 2772121.
|
||||
* This applies to revisions r0p0, r0p1 and r0p2 of the Cortex A78C
|
||||
* processor and is still open.
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x17
|
||||
* ----------------------------------------------------------------
|
||||
*/
|
||||
func errata_a78c_2772121_wa
|
||||
mov x17, x30
|
||||
bl check_errata_2772121
|
||||
cbz x0, 1f
|
||||
check_erratum_range cortex_a78c, ERRATUM(2395411), CPU_REV(0, 1), CPU_REV(0, 2)
|
||||
|
||||
workaround_runtime_start cortex_a78c, ERRATUM(2772121), ERRATA_A78C_2772121
|
||||
/* dsb before isb of power down sequence */
|
||||
dsb sy
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a78c_2772121_wa
|
||||
workaround_runtime_end cortex_a78c, ERRATUM(2772121)
|
||||
|
||||
func check_errata_2772121
|
||||
/* Applies to all revisions <= r0p2 */
|
||||
mov x1, #0x02
|
||||
b cpu_rev_var_ls
|
||||
endfunc check_errata_2772121
|
||||
|
||||
/* --------------------------------------------------
|
||||
* Errata Workaround for Cortex A78C Errata 2779484.
|
||||
* This applies to revisions r0p1 and r0p2.
|
||||
* It is still open.
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x1, x17
|
||||
* --------------------------------------------------
|
||||
*/
|
||||
func errata_a78c_2779484_wa
|
||||
/* Check revision. */
|
||||
mov x17, x30
|
||||
bl check_errata_2779484
|
||||
cbz x0, 1f
|
||||
check_erratum_ls cortex_a78c, ERRATUM(2772121), CPU_REV(0, 2)
|
||||
|
||||
workaround_reset_start cortex_a78c, ERRATUM(2779484), ERRATA_A78C_2779484
|
||||
/* Apply the workaround */
|
||||
mrs x1, CORTEX_A78C_ACTLR3_EL1
|
||||
orr x1, x1, #BIT(47)
|
||||
msr CORTEX_A78C_ACTLR3_EL1, x1
|
||||
workaround_reset_end cortex_a78c, ERRATUM(2779484)
|
||||
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a78c_2779484_wa
|
||||
check_erratum_range cortex_a78c, ERRATUM(2779484), CPU_REV(0, 1), CPU_REV(0, 2)
|
||||
|
||||
func check_errata_2779484
|
||||
/* Applies to r0p1 and r0p2*/
|
||||
mov x1, #0x01
|
||||
mov x2, #0x02
|
||||
b cpu_rev_var_range
|
||||
endfunc check_errata_2779484
|
||||
check_erratum_chosen cortex_a78c, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
|
||||
|
||||
func check_errata_cve_2022_23960
|
||||
#if WORKAROUND_CVE_2022_23960
|
||||
mov x0, #ERRATA_APPLIES
|
||||
#else
|
||||
mov x0, #ERRATA_MISSING
|
||||
#endif
|
||||
ret
|
||||
endfunc check_errata_cve_2022_23960
|
||||
|
||||
/* -------------------------------------------------
|
||||
* The CPU Ops reset function for Cortex-A78C
|
||||
* -------------------------------------------------
|
||||
*/
|
||||
func cortex_a78c_reset_func
|
||||
mov x19, x30
|
||||
bl cpu_get_rev_var
|
||||
mov x18, x0
|
||||
|
||||
#if ERRATA_A78C_1827430
|
||||
mov x0, x18
|
||||
bl errata_a78c_1827430_wa
|
||||
#endif
|
||||
|
||||
#if ERRATA_A78C_1827440
|
||||
mov x0, x18
|
||||
bl errata_a78c_1827440_wa
|
||||
#endif
|
||||
|
||||
#if ERRATA_A78C_2132064
|
||||
mov x0, x18
|
||||
bl errata_a78c_2132064_wa
|
||||
#endif
|
||||
|
||||
#if ERRATA_A78C_2242638
|
||||
mov x0, x18
|
||||
bl errata_a78c_2242638_wa
|
||||
#endif
|
||||
|
||||
#if ERRATA_A78C_2376749
|
||||
mov x0, x18
|
||||
bl errata_a78c_2376749_wa
|
||||
#endif
|
||||
|
||||
#if ERRATA_A78C_2395411
|
||||
mov x0, x18
|
||||
bl errata_a78c_2395411_wa
|
||||
#endif
|
||||
|
||||
#if ERRATA_A78C_2779484
|
||||
mov x0, x18
|
||||
bl errata_a78c_2779484_wa
|
||||
#endif
|
||||
|
||||
#if IMAGE_BL31 && WORKAROUND_CVE_2022_23960
|
||||
workaround_reset_start cortex_a78c, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
|
||||
#if IMAGE_BL31
|
||||
/*
|
||||
* The Cortex-A78c generic vectors are overridden to apply errata
|
||||
* mitigation on exception entry from lower ELs.
|
||||
*/
|
||||
adr x0, wa_cve_vbar_cortex_a78c
|
||||
msr vbar_el3, x0
|
||||
#endif /* IMAGE_BL31 && WORKAROUND_CVE_2022_23960 */
|
||||
#endif /* IMAGE_BL31 */
|
||||
workaround_reset_end cortex_a78c, CVE(2022, 23960)
|
||||
|
||||
isb
|
||||
ret x19
|
||||
endfunc cortex_a78c_reset_func
|
||||
cpu_reset_func_start cortex_a78c
|
||||
cpu_reset_func_end cortex_a78c
|
||||
|
||||
errata_report_shim cortex_a78c
|
||||
|
||||
/* ----------------------------------------------------
|
||||
* HW will do the cache maintenance while powering down
|
||||
|
|
@ -339,45 +131,13 @@ func cortex_a78c_core_pwr_dwn
|
|||
mrs x0, CORTEX_A78C_CPUPWRCTLR_EL1
|
||||
orr x0, x0, #CORTEX_A78C_CPUPWRCTLR_EL1_CORE_PWRDN_EN_BIT
|
||||
msr CORTEX_A78C_CPUPWRCTLR_EL1, x0
|
||||
#if ERRATA_A78C_2772121
|
||||
mov x15, x30
|
||||
bl cpu_get_rev_var
|
||||
bl errata_a78c_2772121_wa
|
||||
mov x30, x15
|
||||
#endif /* ERRATA_A78C_2772121 */
|
||||
|
||||
apply_erratum cortex_a78c, ERRATUM(2772121), ERRATA_A78C_2772121
|
||||
|
||||
isb
|
||||
ret
|
||||
endfunc cortex_a78c_core_pwr_dwn
|
||||
|
||||
#if REPORT_ERRATA
|
||||
/*
|
||||
* Errata printing function for Cortex A78C. Must follow AAPCS.
|
||||
*/
|
||||
func cortex_a78c_errata_report
|
||||
stp x8, x30, [sp, #-16]!
|
||||
|
||||
bl cpu_get_rev_var
|
||||
mov x8, x0
|
||||
|
||||
/*
|
||||
* Report all errata. The revision-variant information is passed to
|
||||
* checking functions of each errata.
|
||||
*/
|
||||
report_errata ERRATA_A78C_1827430, cortex_a78c, 1827430
|
||||
report_errata ERRATA_A78C_1827440, cortex_a78c, 1827440
|
||||
report_errata ERRATA_A78C_2132064, cortex_a78c, 2132064
|
||||
report_errata ERRATA_A78C_2242638, cortex_a78c, 2242638
|
||||
report_errata ERRATA_A78C_2376749, cortex_a78c, 2376749
|
||||
report_errata ERRATA_A78C_2395411, cortex_a78c, 2395411
|
||||
report_errata ERRATA_A78C_2772121, cortex_a78c, 2772121
|
||||
report_errata ERRATA_A78C_2779484, cortex_a78c, 2779484
|
||||
report_errata WORKAROUND_CVE_2022_23960, cortex_a78c, cve_2022_23960
|
||||
|
||||
ldp x8, x30, [sp], #16
|
||||
ret
|
||||
endfunc cortex_a78c_errata_report
|
||||
#endif
|
||||
|
||||
/* ---------------------------------------------
|
||||
* This function provides cortex_a78c specific
|
||||
* register information for crash reporting.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue