diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-03 16:12:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-03 16:12:35 -0700 |
commit | 8c52b6dcdd1994ad0d2672e43c8d975d5c8195c3 (patch) | |
tree | bcf21423c13b62861e9f856e3d1b1bdf196afa1b /arch | |
parent | 2c221325635ed09a6eea10a362d8514d5943ad7d (diff) | |
parent | 2eec3707a33fbf1c2e0a88ffc9fc0e465c2a59fd (diff) | |
download | op-kernel-dev-8c52b6dcdd1994ad0d2672e43c8d975d5c8195c3.zip op-kernel-dev-8c52b6dcdd1994ad0d2672e43c8d975d5c8195c3.tar.gz |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
- a few simple fixes for fallout from the recent gic-v3 changes
- a workaround for a Cavium thunderX erratum
- a bugfix for the pic32 irqchip to make external interrupts work proper
- a missing return value in the generic IPI management code
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/irq-pic32-evic: Fix bug with external interrupts.
irqchip/gicv3-its: numa: Enable workaround for Cavium thunderx erratum 23144
irqchip/gic-v3: Fix quiescence check in gic_enable_redist
irqchip/gic-v3: Fix copy+paste mistakes in defines
irqchip/gic-v3: Fix ICC_SGI1R_EL1.INTID decoding mask
genirq: Fix missing return value in irq_destroy_ipi()
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm64/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 5fe3208..5a0a691 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -438,6 +438,15 @@ config CAVIUM_ERRATUM_22375 If unsure, say Y. +config CAVIUM_ERRATUM_23144 + bool "Cavium erratum 23144: ITS SYNC hang on dual socket system" + depends on NUMA + default y + help + ITS SYNC command hang for cross node io and collections/cpu mapping. + + If unsure, say Y. + config CAVIUM_ERRATUM_23154 bool "Cavium erratum 23154: Access to ICC_IAR1_EL1 is not sync'ed" default y |