diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-20 23:38:13 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-20 23:38:13 +1000 |
| commit | 787a2b682d18997e71efc2ae92ce158ca3e319e9 (patch) | |
| tree | 3687b6fa74d576bab27183aae7d8124517b7fbeb /arch/powerpc/sysdev | |
| parent | 217ba7dccef8e811eee43003bfef24f1902f37c9 (diff) | |
| parent | b1f9be9392f090f08e4ad9e2c68963aeff03bd67 (diff) | |
| download | linux-787a2b682d18997e71efc2ae92ce158ca3e319e9.tar.gz linux-787a2b682d18997e71efc2ae92ce158ca3e319e9.tar.bz2 linux-787a2b682d18997e71efc2ae92ce158ca3e319e9.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge our topic branch shared with the kvm-ppc tree.
This brings in one commit that touches the XIVE interrupt controller
logic across core and KVM code.
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/xive/common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c index b294f70f1a67..9603b2830d03 100644 --- a/arch/powerpc/sysdev/xive/common.c +++ b/arch/powerpc/sysdev/xive/common.c @@ -196,6 +196,9 @@ static notrace u8 xive_esb_read(struct xive_irq_data *xd, u32 offset) { u64 val; + if (offset == XIVE_ESB_SET_PQ_10 && xd->flags & XIVE_IRQ_FLAG_STORE_EOI) + offset |= XIVE_ESB_LD_ST_MO; + /* Handle HW errata */ if (xd->flags & XIVE_IRQ_FLAG_SHIFT_BUG) offset |= offset << 4; |