diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 22:25:02 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 22:31:37 +1000 |
| commit | 3c19d5ada1bec8b97119215298df7669d3ffb3db (patch) | |
| tree | bbc728296e01ff7403164072e4f87ad01de2c6ea /arch/powerpc/kvm/book3s_hv_rm_xics.c | |
| parent | 17ed4c8f81da2bf340d33a8c875f4d6b1dfd9398 (diff) | |
| parent | 08a1e650cc631ccc8cfe670beb38b2f9c58402cd (diff) | |
| download | linux-3c19d5ada1bec8b97119215298df7669d3ffb3db.tar.gz linux-3c19d5ada1bec8b97119215298df7669d3ffb3db.tar.xz | |
Merge branch 'topic/xive' (early part) into next
This merges the arch part of the XIVE support, leaving the final commit
with the KVM specific pieces dangling on the branch for Paul to merge
via the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_rm_xics.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rm_xics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rm_xics.c b/arch/powerpc/kvm/book3s_hv_rm_xics.c index d9e312f253fa..ffde4507ddfd 100644 --- a/arch/powerpc/kvm/book3s_hv_rm_xics.c +++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c @@ -765,7 +765,7 @@ unsigned long eoi_rc; static void icp_eoi(struct irq_chip *c, u32 hwirq, __be32 xirr, bool *again) { - unsigned long xics_phys; + void __iomem *xics_phys; int64_t rc; rc = pnv_opal_pci_msi_eoi(c, hwirq); @@ -778,7 +778,7 @@ static void icp_eoi(struct irq_chip *c, u32 hwirq, __be32 xirr, bool *again) /* EOI it */ xics_phys = local_paca->kvm_hstate.xics_phys; if (xics_phys) { - _stwcix(xics_phys + XICS_XIRR, xirr); + __raw_rm_writel(xirr, xics_phys + XICS_XIRR); } else { rc = opal_int_eoi(be32_to_cpu(xirr)); *again = rc > 0; |