diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:36 +1100 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:42 +1100 |
| commit | f3f4aeb9ea8954c0da3cf0d12693f9a57f1f4ac7 (patch) | |
| tree | 3663ab29736373c565d88e941162d37311cc3c75 /arch/arm64/kernel/cpu_errata.c | |
| parent | 2a3f5f14fdf2e8fb680af168fa642ef8a9218ffb (diff) | |
| parent | 849a2d3d9be31368559e6852cf64d749e6903818 (diff) | |
| download | talos-obmc-linux-openbmc-20160202-1.tar.gz talos-obmc-linux-openbmc-20160202-1.zip | |
Merge tag 'v4.3.5' into dev-4.3openbmc-20160202-1
This is the 4.3.5 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
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 6ffd91438560..dc0df822def3 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -74,6 +74,15 @@ const struct arm64_cpu_capabilities arm64_errata[] = { (1 << MIDR_VARIANT_SHIFT) | 2), }, #endif +#ifdef CONFIG_ARM64_ERRATUM_834220 + { + /* Cortex-A57 r0p0 - r1p2 */ + .desc = "ARM erratum 834220", + .capability = ARM64_WORKAROUND_834220, + MIDR_RANGE(MIDR_CORTEX_A57, 0x00, + (1 << MIDR_VARIANT_SHIFT) | 2), + }, +#endif #ifdef CONFIG_ARM64_ERRATUM_845719 { /* Cortex-A53 r0p[01234] */ |
