Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 852 insertions, 190 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 13365ba35218..30df85d8fca8 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -5,7 +5,7 @@
  * domain gets 1024 event channels, but NR_IRQ is not that large, we
  * must dynamically map irqs<->event channels.  The event channels
  * interface with the rest of the kernel by defining a xen interrupt
- * chip.  When an event is recieved, it is mapped to an irq and sent
+ * chip.  When an event is received, it is mapped to an irq and sent
  * through the normal interrupt processing path.
  *
  * There are four kinds of events which can be mapped to an event
@@ -16,7 +16,7 @@
  *    (typically dom0).
  * 2. VIRQs, typically used for timers.  These are per-cpu events.
  * 3. IPIs.
- * 4. Hardware interrupts. Not supported at present.
+ * 4. PIRQs - Hardware interrupts.
  *
  * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007
  */
@@ -28,12 +28,16 @@
 #include <linux/string.h>
 #include <linux/bootmem.h>
 #include <linux/slab.h>
+#include <linux/irqnr.h>
+#include <linux/pci.h>
 
 #include <asm/desc.h>
 #include <asm/ptrace.h>
 #include <asm/irq.h>
 #include <asm/idle.h>
+#include <asm/io_apic.h>
 #include <asm/sync_bitops.h>
+#include <asm/xen/pci.h>
 #include <asm/xen/hypercall.h>
 #include <asm/xen/hypervisor.h>
 
@@ -52,6 +56,8 @@
  */
 static DEFINE_SPINLOCK(irq_mapping_update_lock);
 
+static LIST_HEAD(xen_irq_list_head);
+
 /* IRQ <-> VIRQ mapping. */
 static DEFINE_PER_CPU(int [NR_VIRQS], virq_to_irq) = {[0 ... NR_VIRQS-1] = -1};
 
@@ -73,14 +79,17 @@ enum xen_irq_type {
  * event channel - irq->event channel mapping
  * cpu - cpu this event channel is bound to
  * index - type-specific information:
- *    PIRQ - vector, with MSB being "needs EIO"
+ *    PIRQ - vector, with MSB being "needs EIO", or physical IRQ of the HVM
+ *           guest, or GSI (real passthrough IRQ) of the device.
  *    VIRQ - virq number
  *    IPI - IPI vector
  *    EVTCHN -
  */
 struct irq_info
 {
+        struct list_head list;
         enum xen_irq_type type; /* type */
+        unsigned irq;
         unsigned short evtchn;  /* event channel */
         unsigned short cpu;     /* cpu bound */
 
@@ -88,73 +97,118 @@ struct irq_info
                 unsigned short virq;
                 enum ipi_vector ipi;
                 struct {
+                        unsigned short pirq;
                         unsigned short gsi;
-                        unsigned short vector;
+                        unsigned char vector;
+                        unsigned char flags;
+                        uint16_t domid;
                 } pirq;
         } u;
 };
+#define PIRQ_NEEDS_EOI  (1 << 0)
+#define PIRQ_SHAREABLE  (1 << 1)
 
-static struct irq_info irq_info[NR_IRQS];
+static int *evtchn_to_irq;
 
-static int evtchn_to_irq[NR_EVENT_CHANNELS] = {
-        [0 ... NR_EVENT_CHANNELS-1] = -1
-};
-struct cpu_evtchn_s {
-        unsigned long bits[NR_EVENT_CHANNELS/BITS_PER_LONG];
-};
-static struct cpu_evtchn_s *cpu_evtchn_mask_p;
-static inline unsigned long *cpu_evtchn_mask(int cpu)
-{
-        return cpu_evtchn_mask_p[cpu].bits;
-}
+static DEFINE_PER_CPU(unsigned long [NR_EVENT_CHANNELS/BITS_PER_LONG],
+                      cpu_evtchn_mask);
 
 /* Xen will never allocate port zero for any purpose. */
 #define VALID_EVTCHN(chn)       ((chn) != 0)
 
 static struct irq_chip xen_dynamic_chip;
 static struct irq_chip xen_percpu_chip;
+static struct irq_chip xen_pirq_chip;
+static void enable_dynirq(struct irq_data *data);
+static void disable_dynirq(struct irq_data *data);
 
-/* Constructor for packed IRQ information. */
-static struct irq_info mk_unbound_info(void)
+/* Get info for IRQ */
+static struct irq_info *info_for_irq(unsigned irq)
 {
-        return (struct irq_info) { .type = IRQT_UNBOUND };
+        return irq_get_handler_data(irq);
 }
 
-static struct irq_info mk_evtchn_info(unsigned short evtchn)
+/* Constructors for packed IRQ information. */
+static void xen_irq_info_common_init(struct irq_info *info,
+                                     unsigned irq,
+                                     enum xen_irq_type type,
+                                     unsigned short evtchn,
+                                     unsigned short cpu)
 {
-        return (struct irq_info) { .type = IRQT_EVTCHN, .evtchn = evtchn,
-                        .cpu = 0 };
+
+        BUG_ON(info->type != IRQT_UNBOUND && info->type != type);
+
+        info->type = type;
+        info->irq = irq;
+        info->evtchn = evtchn;
+        info->cpu = cpu;
+
+        evtchn_to_irq[evtchn] = irq;
 }
 
-static struct irq_info mk_ipi_info(unsigned short evtchn, enum ipi_vector ipi)
+static void xen_irq_info_evtchn_init(unsigned irq,
+                                     unsigned short evtchn)
 {
-        return (struct irq_info) { .type = IRQT_IPI, .evtchn = evtchn,
-                        .cpu = 0, .u.ipi = ipi };
+        struct irq_info *info = info_for_irq(irq);
+
+        xen_irq_info_common_init(info, irq, IRQT_EVTCHN, evtchn, 0);
 }
 
-static struct irq_info mk_virq_info(unsigned short evtchn, unsigned short virq)
+static void xen_irq_info_ipi_init(unsigned cpu,
+                                  unsigned irq,
+                                  unsigned short evtchn,
+                                  enum ipi_vector ipi)
 {
-        return (struct irq_info) { .type = IRQT_VIRQ, .evtchn = evtchn,
-                        .cpu = 0, .u.virq = virq };
+        struct irq_info *info = info_for_irq(irq);
+
+        xen_irq_info_common_init(info, irq, IRQT_IPI, evtchn, 0);
+
+        info->u.ipi = ipi;
+
+        per_cpu(ipi_to_irq, cpu)[ipi] = irq;
 }
 
