1 files changed, 24 insertions, 183 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 0be4df39e95..44490de5aec 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -31,16 +31,13 @@
 #include <linux/irqnr.h>
 #include <linux/pci.h>
 
-#ifdef CONFIG_X86
 #include <asm/desc.h>
 #include <asm/ptrace.h>
 #include <asm/irq.h>
 #include <asm/idle.h>
 #include <asm/io_apic.h>
-#include <asm/xen/page.h>
-#include <asm/xen/pci.h>
-#endif
 #include <asm/sync_bitops.h>
+#include <asm/xen/pci.h>
 #include <asm/xen/hypercall.h>
 #include <asm/xen/hypervisor.h>
 
@@ -52,9 +49,6 @@
 #include <xen/interface/event_channel.h>
 #include <xen/interface/hvm/hvm_op.h>
 #include <xen/interface/hvm/params.h>
-#include <xen/interface/physdev.h>
-#include <xen/interface/sched.h>
-#include <asm/hw_irq.h>
 
 /*
  * This lock protects updates to the following mapping and reference-count
@@ -91,9 +85,9 @@ enum xen_irq_type {
  *    IPI - IPI vector
  *    EVTCHN -
  */
-struct irq_info {
+struct irq_info
+{
         struct list_head list;
-        int refcnt;
         enum xen_irq_type type; /* type */
         unsigned irq;
         unsigned short evtchn;  /* event channel */
@@ -115,10 +109,6 @@ struct irq_info {
 #define PIRQ_SHAREABLE  (1 << 1)
 
 static int *evtchn_to_irq;
-#ifdef CONFIG_X86
-static unsigned long *pirq_eoi_map;
-#endif
-static bool (*pirq_needs_eoi)(unsigned irq);
 
 static DEFINE_PER_CPU(unsigned long [NR_EVENT_CHANNELS/BITS_PER_LONG],
                       cpu_evtchn_mask);
@@ -279,16 +269,10 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
         return ret;
 }
 
-#ifdef CONFIG_X86
-static bool pirq_check_eoi_map(unsigned irq)
-{
-        return test_bit(pirq_from_irq(irq), pirq_eoi_map);
-}
-#endif
-
-static bool pirq_needs_eoi_flag(unsigned irq)
+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;
@@ -298,9 +282,9 @@ static inline unsigned long active_evtchns(unsigned int cpu,
                                            struct shared_info *sh,
                                            unsigned int idx)
 {
-        return sh->evtchn_pending[idx] &
+        return (sh->evtchn_pending[idx] &
                 per_cpu(cpu_evtchn_mask, cpu)[idx] &
-                ~sh->evtchn_mask[idx];
+                ~sh->evtchn_mask[idx]);
 }
 
 static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
@@ -382,22 +366,11 @@ static void unmask_evtchn(int port)
 {
         struct shared_info *s = HYPERVISOR_shared_info;
         unsigned int cpu = get_cpu();
-        int do_hypercall = 0, evtchn_pending = 0;
 
         BUG_ON(!irqs_disabled());
 
-        if (unlikely((cpu != cpu_from_evtchn(port))))
-                do_hypercall = 1;
-        else
-                evtchn_pending = sync_test_bit(port, &s->evtchn_pending[0]);
-
-        if (unlikely(evtchn_pending && xen_hvm_domain()))
-                do_hypercall = 1;
-
-        /* Slow path (hypercall) if this is a non-local port or if this is
-         * an hvm domain and an event is pending (hvm domains don't have
-         * their own implementation of irq_enable). */
-        if (do_hypercall) {
+        /* Slow path (hypercall) if this is a non-local port. */
+        if (unlikely(cpu != cpu_from_evtchn(port))) {
                 struct evtchn_unmask unmask = { .port = port };
                 (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask);
         } else {
@@ -410,7 +383,7 @@ static void unmask_evtchn(int port)
                  * 'hw_resend_irq'. Just like a real IO-APIC we 'lose
                  * the interrupt edge' if the channel is masked.
                  */
-                if (evtchn_pending &&
+                if (sync_test_bit(port, &s->evtchn_pending[0]) &&
                     !sync_test_and_set_bit(port / BITS_PER_LONG,
                                            &vcpu_info->evtchn_pending_sel))
                         vcpu_info->evtchn_upcall_pending = 1;
@@ -434,7 +407,6 @@ static void xen_irq_init(unsigned irq)
                 panic("Unable to allocate metadata for IRQ%d\n", irq);
 
         info->type = IRQT_UNBOUND;
-        info->refcnt = -1;
 
         irq_set_handler_data(irq, info);
 
@@ -460,8 +432,7 @@ static int __must_check xen_allocate_irq_dynamic(void)
 
         irq = irq_alloc_desc_from(first, -1);
 
-        if (irq >= 0)
-                xen_irq_init(irq);
+        xen_irq_init(irq);
 
         return irq;
 }
@@ -498,8 +469,6 @@ static void xen_free_irq(unsigned irq)
 
         irq_set_handler_data(irq, NULL);
 
-        WARN_ON(info->refcnt > 0);
-
         kfree(info);
 
         /* Legacy IRQ descriptors are managed by the arch. */
@@ -631,7 +600,7 @@ static void disable_pirq(struct irq_data *data)
         disable_dynirq(data);
 }
 
-int xen_irq_from_gsi(unsigned gsi)
+static int find_irq_by_gsi(unsigned gsi)
 {
         struct irq_info *info;
 
@@ -645,7 +614,6 @@ int xen_irq_from_gsi(unsigned gsi)
 
         return -1;
 }
-EXPORT_SYMBOL_GPL(xen_irq_from_gsi);
 
 /*
  * Do not make any assumptions regarding the relationship between the
@@ -665,11 +633,11 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
 
         mutex_lock(&irq_mapping_update_lock);
 
-        irq = xen_irq_from_gsi(gsi);
+        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;
+                goto out;       /* XXX need refcount? */
         }
 
         irq = xen_allocate_irq_gsi(gsi);
@@ -745,7 +713,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
         mutex_lock(&irq_mapping_update_lock);
 
         irq = xen_allocate_irq_dynamic();
-        if (irq < 0)
+        if (irq == -1)
                 goto out;
 
         irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_edge_irq,
@@ -761,7 +729,7 @@ out:
 error_irq:
         mutex_unlock(&irq_mapping_update_lock);
         xen_free_irq(irq);
-        return ret;
+        return -1;
 }
 #endif
 
@@ -811,7 +779,7 @@ int xen_irq_from_pirq(unsigned pirq)
         mutex_lock(&irq_mapping_update_lock);
 
         list_for_each_entry(info, &xen_irq_list_head, list) {
-                if (info->type != IRQT_PIRQ)
+                if (info == NULL || info->type != IRQT_PIRQ)
                         continue;
                 irq = info->irq;
                 if (info->u.pirq.pirq == pirq)
@@ -847,11 +815,7 @@ int bind_evtchn_to_irq(unsigned int evtchn)
                                               handle_edge_irq, "event");
 
                 xen_irq_info_evtchn_init(irq, evtchn);
-        } else {
-                struct irq_info *info = info_for_irq(irq);
-                WARN_ON(info == NULL || info->type != IRQT_EVTCHN);
         }
-        irq_clear_status_flags(irq, IRQ_NOREQUEST|IRQ_NOAUTOEN);
 
 out:
         mutex_unlock(&irq_mapping_update_lock);
@@ -886,9 +850,6 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
                 xen_irq_info_ipi_init(cpu, irq, evtchn, ipi);
 
                 bind_evtchn_to_cpu(evtchn, cpu);
-        } else {
-                struct irq_info *info = info_for_irq(irq);
-                WARN_ON(info == NULL || info->type != IRQT_IPI);
         }
 
  out:
