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

Merge "refactor(cpus): convert Cortex-A715 to the errata framework" into integration

Browse source
This commit is contained in:
Bipin Ravi 2023-07-28 00:22:19 +02:00 • committed by TrustedFirmware Code Review
commit f3c80668c8
1 changed files with 12 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lib/cpus/aarch64/cortex_a715.S
View file

@ -26,31 +26,22 @@
wa_cve_2022_23960_bhb_vector_table CORTEX_A715_BHB_LOOP_COUNT, cortex_a715 wa_cve_2022_23960_bhb_vector_table CORTEX_A715_BHB_LOOP_COUNT, cortex_a715
#endif /* WORKAROUND_CVE_2022_23960 */ #endif /* WORKAROUND_CVE_2022_23960 */
func check_errata_cve_2022_23960 workaround_reset_start cortex_a715, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
#if WORKAROUND_CVE_2022_23960 #if IMAGE_BL31
mov x0, #ERRATA_APPLIES
#else
mov x0, #ERRATA_MISSING
#endif
ret
endfunc check_errata_cve_2022_23960
func cortex_a715_reset_func
/* Disable speculative loads */
msr SSBS, xzr
#if IMAGE_BL31 && WORKAROUND_CVE_2022_23960
/* /*
* The Cortex-A715 generic vectors are overridden to apply errata * The Cortex-A715 generic vectors are overridden to apply errata
* mitigation on exception entry from lower ELs. * mitigation on exception entry from lower ELs.
*/ */
adr x0, wa_cve_vbar_cortex_a715 override_vector_table wa_cve_vbar_cortex_a715
msr vbar_el3, x0 #endif /* IMAGE_BL31 */
#endif /* IMAGE_BL31 && WORKAROUND_CVE_2022_23960 */ workaround_reset_end cortex_a715, CVE(2022, 23960)
isb check_erratum_chosen cortex_a715, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
ret
endfunc cortex_a715_reset_func cpu_reset_func_start cortex_a715
/* Disable speculative loads */
msr SSBS, xzr
cpu_reset_func_end cortex_a715
/* ---------------------------------------------------- /* ----------------------------------------------------
* HW will do the cache maintenance while powering down * HW will do the cache maintenance while powering down
@ -68,26 +59,7 @@ func cortex_a715_core_pwr_dwn
ret ret
endfunc cortex_a715_core_pwr_dwn endfunc cortex_a715_core_pwr_dwn
#if REPORT_ERRATA errata_report_shim cortex_a715
/*
* Errata printing function for Cortex-A715. Must follow AAPCS.
*/
func cortex_a715_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 WORKAROUND_CVE_2022_23960, cortex_a715, cve_2022_23960
ldp x8, x30, [sp], #16
ret
endfunc cortex_a715_errata_report
#endif
/* --------------------------------------------- /* ---------------------------------------------
* This function provides Cortex-A715 specific * This function provides Cortex-A715 specific