-static struct irq_info mk_pirq_info(unsigned short evtchn,
-                                    unsigned short gsi, unsigned short vector)
+static void xen_irq_info_virq_init(unsigned cpu,
+                                   unsigned irq,
+                                   unsigned short evtchn,
+                                   unsigned short virq)
 {
-        return (struct irq_info) { .type = IRQT_PIRQ, .evtchn = evtchn,
-                        .cpu = 0, .u.pirq = { .gsi = gsi, .vector = vector } };
+        struct irq_info *info = info_for_irq(irq);
+
+        xen_irq_info_common_init(info, irq, IRQT_VIRQ, evtchn, 0);
+
+        info->u.virq = virq;
+
+        per_cpu(virq_to_irq, cpu)[virq] = irq;
 }
 
-/*
- * Accessors for packed IRQ information.
- */
-static struct irq_info *info_for_irq(unsigned irq)
+static void xen_irq_info_pirq_init(unsigned irq,
+                                   unsigned short evtchn,
+                                   unsigned short pirq,
+                                   unsigned short gsi,
+                                   unsigned short vector,
+                                   uint16_t domid,
+                                   unsigned char flags)
 {
-        return &irq_info[irq];
+        struct irq_info *info = info_for_irq(irq);
+
+        xen_irq_info_common_init(info, irq, IRQT_PIRQ, evtchn, 0);
+
+        info->u.pirq.pirq = pirq;
+        info->u.pirq.gsi = gsi;
+        info->u.pirq.vector = vector;
+        info->u.pirq.domid = domid;
+        info->u.pirq.flags = flags;
 }
 
+/*
+ * Accessors for packed IRQ information.
+ */
 static unsigned int evtchn_from_irq(unsigned irq)
 {
+        if (unlikely(WARN(irq < 0 || irq >= nr_irqs, "Invalid irq %d!\n", irq)))
+                return 0;
+
         return info_for_irq(irq)->evtchn;
 }
 
@@ -184,24 +238,14 @@ static unsigned virq_from_irq(unsigned irq)
         return info->u.virq;
 }
 
-static unsigned gsi_from_irq(unsigned irq)
-{
-        struct irq_info *info = info_for_irq(irq);
-
-        BUG_ON(info == NULL);
-        BUG_ON(info->type != IRQT_PIRQ);
-
-        return info->u.pirq.gsi;
-}
-
-static unsigned vector_from_irq(unsigned irq)
+static unsigned pirq_from_irq(unsigned irq)
 {
         struct irq_info *info = info_for_irq(irq);
 
         BUG_ON(info == NULL);
         BUG_ON(info->type != IRQT_PIRQ);
 
-        return info->u.pirq.vector;
+        return info->u.pirq.pirq;
 }
 
 static enum xen_irq_type type_from_irq(unsigned irq)
@@ -225,12 +269,21 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
         return ret;
 }
 
+static bool pirq_needs_eoi(unsigned irq)
+{
+        struct irq_info *info = info_for_irq(irq);
+
+        BUG_ON(info->type != IRQT_PIRQ);
+
+        return info->u.pirq.flags & PIRQ_NEEDS_EOI;
+}
+
 static inline unsigned long active_evtchns(unsigned int cpu,
                                            struct shared_info *sh,
                                            unsigned int idx)
 {
         return (sh->evtchn_pending[idx] &
-                cpu_evtchn_mask(cpu)[idx] &
+                per_cpu(cpu_evtchn_mask, cpu)[idx] &
                 ~sh->evtchn_mask[idx]);
 }
 
@@ -240,28 +293,31 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
 
         BUG_ON(irq == -1);
 #ifdef CONFIG_SMP
-        cpumask_copy(irq_to_desc(irq)->affinity, cpumask_of(cpu));
+        cpumask_copy(irq_to_desc(irq)->irq_data.affinity, cpumask_of(cpu));
 #endif
 
-        __clear_bit(chn, cpu_evtchn_mask(cpu_from_irq(irq)));
-        __set_bit(chn, cpu_evtchn_mask(cpu));
+        clear_bit(chn, per_cpu(cpu_evtchn_mask, cpu_from_irq(irq)));
+        set_bit(chn, per_cpu(cpu_evtchn_mask, cpu));
 
-        irq_info[irq].cpu = cpu;
+        info_for_irq(irq)->cpu = cpu;
 }
 
 static void init_evtchn_cpu_bindings(void)
 {
-#ifdef CONFIG_SMP
-        struct irq_desc *desc;
         int i;
+#ifdef CONFIG_SMP
+        struct irq_info *info;
 
         /* By default all event channels notify CPU#0. */
-        for_each_irq_desc(i, desc) {
-                cpumask_copy(desc->affinity, cpumask_of(0));
+        list_for_each_entry(info, &xen_irq_list_head, list) {
+                struct irq_desc *desc = irq_to_desc(info->irq);
+                cpumask_copy(desc->irq_data.affinity, cpumask_of(0));
         }
 #endif
 
-        memset(cpu_evtchn_mask(0), ~0, sizeof(cpu_evtchn_mask(0)));
+        for_each_possible_cpu(i)
+                memset(per_cpu(cpu_evtchn_mask, i),
+                       (i == 0) ? ~0 : 0, sizeof(*per_cpu(cpu_evtchn_mask, i)));
 }
 
 static inline void clear_evtchn(int port)
@@ -318,7 +374,7 @@ static void unmask_evtchn(int port)
                 struct evtchn_unmask unmask = { .port = port };
                 (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask);
         } else {
-                struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
+                struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
 
                 sync_clear_bit(port, &s->evtchn_mask[0]);
 
@@ -336,36 +392,417 @@ static void unmask_evtchn(int port)
         put_cpu();
 }
 