@@ -911,32 +872,11 @@ static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
         return err ? : bind_evtchn_to_irq(bind_interdomain.local_port);
 }
 
-static int find_virq(unsigned int virq, unsigned int cpu)
-{
-        struct evtchn_status status;
-        int port, rc = -ENOENT;
-
-        memset(&status, 0, sizeof(status));
-        for (port = 0; port <= NR_EVENT_CHANNELS; port++) {
-                status.dom = DOMID_SELF;
-                status.port = port;
-                rc = HYPERVISOR_event_channel_op(EVTCHNOP_status, &status);
-                if (rc < 0)
-                        continue;
-                if (status.status != EVTCHNSTAT_virq)
-                        continue;
-                if (status.u.virq == virq && status.vcpu == cpu) {
-                        rc = port;
-                        break;
-                }
-        }
-        return rc;
-}
 
 int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
 {
         struct evtchn_bind_virq bind_virq;
-        int evtchn, irq, ret;
+        int evtchn, irq;
 
         mutex_lock(&irq_mapping_update_lock);
 
@@ -952,23 +892,14 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
 
                 bind_virq.virq = virq;
                 bind_virq.vcpu = cpu;
-                ret = HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
-                                                &bind_virq);
-                if (ret == 0)
-                        evtchn = bind_virq.port;
-                else {
-                        if (ret == -EEXIST)
-                                ret = find_virq(virq, cpu);
-                        BUG_ON(ret < 0);
-                        evtchn = ret;
-                }
+                if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
+                                                &bind_virq) != 0)
+                        BUG();
+                evtchn = bind_virq.port;
 
                 xen_irq_info_virq_init(cpu, irq, evtchn, virq);
 
                 bind_evtchn_to_cpu(evtchn, cpu);
