Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15

This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.

Conflicts:
	drivers/xen/events/events_base.c

diff --combined drivers/xen/events/events_base.c
index 7930530656299a28283d8e9ce0155b281349e446,c3458f58de905efb9eb8ae6a611532abda763f9e..d5a3de88ac59df240b09a6c21937eeec7754dd05
--- 1/drivers/xen/events/events_base.c
--- 2/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@@ -336,9 -336,8 +336,8 @@@ static void bind_evtchn_to_cpu(unsigne
  
        BUG_ON(irq == -1);
  #ifdef CONFIG_SMP
-       cpumask_copy(irq_to_desc(irq)->irq_data.affinity, cpumask_of(cpu));
+       cpumask_copy(irq_get_irq_data(irq)->affinity, cpumask_of(cpu));
  #endif
- 
        xen_evtchn_port_bind_to_cpu(info, cpu);
  
        info->cpu = cpu;
@@@ -373,10 -372,8 +372,8 @@@ 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));
+       cpumask_copy(irq_get_irq_data(irq)->affinity, cpumask_of(0));
  #endif
  
        info = kzalloc(sizeof(*info), GFP_KERNEL);
@@@ -391,10 -388,10 +388,10 @@@
        list_add_tail(&info->list, &xen_irq_list_head);
  }
  
 -static int __must_check xen_allocate_irq_dynamic(void)
 +static int __must_check xen_allocate_irqs_dynamic(int nvec)
  {
        int first = 0;
 -      int irq;
 +      int i, irq;
  
  #ifdef CONFIG_X86_IO_APIC
        /*
@@@ -408,22 -405,14 +405,22 @@@
                first = get_nr_irqs_gsi();
  #endif
  
 -      irq = irq_alloc_desc_from(first, -1);
 +      irq = irq_alloc_descs_from(first, nvec, -1);
  
 -      if (irq >= 0)
 -              xen_irq_init(irq);
 +      if (irq >= 0) {
 +              for (i = 0; i < nvec; i++)
 +                      xen_irq_init(irq + i);
 +      }
  
        return irq;
  }
  
 +static inline int __must_check xen_allocate_irq_dynamic(void)
 +{
 +
 +      return xen_allocate_irqs_dynamic(1);
 +}
 +
  static int __must_check xen_allocate_irq_gsi(unsigned gsi)
  {
        int irq;
@@@ -477,6 -466,9 +474,6 @@@ static void xen_evtchn_close(unsigned i
        close.port = port;
        if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
                BUG();
 -
 -      /* Closed ports are implicitly re-bound to VCPU0. */
 -      bind_evtchn_to_cpu(port, 0);
  }
  
  static void pirq_query_unmask(int irq)
@@@ -495,13 -487,6 +492,6 @@@
                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);
@@@ -543,8 -528,7 +533,7 @@@ static unsigned int __startup_pirq(unsi
                                        BIND_PIRQ__WILL_SHARE : 0;
        rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
        if (rc != 0) {
-               if (!probing_irq(irq))
-                       pr_info("Failed to obtain physical IRQ %d\n", irq);
+               pr_warn("Failed to obtain physical IRQ %d\n", irq);
                return 0;
        }
        evtchn = bind_pirq.port;
@@@ -746,25 -730,22 +735,25 @@@ int xen_allocate_pirq_msi(struct pci_de
  }
  
  int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 -                           int pirq, const char *name, domid_t domid)
 +                           int pirq, int nvec, const char *name, domid_t domid)
  {
 -      int irq, ret;
 +      int i, irq, ret;
  
        mutex_lock(&irq_mapping_update_lock);
  
 -      irq = xen_allocate_irq_dynamic();
 +      irq = xen_allocate_irqs_dynamic(nvec);
        if (irq < 0)
                goto out;
  
 -      irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_edge_irq,
 -                      name);
 +      for (i = 0; i < nvec; i++) {
 +              irq_set_chip_and_handler_name(irq + i, &xen_pirq_chip, handle_edge_irq, name);
 +
 +              ret = xen_irq_info_pirq_setup(irq + i, 0, pirq + i, 0, domid,
 +                                            i == 0 ? 0 : PIRQ_MSI_GROUP);
 +              if (ret < 0)
 +                      goto error_irq;
 +      }
  
 -      ret = xen_irq_info_pirq_setup(irq, 0, pirq, 0, domid, 0);
 -      if (ret < 0)
 -              goto error_irq;
        ret = irq_set_msi_desc(irq, msidesc);
        if (ret < 0)
                goto error_irq;
@@@ -772,8 -753,7 +761,8 @@@ out
        mutex_unlock(&irq_mapping_update_lock);
        return irq;
  error_irq:
 -      __unbind_from_irq(irq);
 +      for (; i >= 0; i--)
 +              __unbind_from_irq(irq + i);
        mutex_unlock(&irq_mapping_update_lock);
        return ret;
  }
@@@ -781,23 -761,13 +770,18 @@@
  
  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;
  
        mutex_lock(&irq_mapping_update_lock);
  
-       desc = irq_to_desc(irq);
-       if (!desc)
-               goto out;
- 
 -      if (xen_initial_domain()) {
 +      /*
 +       * If trying to remove a vector in a MSI group different
 +       * than the first one skip the PIRQ unmap unless this vector
 +       * is the first one in the group.
 +       */
 +      if (xen_initial_domain() && !(info->u.pirq.flags & PIRQ_MSI_GROUP)) {
                unmap_irq.pirq = info->u.pirq.pirq;
                unmap_irq.domid = info->u.pirq.domid;
                rc = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap_irq);
@@@ -1265,6 -1235,7 +1249,7 @@@ void xen_evtchn_do_upcall(struct pt_reg
  #ifdef CONFIG_X86
        exit_idle();
  #endif
+       inc_irq_stat(irq_hv_callback_count);
  
        __xen_evtchn_do_upcall();
  
@@@ -1353,11 -1324,31 +1338,11 @@@ static int rebind_irq_to_cpu(unsigned i
  static int set_affinity_irq(struct irq_data *data, const struct cpumask *dest,
                            bool force)
  {
-       unsigned tcpu = cpumask_first(dest);
+       unsigned tcpu = cpumask_first_and(dest, cpu_online_mask);
  
        return rebind_irq_to_cpu(data->irq, tcpu);
  }
  
 -static int retrigger_evtchn(int evtchn)
 -{
 -      int masked;
 -
 -      if (!VALID_EVTCHN(evtchn))
 -              return 0;
 -
 -      masked = test_and_set_mask(evtchn);
 -      set_evtchn(evtchn);
 -      if (!masked)
 -              unmask_evtchn(evtchn);
 -
 -      return 1;
 -}
 -
 -int resend_irq_on_evtchn(unsigned int irq)
 -{
 -      return retrigger_evtchn(evtchn_from_irq(irq));
 -}
 -
  static void enable_dynirq(struct irq_data *data)
  {
        int evtchn = evtchn_from_irq(data->irq);
@@@ -1392,18 -1383,7 +1377,18 @@@ static void mask_ack_dynirq(struct irq_
  
  static int retrigger_dynirq(struct irq_data *data)
  {
 -      return retrigger_evtchn(evtchn_from_irq(data->irq));
 +      unsigned int evtchn = evtchn_from_irq(data->irq);
 +      int masked;
 +
 +      if (!VALID_EVTCHN(evtchn))
 +              return 0;
 +
 +      masked = test_and_set_mask(evtchn);
 +      set_evtchn(evtchn);
 +      if (!masked)
 +              unmask_evtchn(evtchn);
 +
 +      return 1;
  }
  
  static void restore_pirqs(void)