diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-02 06:51:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-02 06:51:05 -0500 |
| commit | 008e61f5120e7d3acb937953b1322e3aee3160d4 (patch) | |
| tree | f5d4b4e4c96f2c12bf25d9dd8fdb05cbb9c7f5b5 /arch/arm/cpu | |
| parent | 73c5c399977d55bd32fc718a6a4a5922d282fea2 (diff) | |
| parent | 7711cc0a0648e215571b1d1768381963d92a1d97 (diff) | |
| download | u-boot-imx-008e61f5120e7d3acb937953b1322e3aee3160d4.zip u-boot-imx-008e61f5120e7d3acb937953b1322e3aee3160d4.tar.gz u-boot-imx-008e61f5120e7d3acb937953b1322e3aee3160d4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv8/start.S | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 2ee60d6..67b166c 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -168,6 +168,25 @@ apply_a57_core_errata: msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ #endif +#ifdef CONFIG_ARM_ERRATA_833471 + mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ + /* FPSCR write flush. + * Note that in some cases where a flush is unnecessary this + could impact performance. */ + orr x0, x0, #1 << 38 + msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ +#endif + +#ifdef CONFIG_ARM_ERRATA_829520 + mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ + /* Disable Indirect Predictor bit will prevent this erratum + from occurring + * Note that in some cases where a flush is unnecessary this + could impact performance. */ + orr x0, x0, #1 << 4 + msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ +#endif + #ifdef CONFIG_ARM_ERRATA_833069 mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ /* Disable Enable Invalidates of BTB bit */ |