-static int find_unbound_irq(void)
+static void xen_irq_init(unsigned irq)
+{
+        struct irq_info *info;
+#ifdef CONFIG_SMP
+        struct irq_desc *desc = irq_to_desc(irq);
+
+        /* By default all event channels notify CPU#0. */
+        cpumask_copy(desc->irq_data.affinity, cpumask_of(0));
+#endif
+
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (info == NULL)
+                panic("Unable to allocate metadata for IRQ%d\n", irq);
+
+        info->type = IRQT_UNBOUND;
+
+        irq_set_handler_data(irq, info);
+
+        list_add_tail(&info->list, &xen_irq_list_head);
+}
+
+static int __must_check xen_allocate_irq_dynamic(void)
 {
+        int first = 0;
         int irq;
-        struct irq_desc *desc;
 
-        for (irq = 0; irq < nr_irqs; irq++) {
-                desc = irq_to_desc(irq);
-                /* only 0->15 have init'd desc; handle irq > 16 */
-                if (desc == NULL)
-                        break;
-                if (desc->chip == &no_irq_chip)
-                        break;
-                if (desc->chip != &xen_dynamic_chip)
+#ifdef CONFIG_X86_IO_APIC
+        /*
+         * For an HVM guest or domain 0 which see "real" (emulated or
+         * actual respectively) GSIs we allocate dynamic IRQs
+         * e.g. those corresponding to event channels or MSIs
+         * etc. from the range above those "real" GSIs to avoid
+         * collisions.
+         */
+        if (xen_initial_domain() || xen_hvm_domain())
+                first = get_nr_irqs_gsi();
+#endif
+
+        irq = irq_alloc_desc_from(first, -1);
+
+        xen_irq_init(irq);
+
+        return irq;
+}
+
+static int __must_check xen_allocate_irq_gsi(unsigned gsi)
+{
+        int irq;
+
+        /*
+         * A PV guest has no concept of a GSI (since it has no ACPI
+         * nor access to/knowledge of the physical APICs). Therefore
+         * all IRQs are dynamically allocated from the entire IRQ
+         * space.
+         */
+        if (xen_pv_domain() && !xen_initial_domain())
+                return xen_allocate_irq_dynamic();
+
+        /* Legacy IRQ descriptors are already allocated by the arch. */
+        if (gsi < NR_IRQS_LEGACY)
+                irq = gsi;
+        else
+                irq = irq_alloc_desc_at(gsi, -1);
+
+        xen_irq_init(irq);
+
+        return irq;
+}
+
+static void xen_free_irq(unsigned irq)
+{
+        struct irq_info *info = irq_get_handler_data(irq);
+
+        list_del(&info->list);
+
+        irq_set_handler_data(irq, NULL);
+
+        kfree(info);
+
+        /* Legacy IRQ descriptors are managed by the arch. */
+        if (irq < NR_IRQS_LEGACY)
+                return;
+
+        irq_free_desc(irq);
+}
+
+static void pirq_query_unmask(int irq)
+{
+        struct physdev_irq_status_query irq_status;
+        struct irq_info *info = info_for_irq(irq);
+
+        BUG_ON(info->type != IRQT_PIRQ);
+
+        irq_status.irq = pirq_from_irq(irq);
+        if (HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query, &irq_status))
+                irq_status.flags = 0;
+
+        info->u.pirq.flags &= ~PIRQ_NEEDS_EOI;
+        if (irq_status.flags & XENIRQSTAT_needs_eoi)
+                info->u.pirq.flags |= PIRQ_NEEDS_EOI;
+}
+
+static bool probing_irq(int irq)
+{
+        struct irq_desc *desc = irq_to_desc(irq);
+
+        return desc && desc->action == NULL;
+}
+
+static void eoi_pirq(struct irq_data *data)
+{
+        int evtchn = evtchn_from_irq(data->irq);
+        struct physdev_eoi eoi = { .irq = pirq_from_irq(data->irq) };
+        int rc = 0;
+
+        irq_move_irq(data);
+
+        if (VALID_EVTCHN(evtchn))
+                clear_evtchn(evtchn);
+
+        if (pirq_needs_eoi(data->irq)) {
+                rc = HYPERVISOR_physdev_op(PHYSDEVOP_eoi, &eoi);
+                WARN_ON(rc);
+        }
+}
+
+static void mask_ack_pirq(struct irq_data *data)
+{
+        disable_dynirq(data);
+        eoi_pirq(data);
+}
+
+static unsigned int __startup_pirq(unsigned int irq)
+{
+        struct evtchn_bind_pirq bind_pirq;
+        struct irq_info *info = info_for_irq(irq);
+        int evtchn = evtchn_from_irq(irq);
+        int rc;
+
+        BUG_ON(info->type != IRQT_PIRQ);
+
+        if (VALID_EVTCHN(evtchn))
+                goto out;
+
+        bind_pirq.pirq = pirq_from_irq(irq);
+        /* NB. We are happy to share unless we are probing. */
+        bind_pirq.flags = info->u.pirq.flags & PIRQ_SHAREABLE ?
+                                        BIND_PIRQ__WILL_SHARE : 0;
+        rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
+        if (rc != 0) {
+                if (!probing_irq(irq))
+                        printk(KERN_INFO "Failed to obtain physical IRQ %d\n",
+                               irq);
+                return 0;
+        }
+        evtchn = bind_pirq.port;
+
+        pirq_query_unmask(irq);
+
+        evtchn_to_irq[evtchn] = irq;
+        bind_evtchn_to_cpu(evtchn, 0);
+        info->evtchn = evtchn;
+
+out:
+        unmask_evtchn(evtchn);
+        eoi_pirq(irq_get_irq_data(irq));
+
+        return 0;
+}
+
+static unsigned int startup_pirq(struct irq_data *data)
+{
+        return __startup_pirq(data->irq);
+}
+
+static void shutdown_pirq(struct irq_data *data)
+{
+        struct evtchn_close close;
+        unsigned int irq = data->irq;
+        struct irq_info *info = info_for_irq(irq);
+        int evtchn = evtchn_from_irq(irq);
+
+        BUG_ON(info->type != IRQT_PIRQ);
+
+        if (!VALID_EVTCHN(evtchn))
+                return;
+
+        mask_evtchn(evtchn);
+
+        close.port = evtchn;
+        if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
+                BUG();
+
+        bind_evtchn_to_cpu(evtchn, 0);
+        evtchn_to_irq[evtchn] = -1;
+        info->evtchn = 0;
+}
+
+static void enable_pirq(struct irq_data *data)
+{
+        startup_pirq(data);
+}
+
+static void disable_pirq(struct irq_data *data)
+{
+        disable_dynirq(data);
+}
+
+static int find_irq_by_gsi(unsigned gsi)
+{
+        struct irq_info *info;
+
+        list_for_each_entry(info, &xen_irq_list_head, list) {
+                if (info->type != IRQT_PIRQ)
                         continue;
-                if (irq_info[irq].type == IRQT_UNBOUND)
-                        break;
+
+                if (info->u.pirq.gsi == gsi)
+                        return info->irq;
         }
 
-        if (irq == nr_irqs)
-                panic("No available IRQ to bind to: increase nr_irqs!\n");
+        return -1;
+}
 
