diff options
| author |   Will Deacon <will.deacon@arm.com> | 2019-05-01 15:45:36 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-05-01 15:45:36 +0100 |
| commit | 24cf262da1ad303fc940c798aab0bd1bd50e3fc2 (patch) | |
| tree | da38a3ae51128dfb959fb53d633201ab4ffb4209 /arch/arm64/Kconfig | |
| parent | Merge branch 'for-next/mitigations' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core (diff) | |
| parent | clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters (diff) | |
| download | linux-dev-24cf262da1ad303fc940c798aab0bd1bd50e3fc2.tar.xz linux-dev-24cf262da1ad303fc940c798aab0bd1bd50e3fc2.zip | |
Merge branch 'for-next/timers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/arch_timer.h
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b5c6943225ce..1c0cb5131c2a 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -477,15 +477,17 @@ config ARM64_ERRATUM_1024718 If unsure, say Y. config ARM64_ERRATUM_1188873 - bool "Cortex-A76: MRC read following MRRC read of specific Generic Timer in AArch32 might give incorrect result" + bool "Cortex-A76/Neoverse-N1: MRC read following MRRC read of specific Generic Timer in AArch32 might give incorrect result" default y + depends on COMPAT select ARM_ARCH_TIMER_OOL_WORKAROUND help - This option adds a workaround for ARM Cortex-A76 erratum 1188873. + This option adds a workaround for ARM Cortex-A76/Neoverse-N1 + erratum 1188873. - Affected Cortex-A76 cores (r0p0, r1p0, r2p0) could cause - register corruption when accessing the timer registers from - AArch32 userspace. + Affected Cortex-A76/Neoverse-N1 cores (r0p0, r1p0, r2p0) could + cause register corruption when accessing the timer registers + from AArch32 userspace. If unsure, say Y. |