diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 14:25:02 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 14:31:37 +0200 |
| commit | 3c19d5ada1bec8b97119215298df7669d3ffb3db (patch) | |
| tree | bbc728296e01ff7403164072e4f87ad01de2c6ea /arch/powerpc/sysdev/xics | |
| parent | powerpc/powernv: Recover correct PACA on wakeup from a stop on P9 DD1 (diff) | |
| parent | powerpc: Fixup LPCR:PECE and HEIC setting on POWER9 (diff) | |
| download | linux-3c19d5ada1bec8b97119215298df7669d3ffb3db.tar.xz linux-3c19d5ada1bec8b97119215298df7669d3ffb3db.zip | |
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/sysdev/xics')
| -rw-r--r-- | arch/powerpc/sysdev/xics/icp-native.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c index 8a6a043e239b..f0f3f47a3fc9 100644 --- a/arch/powerpc/sysdev/xics/icp-native.c +++ b/arch/powerpc/sysdev/xics/icp-native.c @@ -168,15 +168,15 @@ void icp_native_cause_ipi_rm(int cpu) * Need the physical address of the XICS to be * previously saved in kvm_hstate in the paca. */ - unsigned long xics_phys; + void __iomem *xics_phys; /* * Just like the cause_ipi functions, it is required to - * include a full barrier (out8 includes a sync) before - * causing the IPI. + * include a full barrier before causing the IPI. */ xics_phys = paca[cpu].kvm_hstate.xics_phys; - out_rm8((u8 *)(xics_phys + XICS_MFRR), IPI_PRIORITY); + mb(); + __raw_rm_writeb(IPI_PRIORITY, xics_phys + XICS_MFRR); } #endif |