-        desc = irq_to_desc_alloc_node(irq, 0);
-        if (WARN_ON(desc == NULL))
-                return -1;
+int xen_allocate_pirq_gsi(unsigned gsi)
+{
+        return gsi;
+}
+
+/*
+ * Do not make any assumptions regarding the relationship between the
+ * IRQ number returned here and the Xen pirq argument.
+ *
+ * Note: We don't assign an event channel until the irq actually started
+ * up.  Return an existing irq if we've already got one for the gsi.
+ *
+ * Shareable implies level triggered, not shareable implies edge
+ * triggered here.
+ */
+int xen_bind_pirq_gsi_to_irq(unsigned gsi,
+                             unsigned pirq, int shareable, char *name)
+{
+        int irq = -1;
+        struct physdev_irq irq_op;
+
+        spin_lock(&irq_mapping_update_lock);
+
+        irq = find_irq_by_gsi(gsi);
+        if (irq != -1) {
+                printk(KERN_INFO "xen_map_pirq_gsi: returning irq %d for gsi %u\n",
+                       irq, gsi);
+                goto out;       /* XXX need refcount? */
+        }
+
+        irq = xen_allocate_irq_gsi(gsi);
+        if (irq < 0)
+                goto out;
+
+        irq_op.irq = irq;
+        irq_op.vector = 0;
+
+        /* Only the privileged domain can do this. For non-priv, the pcifront
+         * driver provides a PCI bus that does the call to do exactly
+         * this in the priv domain. */
+        if (xen_initial_domain() &&
+            HYPERVISOR_physdev_op(PHYSDEVOP_alloc_irq_vector, &irq_op)) {
+                xen_free_irq(irq);
+                irq = -ENOSPC;
+                goto out;
+        }
+
+        xen_irq_info_pirq_init(irq, 0, pirq, gsi, irq_op.vector, DOMID_SELF,
+                               shareable ? PIRQ_SHAREABLE : 0);
+
+        pirq_query_unmask(irq);
+        /* We try to use the handler with the appropriate semantic for the
+         * type of interrupt: if the interrupt is an edge triggered
+         * interrupt we use handle_edge_irq.
+         *
+         * On the other hand if the interrupt is level triggered we use
+         * handle_fasteoi_irq like the native code does for this kind of
+         * interrupts.
+         *
+         * Depending on the Xen version, pirq_needs_eoi might return true
+         * not only for level triggered interrupts but for edge triggered
+         * interrupts too. In any case Xen always honors the eoi mechanism,
+         * not injecting any more pirqs of the same kind if the first one
+         * hasn't received an eoi yet. Therefore using the fasteoi handler
+         * is the right choice either way.
+         */
+        if (shareable)
+                irq_set_chip_and_handler_name(irq, &xen_pirq_chip,
+                                handle_fasteoi_irq, name);
+        else
+                irq_set_chip_and_handler_name(irq, &xen_pirq_chip,
+                                handle_edge_irq, name);
+
+out:
+        spin_unlock(&irq_mapping_update_lock);
+
+        return irq;
+}
+
+#ifdef CONFIG_PCI_MSI
+int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc)
+{
+        int rc;
+        struct physdev_get_free_pirq op_get_free_pirq;
+
+        op_get_free_pirq.type = MAP_PIRQ_TYPE_MSI;
+        rc = HYPERVISOR_physdev_op(PHYSDEVOP_get_free_pirq, &op_get_free_pirq);
+
+        WARN_ONCE(rc == -ENOSYS,
+                  "hypervisor does not support the PHYSDEVOP_get_free_pirq interface\n");
+
+        return rc ? -1 : op_get_free_pirq.pirq;
+}
+
+int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
+                             int pirq, int vector, const char *name,
+                             domid_t domid)
+{
+        int irq, ret;
+
+        spin_lock(&irq_mapping_update_lock);
+
+        irq = xen_allocate_irq_dynamic();
+        if (irq == -1)
+                goto out;
+
+        irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_edge_irq,
+                        name);
+
+        xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, domid, 0);
+        ret = irq_set_msi_desc(irq, msidesc);
+        if (ret < 0)
+                goto error_irq;
+out:
+        spin_unlock(&irq_mapping_update_lock);
+        return irq;
+error_irq:
+        spin_unlock(&irq_mapping_update_lock);
+        xen_free_irq(irq);
+        return -1;
+}
+#endif
+
+int xen_destroy_irq(int irq)
+{
+        struct irq_desc *desc;
+        struct physdev_unmap_pirq unmap_irq;
+        struct irq_info *info = info_for_irq(irq);
+        int rc = -ENOENT;
+
+        spin_lock(&irq_mapping_update_lock);
+
+        desc = irq_to_desc(irq);
+        if (!desc)
+                goto out;
+
+        if (xen_initial_domain()) {
+                unmap_irq.pirq = info->u.pirq.pirq;
+                unmap_irq.domid = info->u.pirq.domid;
+                rc = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap_irq);
+                /* If another domain quits without making the pci_disable_msix
+                 * call, the Xen hypervisor takes care of freeing the PIRQs
+                 * (free_domain_pirqs).
+                 */
+                if ((rc == -ESRCH && info->u.pirq.domid != DOMID_SELF))
+                        printk(KERN_INFO "domain %d does not have %d anymore\n",
+                                info->u.pirq.domid, info->u.pirq.pirq);
+                else if (rc) {
+                        printk(KERN_WARNING "unmap irq failed %d\n", rc);
+                        goto out;
+                }
+        }
+
+        xen_free_irq(irq);
+
+out:
+        spin_unlock(&irq_mapping_update_lock);
+        return rc;
+}
+
+int xen_irq_from_pirq(unsigned pirq)
+{
+        int irq;
+
+        struct irq_info *info;
 
-        dynamic_irq_init_keep_chip_data(irq);
+        spin_lock(&irq_mapping_update_lock);
+
+        list_for_each_entry(info, &xen_irq_list_head, list) {
+                if (info == NULL || info->type != IRQT_PIRQ)
+                        continue;
+                irq = info->irq;
+                if (info->u.pirq.pirq == pirq)
+                        goto out;
+        }
+        irq = -1;
+out:
+        spin_unlock(&irq_mapping_update_lock);
 
         return irq;
 }
 
