mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-18 10:34:19 +00:00
Merge changes Ib02688f7,If17fe04d into integration
* changes: fix(cpus): workaround for Cortex-X2 erratum 2768515 fix(cpus): workaround for Cortex-A710 erratum 2768515
This commit is contained in:
Madhukar Pappireddy
TrustedFirmware Code Review
commit
19e09e27f6
4 changed files with 88 additions and 0 deletions
|
|
@ -518,6 +518,10 @@ For Cortex-A710, the following errata build flags are defined :
|
|||
Cortex-A710 CPU. This needs to be enabled for revisions r0p0, r1p0 and r2p0
|
||||
of the CPU and is fixed in r2p1.
|
||||
|
||||
- ``ERRATA_A710_2768515``: This applies errata 2768515 workaround to
|
||||
Cortex-A710 CPU. This needs to be enabled for revisions r0p0, r1p0, r2p0 and
|
||||
r2p1 of the CPU and is still open.
|
||||
|
||||
For Neoverse N2, the following errata build flags are defined :
|
||||
|
||||
- ``ERRATA_N2_2002655``: This applies errata 2002655 workaround to Neoverse-N2
|
||||
|
|
@ -595,6 +599,10 @@ For Cortex-X2, the following errata build flags are defined :
|
|||
Cortex-X2 CPU. This needs to be enabled for revisions r0p0, r1p0 and r2p0
|
||||
of the CPU and is fixed in r2p1.
|
||||
|
||||
- ``ERRATA_X2_2768515``: This applies errata 2768515 workaround to
|
||||
Cortex-X2 CPU. This needs to be enabled for revisions r0p0, r1p0, r2p0
|
||||
and r2p1 of the CPU and is still open.
|
||||
|
||||
For Cortex-X3, the following errata build flags are defined :
|
||||
|
||||
- ``ERRATA_X3_2313909``: This applies errata 2313909 workaround to
|
||||
|
|
|
|||
|
|
@ -482,6 +482,30 @@ func check_errata_2371105
|
|||
b cpu_rev_var_ls
|
||||
endfunc check_errata_2371105
|
||||
|
||||
/* ----------------------------------------------------
|
||||
* Errata Workaround for Cortex-A710 Errata #2768515
|
||||
* This applies to revisions <= r2p1 and is still open.
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x17
|
||||
* ----------------------------------------------------
|
||||
*/
|
||||
func errata_a710_2768515_wa
|
||||
mov x17, x30
|
||||
bl check_errata_2768515
|
||||
cbz x0, 1f
|
||||
|
||||
/* dsb before isb of power down sequence */
|
||||
dsb sy
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_a710_2768515_wa
|
||||
|
||||
func check_errata_2768515
|
||||
/* Applies to all revisions <= r2p1 */
|
||||
mov x1, #0x21
|
||||
b cpu_rev_var_ls
|
||||
endfunc check_errata_2768515
|
||||
|
||||
func check_errata_cve_2022_23960
|
||||
#if WORKAROUND_CVE_2022_23960
|
||||
mov x0, #ERRATA_APPLIES
|
||||
|
|
@ -518,6 +542,12 @@ func cortex_a710_core_pwr_dwn
|
|||
mrs x0, CORTEX_A710_CPUPWRCTLR_EL1
|
||||
orr x0, x0, #CORTEX_A710_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
|
||||
msr CORTEX_A710_CPUPWRCTLR_EL1, x0
|
||||
#if ERRATA_A710_2768515
|
||||
mov x15, x30
|
||||
bl cpu_get_rev_var
|
||||
bl errata_a710_2768515_wa
|
||||
mov x30, x15
|
||||
#endif /* ERRATA_A710_2768515 */
|
||||
isb
|
||||
ret
|
||||
endfunc cortex_a710_core_pwr_dwn
|
||||
|
|
@ -550,6 +580,7 @@ func cortex_a710_errata_report
|
|||
report_errata ERRATA_A710_2216384, cortex_a710, 2216384
|
||||
report_errata ERRATA_A710_2291219, cortex_a710, 2291219
|
||||
report_errata ERRATA_A710_2371105, cortex_a710, 2371105
|
||||
report_errata ERRATA_A710_2768515, cortex_a710, 2768515
|
||||
report_errata WORKAROUND_CVE_2022_23960, cortex_a710, cve_2022_23960
|
||||
report_errata ERRATA_DSU_2313941, cortex_a710, dsu_2313941
|
||||
|
||||
|
|
|
|||
|
|
@ -295,6 +295,30 @@ func check_errata_2371105
|
|||
b cpu_rev_var_ls
|
||||
endfunc check_errata_2371105
|
||||
|
||||
/* ----------------------------------------------------
|
||||
* Errata Workaround for Cortex-X2 Errata #2768515
|
||||
* This applies to revisions <= r2p1 and is still open.
|
||||
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||
* Shall clobber: x0-x17
|
||||
* ----------------------------------------------------
|
||||
*/
|
||||
func errata_x2_2768515_wa
|
||||
mov x17, x30
|
||||
bl check_errata_2768515
|
||||
cbz x0, 1f
|
||||
|
||||
/* dsb before isb of power down sequence */
|
||||
dsb sy
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_x2_2768515_wa
|
||||
|
||||
func check_errata_2768515
|
||||
/* Applies to all revisions <= r2p1 */
|
||||
mov x1, #0x21
|
||||
b cpu_rev_var_ls
|
||||
endfunc check_errata_2768515
|
||||
|
||||
/* ----------------------------------------------------
|
||||
* HW will do the cache maintenance while powering down
|
||||
* ----------------------------------------------------
|
||||
|
|
@ -307,6 +331,12 @@ func cortex_x2_core_pwr_dwn
|
|||
mrs x0, CORTEX_X2_CPUPWRCTLR_EL1
|
||||
orr x0, x0, #CORTEX_X2_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
|
||||
msr CORTEX_X2_CPUPWRCTLR_EL1, x0
|
||||
#if ERRATA_X2_2768515
|
||||
mov x15, x30
|
||||
bl cpu_get_rev_var
|
||||
bl errata_x2_2768515_wa
|
||||
mov x30, x15
|
||||
#endif /* ERRATA_X2_2768515 */
|
||||
isb
|
||||
ret
|
||||
endfunc cortex_x2_core_pwr_dwn
|
||||
|
|
@ -333,6 +363,7 @@ func cortex_x2_errata_report
|
|||
report_errata ERRATA_X2_2147715, cortex_x2, 2147715
|
||||
report_errata ERRATA_X2_2216384, cortex_x2, 2216384
|
||||
report_errata ERRATA_X2_2371105, cortex_x2, 2371105
|
||||
report_errata ERRATA_X2_2768515, cortex_x2, 2768515
|
||||
report_errata WORKAROUND_CVE_2022_23960, cortex_x2, cve_2022_23960
|
||||
report_errata ERRATA_DSU_2313941, cortex_x2, dsu_2313941
|
||||
|
||||
|
|
|
|||
|
|
@ -572,6 +572,11 @@ ERRATA_A710_2008768 ?=0
|
|||
# to revision r0p0, r1p0 and r2p0 of the Cortex-A710 cpu and is fixed in r2p1.
|
||||
ERRATA_A710_2371105 ?=0
|
||||
|
||||
# Flag to apply erratum 2768515 workaround during power down. This erratum
|
||||
# applies to revision r0p0, r1p0, r2p0 and r2p1 of the Cortex-A710 cpu and is
|
||||
# still open.
|
||||
ERRATA_A710_2768515 ?=0
|
||||
|
||||
# Flag to apply erratum 2067956 workaround during reset. This erratum applies
|
||||
# to revision r0p0 of the Neoverse N2 cpu and is still open.
|
||||
ERRATA_N2_2067956 ?=0
|
||||
|
|
@ -655,6 +660,11 @@ ERRATA_X2_2147715 ?=0
|
|||
# to revision r0p0, r1p0 and r2p0 of the Cortex-X2 cpu and is fixed in r2p1.
|
||||
ERRATA_X2_2371105 ?=0
|
||||
|
||||
# Flag to apply erratum 2768515 workaround during power down. This erratum
|
||||
# applies to revision r0p0, r1p0, r2p0 and r2p1 of the Cortex-X2 cpu and is
|
||||
# still open.
|
||||
ERRATA_X2_2768515 ?=0
|
||||
|
||||
# Flag to apply erratum 2313909 workaround on powerdown. This erratum applies
|
||||
# to revisions r0p0 and r1p0 of the Cortex-X3 cpu, it is fixed in r1p1.
|
||||
ERRATA_X3_2313909 ?=0
|
||||
|
|
@ -1208,6 +1218,10 @@ $(eval $(call add_define,ERRATA_A710_2008768))
|
|||
$(eval $(call assert_boolean,ERRATA_A710_2371105))
|
||||
$(eval $(call add_define,ERRATA_A710_2371105))
|
||||
|
||||
# Process ERRATA_A710_2768515 flag
|
||||
$(eval $(call assert_boolean,ERRATA_A710_2768515))
|
||||
$(eval $(call add_define,ERRATA_A710_2768515))
|
||||
|
||||
# Process ERRATA_N2_2067956 flag
|
||||
$(eval $(call assert_boolean,ERRATA_N2_2067956))
|
||||
$(eval $(call add_define,ERRATA_N2_2067956))
|
||||
|
|
@ -1288,6 +1302,10 @@ $(eval $(call add_define,ERRATA_X2_2147715))
|
|||
$(eval $(call assert_boolean,ERRATA_X2_2371105))
|
||||
$(eval $(call add_define,ERRATA_X2_2371105))
|
||||
|
||||
# Process ERRATA_X2_2768515 flag
|
||||
$(eval $(call assert_boolean,ERRATA_X2_2768515))
|
||||
$(eval $(call add_define,ERRATA_X2_2768515))
|
||||
|
||||
# Process ERRATA_X3_2313909 flag
|
||||
$(eval $(call assert_boolean,ERRATA_X3_2313909))
|
||||
$(eval $(call add_define,ERRATA_X3_2313909))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue