diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-12-10 18:53:03 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-10 18:53:52 +0000 |
| commit | bc84a2d106beab6000223b569c3bcb9ebf49d9ec (patch) | |
| tree | 41d5fee0c983a8820478c0c7e812b76be43ed07c /arch/arm64/kernel/cpu_errata.c | |
| parent | f357b3a7e17af7736d67d8267edc1ed3d1dd9391 (diff) | |
| parent | a457b0f7f50d4d189f0d009617885e4341133e8e (diff) | |
Merge branch 'kvm/cortex-a76-erratum-1165522' into aarch64/for-next/core
Pull in KVM workaround for A76 erratum #116522.
Conflicts:
arch/arm64/include/asm/cpucaps.h
Diffstat (limited to 'arch/arm64/kernel/cpu_errata.c')
| -rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index bb44635026f8b..e3123055e552e 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -749,6 +749,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0), }, #endif +#ifdef CONFIG_ARM64_ERRATUM_1165522 + { + /* Cortex-A76 r0p0 to r2p0 */ + .desc = "ARM erratum 1165522", + .capability = ARM64_WORKAROUND_1165522, + ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0), + }, +#endif { } }; |