mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-17 01:54:22 +00:00
refactor(cpus): reorder Cortex-A78C errata by ascending order
Change-Id: Id5cf37e22ddbd5baffcd80e2fc5c76f4cdc2ed9f Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
This commit is contained in:
parent
1ff96d6da6
commit
1c857218b2
1 changed files with 63 additions and 63 deletions
|
@ -17,6 +17,10 @@
|
|||
#error "cortex_a78c must be compiled with HW_ASSISTED_COHERENCY enabled"
|
||||
#endif
|
||||
|
||||
#if WORKAROUND_CVE_2022_23960
|
||||
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
|
||||
|
@ -71,69 +75,6 @@ func check_errata_1827440
|
|||
b cpu_rev_var_ls
|
||||
endfunc check_errata_1827440
|
||||
|
||||
/* --------------------------------------------------
|
||||
* 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
|
||||
/* 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
|
||||
|
||||
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
|
||||
|
||||
/* 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
|
||||
|
||||
func check_errata_2395411
|
||||
/* Applies to r0p1 and r0p2 */
|
||||
mov x1, #0x01
|
||||
mov x2, #0x02
|
||||
b cpu_rev_var_range
|
||||
endfunc check_errata_2395411
|
||||
|
||||
#if WORKAROUND_CVE_2022_23960
|
||||
wa_cve_2022_23960_bhb_vector_table CORTEX_A78C_BHB_LOOP_COUNT, cortex_a78c
|
||||
#endif /* WORKAROUND_CVE_2022_23960 */
|
||||
|
||||
/* --------------------------------------------------
|
||||
* Errata Workaround for A78C Erratum 2132064.
|
||||
* This applies to revisions r0p1 and r0p2 of A78C
|
||||
|
@ -206,6 +147,65 @@ func check_errata_2242638
|
|||
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
|
||||
/* 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
|
||||
|
||||
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
|
||||
|
||||
/* 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
|
||||
|
||||
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
|
||||
|
|
Loading…
Add table
Reference in a new issue