+
+int xen_pirq_from_irq(unsigned irq)
+{
+        return pirq_from_irq(irq);
+}
+EXPORT_SYMBOL_GPL(xen_pirq_from_irq);
 int bind_evtchn_to_irq(unsigned int evtchn)
 {
         int irq;
@@ -375,15 +812,17 @@ int bind_evtchn_to_irq(unsigned int evtchn)
         irq = evtchn_to_irq[evtchn];
 
         if (irq == -1) {
-                irq = find_unbound_irq();
+                irq = xen_allocate_irq_dynamic();
+                if (irq == -1)
+                        goto out;
 
-                set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
+                irq_set_chip_and_handler_name(irq, &xen_dynamic_chip,
                                               handle_edge_irq, "event");
 
-                evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_evtchn_info(evtchn);
+                xen_irq_info_evtchn_init(irq, evtchn);
         }
 
+out:
         spin_unlock(&irq_mapping_update_lock);
 
         return irq;
@@ -400,11 +839,11 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
         irq = per_cpu(ipi_to_irq, cpu)[ipi];
 
         if (irq == -1) {
-                irq = find_unbound_irq();
+                irq = xen_allocate_irq_dynamic();
                 if (irq < 0)
                         goto out;
 
-                set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
+                irq_set_chip_and_handler_name(irq, &xen_percpu_chip,
                                               handle_percpu_irq, "ipi");
 
                 bind_ipi.vcpu = cpu;
@@ -413,9 +852,7 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
                         BUG();
                 evtchn = bind_ipi.port;
 
-                evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_ipi_info(evtchn, ipi);
-                per_cpu(ipi_to_irq, cpu)[ipi] = irq;
+                xen_irq_info_ipi_init(cpu, irq, evtchn, ipi);
 
                 bind_evtchn_to_cpu(evtchn, cpu);
         }
@@ -425,8 +862,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
         return irq;
 }
 
+static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
+                                          unsigned int remote_port)
+{
+        struct evtchn_bind_interdomain bind_interdomain;
+        int err;
+
+        bind_interdomain.remote_dom  = remote_domain;
+        bind_interdomain.remote_port = remote_port;
+
+        err = HYPERVISOR_event_channel_op(EVTCHNOP_bind_interdomain,
+                                          &bind_interdomain);
+
+        return err ? : bind_evtchn_to_irq(bind_interdomain.local_port);
+}
+
 
-static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
+int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
 {
         struct evtchn_bind_virq bind_virq;
         int evtchn, irq;
@@ -436,6 +888,13 @@ static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
         irq = per_cpu(virq_to_irq, cpu)[virq];
 
         if (irq == -1) {
+                irq = xen_allocate_irq_dynamic();
+                if (irq == -1)
+                        goto out;
+
+                irq_set_chip_and_handler_name(irq, &xen_percpu_chip,
+                                              handle_percpu_irq, "virq");
+
                 bind_virq.virq = virq;
                 bind_virq.vcpu = cpu;
                 if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
@@ -443,19 +902,12 @@ static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
                         BUG();
                 evtchn = bind_virq.port;
 
-                irq = find_unbound_irq();
-
-                set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
-                                              handle_percpu_irq, "virq");
-
-                evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_virq_info(evtchn, virq);
-
-                per_cpu(virq_to_irq, cpu)[virq] = irq;
+                xen_irq_info_virq_init(cpu, irq, evtchn, virq);
 
                 bind_evtchn_to_cpu(evtchn, cpu);
         }
 
+out:
         spin_unlock(&irq_mapping_update_lock);
 
         return irq;
@@ -492,11 +944,9 @@ static void unbind_from_irq(unsigned int irq)
                 evtchn_to_irq[evtchn] = -1;
         }
 
-        if (irq_info[irq].type != IRQT_UNBOUND) {
-                irq_info[irq] = mk_unbound_info();
+        BUG_ON(info_for_irq(irq)->type == IRQT_UNBOUND);
 
-                dynamic_irq_cleanup(irq);
-        }
+        xen_free_irq(irq);
 
         spin_unlock(&irq_mapping_update_lock);
 }
