diff options
author | Paul Beesley <paul.beesley@arm.com> | 2019-05-29 11:29:12 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-05-29 11:29:12 +0000 |
commit | 84167417db275b8fd529dae7a4cf87ab8c41a414 (patch) | |
tree | 65ab5a6ce696029230e99ea9f615326a2c3cf236 /lib/cpus | |
parent | 5a408104902fdcb03ea11266d948a0460174c8a7 (diff) | |
parent | 9af07df0506af9a4230bafb3e74c769f0de3ec9a (diff) | |
download | trusted-firmware-a-84167417db275b8fd529dae7a4cf87ab8c41a414.tar.gz |
Merge "Cortex-A55: workarounds for errata 1221012" into integration
Diffstat (limited to 'lib/cpus')
-rw-r--r-- | lib/cpus/aarch64/cortex_a55.S | 53 | ||||
-rw-r--r-- | lib/cpus/cpu-ops.mk | 8 |
2 files changed, 61 insertions, 0 deletions
diff --git a/lib/cpus/aarch64/cortex_a55.S b/lib/cpus/aarch64/cortex_a55.S index 0ef373a0a8..8e138244b8 100644 --- a/lib/cpus/aarch64/cortex_a55.S +++ b/lib/cpus/aarch64/cortex_a55.S @@ -175,6 +175,53 @@ func check_errata_903758 b cpu_rev_var_ls endfunc check_errata_903758 + /* ----------------------------------------------------- + * Errata Workaround for Cortex A55 Errata #1221012. + * This applies only to revisions <= r1p0 of Cortex A55. + * Inputs: + * x0: variant[4:7] and revision[0:3] of current cpu. + * Shall clobber: x0-x17 + * ----------------------------------------------------- + */ +func errata_a55_1221012_wa + /* + * Compare x0 against revision r1p0 + */ + mov x17, x30 + bl check_errata_1221012 + cbz x0, 1f + mov x0, #0x0020 + movk x0, #0x0850, lsl #16 + msr CPUPOR_EL3, x0 + mov x0, #0x0000 + movk x0, #0x1FF0, lsl #16 + movk x0, #0x2, lsl #32 + msr CPUPMR_EL3, x0 + mov x0, #0x03fd + movk x0, #0x0110, lsl #16 + msr CPUPCR_EL3, x0 + mov x0, #0x1 + msr CPUPSELR_EL3, x0 + mov x0, #0x0040 + movk x0, #0x08D0, lsl #16 + msr CPUPOR_EL3, x0 + mov x0, #0x0040 + movk x0, #0x1FF0, lsl #16 + movk x0, #0x2, lsl #32 + msr CPUPMR_EL3, x0 + mov x0, #0x03fd + movk x0, #0x0110, lsl #16 + msr CPUPCR_EL3, x0 + isb +1: + ret x17 +endfunc errata_a55_1221012_wa + +func check_errata_1221012 + mov x1, #0x10 + b cpu_rev_var_ls +endfunc check_errata_1221012 + func cortex_a55_reset_func mov x19, x30 @@ -214,6 +261,11 @@ func cortex_a55_reset_func bl errata_a55_903758_wa #endif +#if ERRATA_A55_1221012 + mov x0, x18 + bl errata_a55_1221012_wa +#endif + ret x19 endfunc cortex_a55_reset_func @@ -253,6 +305,7 @@ func cortex_a55_errata_report report_errata ERRATA_A55_798797, cortex_a55, 798797 report_errata ERRATA_A55_846532, cortex_a55, 846532 report_errata ERRATA_A55_903758, cortex_a55, 903758 + report_errata ERRATA_A55_1221012, cortex_a55, 1221012 ldp x8, x30, [sp], #16 ret diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index e45d79d99a..599e11ed5a 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -134,6 +134,10 @@ ERRATA_A55_846532 ?=0 # only to revision <= r0p1 of the Cortex A55 cpu. ERRATA_A55_903758 ?=0 +# Flag to apply erratum 1221012 workaround during reset. This erratum applies +# only to revision <= r1p0 of the Cortex A55 cpu. +ERRATA_A55_1221012 ?=0 + # Flag to apply erratum 806969 workaround during reset. This erratum applies # only to revision r0p0 of the Cortex A57 cpu. ERRATA_A57_806969 ?=0 @@ -319,6 +323,10 @@ $(eval $(call add_define,ERRATA_A55_846532)) $(eval $(call assert_boolean,ERRATA_A55_903758)) $(eval $(call add_define,ERRATA_A55_903758)) +# Process ERRATA_A55_1221012 flag +$(eval $(call assert_boolean,ERRATA_A55_1221012)) +$(eval $(call add_define,ERRATA_A55_1221012)) + # Process ERRATA_A57_806969 flag $(eval $(call assert_boolean,ERRATA_A57_806969)) $(eval $(call add_define,ERRATA_A57_806969)) |