diff options
| author | Radim Krčmář | 2018-02-01 16:13:07 +0100 |
|---|---|---|
| committer | Radim Krčmář | 2018-02-01 16:13:07 +0100 |
| commit | d2b9b2079e23c1ab80ce1d7670d5e1994468a881 (patch) | |
| tree | bd9bfb74343da003b7bac0569d0a7f8025cbaef4 /arch/powerpc/sysdev/xive/common.c | |
| parent | Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| parent | KVM: PPC: Book3S HV: Keep XIVE escalation interrupt masked unless ceded (diff) | |
| download | kernel-qcow2-linux-d2b9b2079e23c1ab80ce1d7670d5e1994468a881.tar.gz kernel-qcow2-linux-d2b9b2079e23c1ab80ce1d7670d5e1994468a881.tar.xz kernel-qcow2-linux-d2b9b2079e23c1ab80ce1d7670d5e1994468a881.zip | |
Merge tag 'kvm-ppc-next-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
PPC KVM update for 4.16
- Allow HPT guests to run on a radix host on POWER9 v2.2 CPUs
without requiring the complex thread synchronization that earlier
CPU versions required.
- A series from Ben Herrenschmidt to improve the handling of
escalation interrupts with the XIVE interrupt controller.
- Provide for the decrementer register to be copied across on
migration.
- Various minor cleanups and bugfixes.
Diffstat (limited to 'arch/powerpc/sysdev/xive/common.c')
| -rw-r--r-- | arch/powerpc/sysdev/xive/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c index a3b8d7d1316e..2547b6021e6a 100644 --- a/arch/powerpc/sysdev/xive/common.c +++ b/arch/powerpc/sysdev/xive/common.c @@ -367,7 +367,8 @@ static void xive_irq_eoi(struct irq_data *d) * EOI the source if it hasn't been disabled and hasn't * been passed-through to a KVM guest */ - if (!irqd_irq_disabled(d) && !irqd_is_forwarded_to_vcpu(d)) + if (!irqd_irq_disabled(d) && !irqd_is_forwarded_to_vcpu(d) && + !(xd->flags & XIVE_IRQ_NO_EOI)) xive_do_source_eoi(irqd_to_hwirq(d), xd); /* |