@@ -506,10 +956,11 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
                               unsigned long irqflags,
                               const char *devname, void *dev_id)
 {
-        unsigned int irq;
-        int retval;
+        int irq, retval;
 
         irq = bind_evtchn_to_irq(evtchn);
+        if (irq < 0)
+                return irq;
         retval = request_irq(irq, handler, irqflags, devname, dev_id);
         if (retval != 0) {
                 unbind_from_irq(irq);
@@ -520,14 +971,38 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
 }
 EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
 
+int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
+                                          unsigned int remote_port,
+                                          irq_handler_t handler,
+                                          unsigned long irqflags,
+                                          const char *devname,
+                                          void *dev_id)
+{
+        int irq, retval;
+
+        irq = bind_interdomain_evtchn_to_irq(remote_domain, remote_port);
+        if (irq < 0)
+                return irq;
+
+        retval = request_irq(irq, handler, irqflags, devname, dev_id);
+        if (retval != 0) {
+                unbind_from_irq(irq);
+                return retval;
+        }
+
+        return irq;
+}
+EXPORT_SYMBOL_GPL(bind_interdomain_evtchn_to_irqhandler);
+
 int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
                             irq_handler_t handler,
                             unsigned long irqflags, const char *devname, void *dev_id)
 {
-        unsigned int irq;
-        int retval;
+        int irq, retval;
 
         irq = bind_virq_to_irq(virq, cpu);
+        if (irq < 0)
+                return irq;
         retval = request_irq(irq, handler, irqflags, devname, dev_id);
         if (retval != 0) {
                 unbind_from_irq(irq);
@@ -551,7 +1026,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
         if (irq < 0)
                 return irq;
 
-        irqflags |= IRQF_NO_SUSPEND;
+        irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME;
         retval = request_irq(irq, handler, irqflags, devname, dev_id);
         if (retval != 0) {
                 unbind_from_irq(irq);
@@ -579,41 +1054,75 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
 {
         struct shared_info *sh = HYPERVISOR_shared_info;
         int cpu = smp_processor_id();
+        unsigned long *cpu_evtchn = per_cpu(cpu_evtchn_mask, cpu);
         int i;
         unsigned long flags;
         static DEFINE_SPINLOCK(debug_lock);
+        struct vcpu_info *v;
 
         spin_lock_irqsave(&debug_lock, flags);
 
-        printk("vcpu %d\n  ", cpu);
+        printk("\nvcpu %d\n  ", cpu);
 
         for_each_online_cpu(i) {
-                struct vcpu_info *v = per_cpu(xen_vcpu, i);
-                printk("%d: masked=%d pending=%d event_sel %08lx\n  ", i,
-                        (get_irq_regs() && i == cpu) ? xen_irqs_disabled(get_irq_regs()) : v->evtchn_upcall_mask,
-                        v->evtchn_upcall_pending,
-                        v->evtchn_pending_sel);
+                int pending;
+                v = per_cpu(xen_vcpu, i);
+                pending = (get_irq_regs() && i == cpu)
+                        ? xen_irqs_disabled(get_irq_regs())
+                        : v->evtchn_upcall_mask;
+                printk("%d: masked=%d pending=%d event_sel %0*lx\n  ", i,
+                       pending, v->evtchn_upcall_pending,
+                       (int)(sizeof(v->evtchn_pending_sel)*2),
+                       v->evtchn_pending_sel);
+        }
+        v = per_cpu(xen_vcpu, cpu);
+
+        printk("\npending:\n   ");
+        for (i = ARRAY_SIZE(sh->evtchn_pending)-1; i >= 0; i--)
+                printk("%0*lx%s", (int)sizeof(sh->evtchn_pending[0])*2,
+                       sh->evtchn_pending[i],
+                       i % 8 == 0 ? "\n   " : " ");
+        printk("\nglobal mask:\n   ");
+        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
+                printk("%0*lx%s",
+                       (int)(sizeof(sh->evtchn_mask[0])*2),
+                       sh->evtchn_mask[i],
+                       i % 8 == 0 ? "\n   " : " ");
+
+        printk("\nglobally unmasked:\n   ");
+        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
+                printk("%0*lx%s", (int)(sizeof(sh->evtchn_mask[0])*2),
+                       sh->evtchn_pending[i] & ~sh->evtchn_mask[i],
+                       i % 8 == 0 ? "\n   " : " ");
+
+        printk("\nlocal cpu%d mask:\n   ", cpu);
+        for (i = (NR_EVENT_CHANNELS/BITS_PER_LONG)-1; i >= 0; i--)
+                printk("%0*lx%s", (int)(sizeof(cpu_evtchn[0])*2),
+                       cpu_evtchn[i],
+                       i % 8 == 0 ? "\n   " : " ");
+
+        printk("\nlocally unmasked:\n   ");
+        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--) {
+                unsigned long pending = sh->evtchn_pending[i]
+                        & ~sh->evtchn_mask[i]
+                        & cpu_evtchn[i];
+                printk("%0*lx%s", (int)(sizeof(sh->evtchn_mask[0])*2),
+                       pending, i % 8 == 0 ? "\n   " : " ");
         }
-        printk("pending:\n   ");
-        for(i = ARRAY_SIZE(sh->evtchn_pending)-1; i >= 0; i--)
-                printk("%08lx%s", sh->evtchn_pending[i],
-                        i % 8 == 0 ? "\n   " : " ");
-        printk("\nmasks:\n   ");
-        for(i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
-                printk("%08lx%s", sh->evtchn_mask[i],
-                        i % 8 == 0 ? "\n   " : " ");
-
-        printk("\nunmasked:\n   ");
-        for(i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
-                printk("%08lx%s", sh->evtchn_pending[i] & ~sh->evtchn_mask[i],
-                        i % 8 == 0 ? "\n   " : " ");
 
         printk("\npending list:\n");
-        for(i = 0; i < NR_EVENT_CHANNELS; i++) {
+        for (i = 0; i < NR_EVENT_CHANNELS; i++) {
                 if (sync_test_bit(i, sh->evtchn_pending)) {
-                        printk("  %d: event %d -> irq %d\n",
+                        int word_idx = i / BITS_PER_LONG;
+                        printk("  %d: event %d -> irq %d%s%s%s\n",
                                cpu_from_evtchn(i), i,
-                               evtchn_to_irq[i]);
+                               evtchn_to_irq[i],
+                               sync_test_bit(word_idx, &v->evtchn_pending_sel)
+                                             ? "" : " l2-clear",
+                               !sync_test_bit(i, sh->evtchn_mask)
+                                             ? "" : " globally-masked",
+                               sync_test_bit(i, cpu_evtchn)
+                                             ? "" : " locally-masked");
                 }
         }
 
@@ -623,6 +1132,13 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
 }
 
 static DEFINE_PER_CPU(unsigned, xed_nesting_count);
+static DEFINE_PER_CPU(unsigned int, current_word_idx);
+static DEFINE_PER_CPU(unsigned int, current_bit_idx);
+
+/*
+ * Mask out the i least significant bits of w
+ */
+#define MASK_LSBS(w, i) (w & ((~0UL) << i))
 
 /*
  * Search the CPUs pending events bitmasks.  For each one found, map
@@ -635,9 +1151,12 @@ static DEFINE_PER_CPU(unsigned, xed_nesting_count);
  */
 static void __xen_evtchn_do_upcall(void)
 {
+        int start_word_idx, start_bit_idx;
+        int word_idx, bit_idx;
+        int i;
         int cpu = get_cpu();
         struct shared_info *s = HYPERVISOR_shared_info;
-        struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
+        struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
         unsigned count;
 
         do {
@@ -645,7 +1164,7 @@ static void __xen_evtchn_do_upcall(void)
 
                 vcpu_info->evtchn_upcall_pending = 0;
 
-                if (__get_cpu_var(xed_nesting_count)++)
+                if (__this_cpu_inc_return(xed_nesting_count) - 1)
                         goto out;
 
 #ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */
@@ -653,29 +1172,83 @@ static void __xen_evtchn_do_upcall(void)
                 wmb();
 #endif
                 pending_words = xchg(&vcpu_info->evtchn_pending_sel, 0);
-                while (pending_words != 0) {
+
+                start_word_idx = __this_cpu_read(current_word_idx);
+                start_bit_idx = __this_cpu_read(current_bit_idx);
+
+                word_idx = start_word_idx;
+
+                for (i = 0; pending_words != 0; i++) {
                         unsigned long pending_bits;
-                        int word_idx = __ffs(pending_words);
-                        pending_words &= ~(1UL << word_idx);
+                        unsigned long words;
+
+                        words = MASK_LSBS(pending_words, word_idx);
+
+                        /*
+                         * If we masked out all events, wrap to beginning.
+                         */
+                        if (words == 0) {
+                                word_idx = 0;
+                                bit_idx = 0;
+                                continue;
+                        }
+                        word_idx = __ffs(words);
+
+                        pending_bits = active_evtchns(cpu, s, word_idx);
+                        bit_idx = 0; /* usually scan entire word from start */
+                        if (word_idx == start_word_idx) {
+                                /* We scan the starting word in two parts */
+                                if (i == 0)
+                                        /* 1st time: start in the middle */
+                                        bit_idx = start_bit_idx;
+                                else
+                                        /* 2nd time: mask bits done already */
+                                        bit_idx &= (1UL << start_bit_idx) - 1;
+                        }
 
-                        while ((pending_bits = active_evtchns(cpu, s, word_idx)) != 0) {
-                                int bit_idx = __ffs(pending_bits);
-                                int port = (word_idx * BITS_PER_LONG) + bit_idx;
-                                int irq = evtchn_to_irq[port];
+                        do {
+                                unsigned long bits;
+                                int port, irq;
                                 struct irq_desc *desc;
 
+                                bits = MASK_LSBS(pending_bits, bit_idx);
+
+                                /* If we masked out all events, move on. */
+                                if (bits == 0)
+                                        break;
+
+                                bit_idx = __ffs(bits);
+
+                                /* Process port. */
+                                port = (word_idx * BITS_PER_LONG) + bit_idx;
+                                irq = evtchn_to_irq[port];
+
                                 if (irq != -1) {
                                         desc = irq_to_desc(irq);
                                         if (desc)
                                                 generic_handle_irq_desc(irq, desc);
                                 }
-                        }
+
+                                bit_idx = (bit_idx + 1) % BITS_PER_LONG;
+
+                                /* Next caller starts at last processed + 1 */
+                                __this_cpu_write(current_word_idx,
+                                                 bit_idx ? word_idx :
+                                                 (word_idx+1) % BITS_PER_LONG);
+                                __this_cpu_write(current_bit_idx, bit_idx);
+                        } while (bit_idx != 0);
+
+                        /* Scan start_l1i twice; all others once. */
+                        if ((word_idx != start_word_idx) || (i != 0))
+                                pending_words &= ~(1UL << word_idx);
+
+                        word_idx = (word_idx + 1) % BITS_PER_LONG;
                 }
 
                 BUG_ON(!irqs_disabled());
 
-                count = __get_cpu_var(xed_nesting_count);
-                __get_cpu_var(xed_nesting_count) = 0;
+                count = __this_cpu_read(xed_nesting_count);
+                __this_cpu_write(xed_nesting_count, 0);
         } while (count != 1 || vcpu_info->evtchn_upcall_pending);
 
 out:
@@ -719,8 +1292,7 @@ void rebind_evtchn_irq(int evtchn, int irq)
            so there should be a proper type */
         BUG_ON(info->type == IRQT_UNBOUND);
 
-        evtchn_to_irq[evtchn] = irq;
-        irq_info[irq] = mk_evtchn_info(evtchn);
+        xen_irq_info_evtchn_init(irq, evtchn);
 
         spin_unlock(&irq_mapping_update_lock);
 
@@ -737,10 +1309,14 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
         struct evtchn_bind_vcpu bind_vcpu;
         int evtchn = evtchn_from_irq(irq);
 
-        /* events delivered via platform PCI interrupts are always
-         * routed to vcpu 0 */
-        if (!VALID_EVTCHN(evtchn) ||
-                (xen_hvm_domain() && !xen_have_vector_callback))
+        if (!VALID_EVTCHN(evtchn))
+                return -1;
+
+        /*
+         * Events delivered via platform PCI interrupts are always
+         * routed to vcpu 0 and hence cannot be rebound.
+         */
+        if (xen_hvm_domain() && !xen_have_vector_callback)
                 return -1;
 
         /* Send future instances of this interrupt to other vcpu. */
@@ -758,11 +1334,12 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
         return 0;
 }
 
-static int set_affinity_irq(unsigned irq, const struct cpumask *dest)
+static int set_affinity_irq(struct irq_data *data, const struct cpumask *dest,
+                            bool force)
 {
         unsigned tcpu = cpumask_first(dest);
 
-        return rebind_irq_to_cpu(irq, tcpu);
+        return rebind_irq_to_cpu(data->irq, tcpu);
 }
 
 int resend_irq_on_evtchn(unsigned int irq)
@@ -781,35 +1358,41 @@ int resend_irq_on_evtchn(unsigned int irq)
         return 1;
 }
 
-static void enable_dynirq(unsigned int irq)
+static void enable_dynirq(struct irq_data *data)
 {
-        int evtchn = evtchn_from_irq(irq);
+        int evtchn = evtchn_from_irq(data->irq);
 
         if (VALID_EVTCHN(evtchn))
                 unmask_evtchn(evtchn);
 }
 
-static void disable_dynirq(unsigned int irq)
+static void disable_dynirq(struct irq_data *data)
 {
-        int evtchn = evtchn_from_irq(irq);
+        int evtchn = evtchn_from_irq(data->irq);
 
         if (VALID_EVTCHN(evtchn))
                 mask_evtchn(evtchn);
 }
 
-static void ack_dynirq(unsigned int irq)
+static void ack_dynirq(struct irq_data *data)
 {
-        int evtchn = evtchn_from_irq(irq);
+        int evtchn = evtchn_from_irq(data->irq);
 
-        move_native_irq(irq);
+        irq_move_irq(data);
 
         if (VALID_EVTCHN(evtchn))
                 clear_evtchn(evtchn);
 }
 
-static int retrigger_dynirq(unsigned int irq)
+static void mask_ack_dynirq(struct irq_data *data)
 {
-        int evtchn = evtchn_from_irq(irq);
+        disable_dynirq(data);
+        ack_dynirq(data);
+}
+
+static int retrigger_dynirq(struct irq_data *data)
+{
+        int evtchn = evtchn_from_irq(data->irq);
         struct shared_info *sh = HYPERVISOR_shared_info;
         int ret = 0;
 
@@ -826,6 +1409,44 @@ static int retrigger_dynirq(unsigned int irq)
         return ret;
 }
 
+static void restore_pirqs(void)
+{
+        int pirq, rc, irq, gsi;
+        struct physdev_map_pirq map_irq;
+        struct irq_info *info;
+
+        list_for_each_entry(info, &xen_irq_list_head, list) {
+                if (info->type != IRQT_PIRQ)
+                        continue;
+
+                pirq = info->u.pirq.pirq;
+                gsi = info->u.pirq.gsi;
+                irq = info->irq;
+
+                /* save/restore of PT devices doesn't work, so at this point the
+                 * only devices present are GSI based emulated devices */
+                if (!gsi)
+                        continue;
+
+                map_irq.domid = DOMID_SELF;
+                map_irq.type = MAP_PIRQ_TYPE_GSI;
+                map_irq.index = gsi;
+                map_irq.pirq = pirq;
+
+                rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
+                if (rc) {
+                        printk(KERN_WARNING "xen map irq failed gsi=%d irq=%d pirq=%d rc=%d\n",
+                                        gsi, irq, pirq, rc);
+                        xen_free_irq(irq);
+                        continue;
+                }
+
+                printk(KERN_DEBUG "xen: --> irq=%d, pirq=%d\n", irq, map_irq.pirq);
+
+                __startup_pirq(irq);
+        }
+}
+
 static void restore_cpu_virqs(unsigned int cpu)
 {
         struct evtchn_bind_virq bind_virq;
@@ -846,12 +1467,8 @@ static void restore_cpu_virqs(unsigned int cpu)
                 evtchn = bind_virq.port;
 
                 /* Record the new mapping. */
-                evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_virq_info(evtchn, virq);
+                xen_irq_info_virq_init(cpu, irq, evtchn, virq);
                 bind_evtchn_to_cpu(evtchn, cpu);
-
-                /* Ready for use. */
-                unmask_evtchn(evtchn);
         }
 }
 
@@ -874,13 +1491,8 @@ static void restore_cpu_ipis(unsigned int cpu)
                 evtchn = bind_ipi.port;
 
                 /* Record the new mapping. */
-                evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_ipi_info(evtchn, ipi);
+                xen_irq_info_ipi_init(cpu, irq, evtchn, ipi);
                 bind_evtchn_to_cpu(evtchn, cpu);
-
-                /* Ready for use. */
-                unmask_evtchn(evtchn);
-
         }
 }
 
@@ -892,7 +1504,7 @@ void xen_clear_irq_pending(int irq)
         if (VALID_EVTCHN(evtchn))
                 clear_evtchn(evtchn);
 }
-
+EXPORT_SYMBOL(xen_clear_irq_pending);
 void xen_set_irq_pending(int irq)
 {
         int evtchn = evtchn_from_irq(irq);
@@ -912,9 +1524,9 @@ bool xen_test_irq_pending(int irq)
         return ret;
 }
 
-/* Poll waiting for an irq to become pending.  In the usual case, the
-   irq will be disabled so it won't deliver an interrupt. */
-void xen_poll_irq(int irq)
+/* Poll waiting for an irq to become pending with timeout.  In the usual case,
+ * the irq will be disabled so it won't deliver an interrupt. */
+void xen_poll_irq_timeout(int irq, u64 timeout)
 {
         evtchn_port_t evtchn = evtchn_from_irq(irq);
 
@@ -922,17 +1534,37 @@ void xen_poll_irq(int irq)
                 struct sched_poll poll;
 
                 poll.nr_ports = 1;
-                poll.timeout = 0;
+                poll.timeout = timeout;
                 set_xen_guest_handle(poll.ports, &evtchn);
 
                 if (HYPERVISOR_sched_op(SCHEDOP_poll, &poll) != 0)
                         BUG();
         }
 }
