3 files changed, 16 insertions, 8 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 2eca6187fc92..a4e2f30917a3 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1144,8 +1144,9 @@ void xen_setup_vcpu_info_placement(void)
                 xen_vcpu_setup(cpu);
 
         /* xen_vcpu_setup managed to place the vcpu_info within the
-           percpu area for all cpus, so make use of it */
-        if (have_vcpu_info_placement) {
+         * percpu area for all cpus, so make use of it. Note that for
+         * PVH we want to use native IRQ mechanism. */
+        if (have_vcpu_info_placement && !xen_pvh_domain()) {
                 pv_irq_ops.save_fl = __PV_IS_CALLEE_SAVE(xen_save_fl_direct);
                 pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(xen_restore_fl_direct);
                 pv_irq_ops.irq_disable = __PV_IS_CALLEE_SAVE(xen_irq_disable_direct);
diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c
index 0da7f863056f..76ca326105f7 100644
--- a/arch/x86/xen/irq.c
+++ b/arch/x86/xen/irq.c
@@ -5,6 +5,7 @@
 #include <xen/interface/xen.h>
 #include <xen/interface/sched.h>
 #include <xen/interface/vcpu.h>
+#include <xen/features.h>
 #include <xen/events.h>
 
 #include <asm/xen/hypercall.h>
@@ -128,6 +129,8 @@ static const struct pv_irq_ops xen_irq_ops __initconst = {
 
 void __init xen_init_irq_ops(void)
 {
-        pv_irq_ops = xen_irq_ops;
+        /* For PVH we use default pv_irq_ops settings. */
+        if (!xen_feature(XENFEAT_hvm_callback_vector))
+                pv_irq_ops = xen_irq_ops;
         x86_init.irqs.intr_init = xen_init_IRQ;
 }
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 1d16185e82b2..4672e003c0ad 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -1685,8 +1685,15 @@ void __init xen_init_IRQ(void)
         pirq_needs_eoi = pirq_needs_eoi_flag;
 
 #ifdef CONFIG_X86
-        if (xen_hvm_domain()) {
+        if (xen_pv_domain()) {
+                irq_ctx_init(smp_processor_id());
+                if (xen_initial_domain())
+                        pci_xen_initial_domain();
+        }
+        if (xen_feature(XENFEAT_hvm_callback_vector))
                 xen_callback_vector();
+
+        if (xen_hvm_domain()) {
                 native_init_IRQ();
                 /* pci_xen_hvm_init must be called after native_init_IRQ so that
                  * __acpi_register_gsi can point at the right function */
@@ -1695,13 +1702,10 @@ void __init xen_init_IRQ(void)
                 int rc;
                 struct physdev_pirq_eoi_gmfn eoi_gmfn;
 
-                irq_ctx_init(smp_processor_id());
-                if (xen_initial_domain())
-                        pci_xen_initial_domain();
-
                 pirq_eoi_map = (void *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
                 eoi_gmfn.gmfn = virt_to_mfn(pirq_eoi_map);
                 rc = HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn_v2, &eoi_gmfn);
+                /* TODO: No PVH support for PIRQ EOI */
                 if (rc != 0) {
                         free_page((unsigned long) pirq_eoi_map);
                         pirq_eoi_map = NULL;