diff options
| author | Bipin Ravi <bipin.ravi@arm.com> | 2023-07-28 00:22:19 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-07-28 00:22:19 +0200 |
| commit | f3c80668c82361472bc3bea4737d59edca3e075b (patch) | |
| tree | c22327c9f7f63263d52262b323d7ad423035a4df | |
| parent | e070eadbb26e352e06920ef85804f85ea6f484c6 (diff) | |
| parent | c82fb382b209a733759bebf3dfafdd5740738c94 (diff) | |
Merge "refactor(cpus): convert Cortex-A715 to the errata framework" into integration
| -rw-r--r-- | lib/cpus/aarch64/cortex_a715.S | 52 |
1 files changed, 12 insertions, 40 deletions
diff --git a/lib/cpus/aarch64/cortex_a715.S b/lib/cpus/aarch64/cortex_a715.S index 12d969fa0..dd4c307f7 100644 --- a/lib/cpus/aarch64/cortex_a715.S +++ b/lib/cpus/aarch64/cortex_a715.S @@ -26,31 +26,22 @@ wa_cve_2022_23960_bhb_vector_table CORTEX_A715_BHB_LOOP_COUNT, cortex_a715 #endif /* 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 - -func cortex_a715_reset_func - /* Disable speculative loads */ - msr SSBS, xzr - -#if IMAGE_BL31 && WORKAROUND_CVE_2022_23960 +workaround_reset_start cortex_a715, CVE(2022, 23960), WORKAROUND_CVE_2022_23960 +#if IMAGE_BL31 /* * The Cortex-A715 generic vectors are overridden to apply errata * mitigation on exception entry from lower ELs. */ - adr x0, wa_cve_vbar_cortex_a715 - msr vbar_el3, x0 -#endif /* IMAGE_BL31 && WORKAROUND_CVE_2022_23960 */ + override_vector_table wa_cve_vbar_cortex_a715 +#endif /* IMAGE_BL31 */ +workaround_reset_end cortex_a715, CVE(2022, 23960) - isb - ret -endfunc cortex_a715_reset_func +check_erratum_chosen cortex_a715, CVE(2022, 23960), WORKAROUND_CVE_2022_23960 + +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 @@ -68,26 +59,7 @@ func cortex_a715_core_pwr_dwn ret endfunc cortex_a715_core_pwr_dwn -#if REPORT_ERRATA -/* - * 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 +errata_report_shim cortex_a715 /* --------------------------------------------- * This function provides Cortex-A715 specific |