+EXPORT_SYMBOL(xen_poll_irq_timeout);
+/* Poll waiting for an irq to become pending.  In the usual case, the
+ * irq will be disabled so it won't deliver an interrupt. */
+void xen_poll_irq(int irq)
+{
+        xen_poll_irq_timeout(irq, 0 /* no timeout */);
+}
+
+/* Check whether the IRQ line is shared with other guests. */
+int xen_test_irq_shared(int irq)
+{
+        struct irq_info *info = info_for_irq(irq);
+        struct physdev_irq_status_query irq_status = { .irq = info->u.pirq.pirq };
+
+        if (HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query, &irq_status))
+                return 0;
+        return !(irq_status.flags & XENIRQSTAT_shared);
+}
+EXPORT_SYMBOL_GPL(xen_test_irq_shared);
 
 void xen_irq_resume(void)
 {
-        unsigned int cpu, irq, evtchn;
+        unsigned int cpu, evtchn;
+        struct irq_info *info;
 
         init_evtchn_cpu_bindings();
 
@@ -941,8 +1573,8 @@ void xen_irq_resume(void)
                 mask_evtchn(evtchn);
 
         /* No IRQ <-> event-channel mappings. */
-        for (irq = 0; irq < nr_irqs; irq++)
-                irq_info[irq].evtchn = 0; /* zap event-channel binding */
+        list_for_each_entry(info, &xen_irq_list_head, list)
+                info->evtchn = 0; /* zap event-channel binding */
 
         for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++)
                 evtchn_to_irq[evtchn] = -1;
