Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq code updates from Thomas Gleixner:
 "The irq department proudly presents:

   - Another tree wide sweep of irq infrastructure abuse.  Clear winner
     of the trainwreck engineering contest was:
         #include "../../../kernel/irq/settings.h"

   - Tree wide update of irq_set_affinity() callbacks which miss a cpu
     online check when picking a single cpu out of the affinity mask.

   - Tree wide consolidation of interrupt statistics.

   - Updates to the threaded interrupt infrastructure to allow explicit
     wakeup of the interrupt thread and a variant of synchronize_irq()
     which synchronizes only the hard interrupt handler.  Both are
     needed to replace the homebrewn thread handling in the mmc/sdhci
     code.

   - New irq chip callbacks to allow proper support for GPIO based irqs.
     The GPIO based interrupts need to request/release GPIO resources
     from request/free_irq.

   - A few new ARM interrupt chips.  No revolutionary new hardware, just
     differently wreckaged variations of the scheme.

   - Small improvments, cleanups and updates all over the place"

I was hoping that that trainwreck engineering contest was a April Fools'
joke.  But no.

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (68 commits)
  irqchip: sun7i/sun6i: Disable NMI before registering the handler
  ARM: sun7i/sun6i: dts: Fix IRQ number for sun6i NMI controller
  ARM: sun7i/sun6i: irqchip: Update the documentation
  ARM: sun7i/sun6i: dts: Add NMI irqchip support
  ARM: sun7i/sun6i: irqchip: Add irqchip driver for NMI controller
  genirq: Export symbol no_action()
  arm: omap: Fix typo in ams-delta-fiq.c
  m68k: atari: Fix the last kernel_stat.h fallout
  irqchip: sun4i: Simplify sun4i_irq_ack
  irqchip: sun4i: Use handle_fasteoi_irq for all interrupts
  genirq: procfs: Make smp_affinity values go+r
  softirq: Add linux/irq.h to make it compile again
  m68k: amiga: Add linux/irq.h to make it compile again
  irqchip: sun4i: Don't ack IRQs > 0, fix acking of IRQ 0
  irqchip: sun4i: Fix a comment about mask register initialization
  irqchip: sun4i: Fix irq 0 not working
  genirq: Add a new IRQCHIP_EOI_THREADED flag
  genirq: Document IRQCHIP_ONESHOT_SAFE flag
  ARM: sunxi: dt: Convert to the new irq controller compatibles
  irqchip: sunxi: Change compatibles
  ...

3 files changed, 11 insertions, 37 deletions

diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c
index d7ff91757307..5db43fc100a4 100644
--- a/drivers/xen/events/events_2l.c
+++ b/drivers/xen/events/events_2l.c
@@ -166,7 +166,6 @@ static void evtchn_2l_handle_events(unsigned cpu)
         int start_word_idx, start_bit_idx;
         int word_idx, bit_idx;
         int i;
-        struct irq_desc *desc;
         struct shared_info *s = HYPERVISOR_shared_info;
         struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
 
@@ -176,11 +175,8 @@ static void evtchn_2l_handle_events(unsigned cpu)
                 unsigned int evtchn = evtchn_from_irq(irq);
                 word_idx = evtchn / BITS_PER_LONG;
                 bit_idx = evtchn % BITS_PER_LONG;
-                if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx)) {
-                        desc = irq_to_desc(irq);
-                        if (desc)
-                                generic_handle_irq_desc(irq, desc);
-                }
+                if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx))
+                        generic_handle_irq(irq);
         }
 
         /*
@@ -245,11 +241,8 @@ static void evtchn_2l_handle_events(unsigned cpu)
                         port = (word_idx * BITS_PER_EVTCHN_WORD) + bit_idx;
                         irq = get_evtchn_to_irq(port);
 
-                        if (irq != -1) {
-                                desc = irq_to_desc(irq);
-                                if (desc)
-                                        generic_handle_irq_desc(irq, desc);
-                        }
+                        if (irq != -1)
+                                generic_handle_irq(irq);
 
                         bit_idx = (bit_idx + 1) % BITS_PER_EVTCHN_WORD;
 
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index f4a9e3311297..c3458f58de90 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -336,9 +336,8 @@ 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)->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 @@ 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);
@@ -490,13 +487,6 @@ static void pirq_query_unmask(int irq)
                 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);
@@ -538,8 +528,7 @@ static unsigned int __startup_pirq(unsigned int irq)
                                         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;
@@ -772,17 +761,12 @@ error_irq:
 
 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()) {
                 unmap_irq.pirq = info->u.pirq.pirq;
                 unmap_irq.domid = info->u.pirq.domid;
@@ -1251,6 +1235,7 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
 #ifdef CONFIG_X86
         exit_idle();
 #endif
+        inc_irq_stat(irq_hv_callback_count);
 
         __xen_evtchn_do_upcall();
 
@@ -1339,7 +1324,7 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
 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);
 }
diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c
index 1de2a191b395..96109a9972b6 100644
--- a/drivers/xen/events/events_fifo.c
+++ b/drivers/xen/events/events_fifo.c
@@ -235,14 +235,10 @@ static uint32_t clear_linked(volatile event_word_t *word)
 static void handle_irq_for_port(unsigned port)
 {
         int irq;
-        struct irq_desc *desc;
 
         irq = get_evtchn_to_irq(port);
-        if (irq != -1) {
-                desc = irq_to_desc(irq);
-                if (desc)
-                        generic_handle_irq_desc(irq, desc);
-        }
+        if (irq != -1)
+                generic_handle_irq(irq);
 }
 
 static void consume_one_event(unsigned cpu,