diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-05-03 13:17:56 +0100 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2019-05-07 13:46:47 +0100 |
| commit | f85edcea5ff651a47fc1434d2d9b5475cc56aa29 (patch) | |
| tree | a154ae02c453f133ceceb9f6b7e4aae422cd19e9 /lib | |
| parent | e6e1d0ac162027334471e1eb9f1e0ce46065db6a (diff) | |
Workaround for cortex-A76 errata 1286807
The workaround for Cortex-A76 errata #1286807 is implemented
in this patch.
Change-Id: I6c15af962ac99ce223e009f6d299cefb41043bed
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpus/aarch64/cortex_a76.S | 17 | ||||
| -rw-r--r-- | lib/cpus/cpu-ops.mk | 8 |
2 files changed, 25 insertions, 0 deletions
diff --git a/lib/cpus/aarch64/cortex_a76.S b/lib/cpus/aarch64/cortex_a76.S index 2f250f4b..aed7970e 100644 --- a/lib/cpus/aarch64/cortex_a76.S +++ b/lib/cpus/aarch64/cortex_a76.S @@ -365,6 +365,22 @@ func check_errata_1275112 b cpu_rev_var_ls endfunc check_errata_1275112 + /* --------------------------------------------------- + * Errata Workaround for Cortex A76 Errata #1286807. + * This applies only to revision <= r3p0 of Cortex A76. + * Due to the nature of the errata it is applied unconditionally + * when built in, report it as applicable in this case + * --------------------------------------------------- + */ +func check_errata_1286807 +#if ERRATA_A76_1286807 + mov x0, #ERRATA_APPLIES + ret +#else + mov x1, #0x30 + b cpu_rev_var_ls +#endif +endfunc check_errata_1286807 func check_errata_cve_2018_3639 #if WORKAROUND_CVE_2018_3639 @@ -502,6 +518,7 @@ func cortex_a76_errata_report report_errata ERRATA_A76_1262606, cortex_a76, 1262606 report_errata ERRATA_A76_1262888, cortex_a76, 1262888 report_errata ERRATA_A76_1275112, cortex_a76, 1275112 + report_errata ERRATA_A76_1286807, cortex_a76, 1286807 report_errata WORKAROUND_CVE_2018_3639, cortex_a76, cve_2018_3639 report_errata ERRATA_DSU_798953, cortex_a76, dsu_798953 report_errata ERRATA_DSU_936184, cortex_a76, dsu_936184 diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index 6df85b7b..e45d79d9 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -226,6 +226,10 @@ ERRATA_A76_1262888 ?=0 # only to revision <= r3p0 of the Cortex A76 cpu. ERRATA_A76_1275112 ?=0 +# Flag to apply erratum 1286807 workaround during reset. This erratum applies +# only to revision <= r3p0 of the Cortex A76 cpu. +ERRATA_A76_1286807 ?=0 + # Flag to apply T32 CLREX workaround during reset. This erratum applies # only to r0p0 and r1p0 of the Neoverse N1 cpu. ERRATA_N1_1043202 ?=1 @@ -407,6 +411,10 @@ $(eval $(call add_define,ERRATA_A76_1262888)) $(eval $(call assert_boolean,ERRATA_A76_1275112)) $(eval $(call add_define,ERRATA_A76_1275112)) +# Process ERRATA_A76_1286807 flag +$(eval $(call assert_boolean,ERRATA_A76_1286807)) +$(eval $(call add_define,ERRATA_A76_1286807)) + # Process ERRATA_N1_1043202 flag $(eval $(call assert_boolean,ERRATA_N1_1043202)) $(eval $(call add_define,ERRATA_N1_1043202)) |