@@ -951,28 +1583,52 @@ void xen_irq_resume(void)
                 restore_cpu_virqs(cpu);
                 restore_cpu_ipis(cpu);
         }
+
+        restore_pirqs();
 }
 
 static struct irq_chip xen_dynamic_chip __read_mostly = {
-        .name           = "xen-dyn",
+        .name                   = "xen-dyn",
+
+        .irq_disable            = disable_dynirq,
+        .irq_mask               = disable_dynirq,
+        .irq_unmask             = enable_dynirq,
+
+        .irq_ack                = ack_dynirq,
+        .irq_mask_ack           = mask_ack_dynirq,
+
+        .irq_set_affinity       = set_affinity_irq,
+        .irq_retrigger          = retrigger_dynirq,
+};
 
-        .disable        = disable_dynirq,
-        .mask           = disable_dynirq,
-        .unmask         = enable_dynirq,
+static struct irq_chip xen_pirq_chip __read_mostly = {
+        .name                   = "xen-pirq",
 
-        .ack            = ack_dynirq,
-        .set_affinity   = set_affinity_irq,
-        .retrigger      = retrigger_dynirq,
+        .irq_startup            = startup_pirq,
+        .irq_shutdown           = shutdown_pirq,
+        .irq_enable             = enable_pirq,
+        .irq_disable            = disable_pirq,
+
+        .irq_mask               = disable_dynirq,
+        .irq_unmask             = enable_dynirq,
+
+        .irq_ack                = eoi_pirq,
+        .irq_eoi                = eoi_pirq,
+        .irq_mask_ack           = mask_ack_pirq,
+
+        .irq_set_affinity       = set_affinity_irq,
+
+        .irq_retrigger          = retrigger_dynirq,
 };
 
 static struct irq_chip xen_percpu_chip __read_mostly = {
-        .name           = "xen-percpu",
+        .name                   = "xen-percpu",
 
-        .disable        = disable_dynirq,
-        .mask           = disable_dynirq,
-        .unmask         = enable_dynirq,
+        .irq_disable            = disable_dynirq,
+        .irq_mask               = disable_dynirq,
+        .irq_unmask             = enable_dynirq,
 
-        .ack            = ack_dynirq,
+        .irq_ack                = ack_dynirq,
 };
 
 int xen_set_callback_via(uint64_t via)
@@ -1017,9 +1673,10 @@ void __init xen_init_IRQ(void)
 {
         int i;
 
-        cpu_evtchn_mask_p = kcalloc(nr_cpu_ids, sizeof(struct cpu_evtchn_s),
+        evtchn_to_irq = kcalloc(NR_EVENT_CHANNELS, sizeof(*evtchn_to_irq),
                                     GFP_KERNEL);
-        BUG_ON(cpu_evtchn_mask_p == NULL);
+        for (i = 0; i < NR_EVENT_CHANNELS; i++)
+                evtchn_to_irq[i] = -1;
 
         init_evtchn_cpu_bindings();
 
@@ -1030,7 +1687,12 @@ void __init xen_init_IRQ(void)
         if (xen_hvm_domain()) {
                 xen_callback_vector();
                 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 */
+                pci_xen_hvm_init();
         } else {
                 irq_ctx_init(smp_processor_id());
+                if (xen_initial_domain())
+                        xen_setup_pirqs();
         }
 }