diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
| commit | 8bd142c01648cdb33e9bcafa0448ba2c20ed814c (patch) | |
| tree | 9197c60d3f9d4036f38f281a183e94750ceea1d7 /arch/arm64/kernel/cpu_errata.c | |
| parent | d792abacaf1a1a8dfea353fab699b97fa6251c2a (diff) | |
| parent | fbb4574ce9a37e15a9872860bf202f2be5bdf6c4 (diff) | |
Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.4-rc3.
Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.
Diffstat (limited to 'arch/arm64/kernel/cpu_errata.c')
| -rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 24926f2504f7..feb6b4efa641 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c | |||
| @@ -75,6 +75,15 @@ const struct arm64_cpu_capabilities arm64_errata[] = { | |||
| 75 | (1 << MIDR_VARIANT_SHIFT) | 2), | 75 | (1 << MIDR_VARIANT_SHIFT) | 2), |
| 76 | }, | 76 | }, |
| 77 | #endif | 77 | #endif |
| 78 | #ifdef CONFIG_ARM64_ERRATUM_834220 | ||
| 79 | { | ||
| 80 | /* Cortex-A57 r0p0 - r1p2 */ | ||
| 81 | .desc = "ARM erratum 834220", | ||
| 82 | .capability = ARM64_WORKAROUND_834220, | ||
| 83 | MIDR_RANGE(MIDR_CORTEX_A57, 0x00, | ||
| 84 | (1 << MIDR_VARIANT_SHIFT) | 2), | ||
| 85 | }, | ||
| 86 | #endif | ||
| 78 | #ifdef CONFIG_ARM64_ERRATUM_845719 | 87 | #ifdef CONFIG_ARM64_ERRATUM_845719 |
| 79 | { | 88 | { |
| 80 | /* Cortex-A53 r0p[01234] */ | 89 | /* Cortex-A53 r0p[01234] */ |