-        } else {
-                struct irq_info *info = info_for_irq(irq);
-                WARN_ON(info == NULL || info->type != IRQT_VIRQ);
         }
 
 out:
@@ -981,16 +912,9 @@ static void unbind_from_irq(unsigned int irq)
 {
         struct evtchn_close close;
         int evtchn = evtchn_from_irq(irq);
-        struct irq_info *info = irq_get_handler_data(irq);
 
         mutex_lock(&irq_mapping_update_lock);
 
-        if (info->refcnt > 0) {
-                info->refcnt--;
-                if (info->refcnt != 0)
-                        goto done;
-        }
-
         if (VALID_EVTCHN(evtchn)) {
                 close.port = evtchn;
                 if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
@@ -1019,7 +943,6 @@ static void unbind_from_irq(unsigned int irq)
 
         xen_free_irq(irq);
 
- done:
         mutex_unlock(&irq_mapping_update_lock);
 }
 
@@ -1115,69 +1038,6 @@ void unbind_from_irqhandler(unsigned int irq, void *dev_id)
 }
 EXPORT_SYMBOL_GPL(unbind_from_irqhandler);
 
-int evtchn_make_refcounted(unsigned int evtchn)
-{
-        int irq = evtchn_to_irq[evtchn];
-        struct irq_info *info;
-
-        if (irq == -1)
-                return -ENOENT;
-
-        info = irq_get_handler_data(irq);
-
-        if (!info)
-                return -ENOENT;
-
-        WARN_ON(info->refcnt != -1);
-
-        info->refcnt = 1;
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(evtchn_make_refcounted);
-
-int evtchn_get(unsigned int evtchn)
-{
-        int irq;
-        struct irq_info *info;
-        int err = -ENOENT;
-
-        if (evtchn >= NR_EVENT_CHANNELS)
-                return -EINVAL;
-
-        mutex_lock(&irq_mapping_update_lock);
-
-        irq = evtchn_to_irq[evtchn];
-        if (irq == -1)
-                goto done;
-
-        info = irq_get_handler_data(irq);
-
-        if (!info)
-                goto done;
-
-        err = -EINVAL;
-        if (info->refcnt <= 0)
-                goto done;
-
-        info->refcnt++;
-        err = 0;
- done:
-        mutex_unlock(&irq_mapping_update_lock);
-
-        return err;
-}
-EXPORT_SYMBOL_GPL(evtchn_get);
-
-void evtchn_put(unsigned int evtchn)
-{
-        int irq = evtchn_to_irq[evtchn];
-        if (WARN_ON(irq == -1))
-                return;
-        unbind_from_irq(irq);
-}
-EXPORT_SYMBOL_GPL(evtchn_put);
-
 void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector)
 {
         int irq = per_cpu(ipi_to_irq, cpu)[vector];
@@ -1292,7 +1152,7 @@ static void __xen_evtchn_do_upcall(void)
         int cpu = get_cpu();
         struct shared_info *s = HYPERVISOR_shared_info;
         struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
-        unsigned count;
+        unsigned count;
 
         do {
                 unsigned long pending_words;
@@ -1395,10 +1255,8 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
 
-        irq_enter();
-#ifdef CONFIG_X86
         exit_idle();
-#endif
+        irq_enter();
 
         __xen_evtchn_do_upcall();
 
@@ -1812,7 +1670,6 @@ void __init xen_init_IRQ(void)
 
         evtchn_to_irq = kcalloc(NR_EVENT_CHANNELS, sizeof(*evtchn_to_irq),
                                     GFP_KERNEL);
-        BUG_ON(!evtchn_to_irq);
         for (i = 0; i < NR_EVENT_CHANNELS; i++)
                 evtchn_to_irq[i] = -1;
 
@@ -1822,9 +1679,6 @@ void __init xen_init_IRQ(void)
         for (i = 0; i < NR_EVENT_CHANNELS; i++)
                 mask_evtchn(i);
 
-        pirq_needs_eoi = pirq_needs_eoi_flag;
-
-#ifdef CONFIG_X86
         if (xen_hvm_domain()) {
                 xen_callback_vector();
                 native_init_IRQ();
@@ -1832,21 +1686,8 @@ void __init xen_init_IRQ(void)
                  * __acpi_register_gsi can point at the right function */
                 pci_xen_hvm_init();
         } else {
-                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);
-                if (rc != 0) {
-                        free_page((unsigned long) pirq_eoi_map);
-                        pirq_eoi_map = NULL;
-                } else
-                        pirq_needs_eoi = pirq_check_eoi_map;
         }
-#endif
 }