Update to 3.4-final.
[linux-flexiantxendom0-3.2.10.git] / kernel / irq / chip.c
index d70394f..7707fb1 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 
-#include "internals.h"
-
-static void dynamic_irq_init_x(unsigned int irq, bool keep_chip_data)
-{
-       struct irq_desc *desc;
-       unsigned long flags;
-
-       desc = irq_to_desc(irq);
-       if (!desc) {
-               WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);
-               return;
-       }
-
-       /* Ensure we don't have left over values from a previous use of this irq */
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       desc->status = IRQ_DISABLED;
-       desc->chip = &no_irq_chip;
-       desc->handle_irq = handle_bad_irq;
-       desc->depth = 1;
-       desc->msi_desc = NULL;
-       desc->handler_data = NULL;
-       if (!keep_chip_data)
-               desc->chip_data = NULL;
-       desc->action = NULL;
-       desc->irq_count = 0;
-       desc->irqs_unhandled = 0;
-#ifdef CONFIG_SMP
-       cpumask_setall(desc->affinity);
-#ifdef CONFIG_GENERIC_PENDING_IRQ
-       cpumask_clear(desc->pending_mask);
-#endif
-#endif
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
-}
-
-/**
- *     dynamic_irq_init - initialize a dynamically allocated irq
- *     @irq:   irq number to initialize
- */
-void dynamic_irq_init(unsigned int irq)
-{
-       dynamic_irq_init_x(irq, false);
-}
-
-/**
- *     dynamic_irq_init_keep_chip_data - initialize a dynamically allocated irq
- *     @irq:   irq number to initialize
- *
- *     does not set irq_to_desc(irq)->chip_data to NULL
- */
-void dynamic_irq_init_keep_chip_data(unsigned int irq)
-{
-       dynamic_irq_init_x(irq, true);
-}
-
-static void dynamic_irq_cleanup_x(unsigned int irq, bool keep_chip_data)
-{
-       struct irq_desc *desc = irq_to_desc(irq);
-       unsigned long flags;
-
-       if (!desc) {
-               WARN(1, KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);
-               return;
-       }
-
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       if (desc->action) {
-               raw_spin_unlock_irqrestore(&desc->lock, flags);
-               WARN(1, KERN_ERR "Destroying IRQ%d without calling free_irq\n",
-                       irq);
-               return;
-       }
-       desc->msi_desc = NULL;
-       desc->handler_data = NULL;
-       if (!keep_chip_data)
-               desc->chip_data = NULL;
-       desc->handle_irq = handle_bad_irq;
-       desc->chip = &no_irq_chip;
-       desc->name = NULL;
-       clear_kstat_irqs(desc);
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
-}
-
-/**
- *     dynamic_irq_cleanup - cleanup a dynamically allocated irq
- *     @irq:   irq number to initialize
- */
-void dynamic_irq_cleanup(unsigned int irq)
-{
-       dynamic_irq_cleanup_x(irq, false);
-}
-
-/**
- *     dynamic_irq_cleanup_keep_chip_data - cleanup a dynamically allocated irq
- *     @irq:   irq number to initialize
- *
- *     does not set irq_to_desc(irq)->chip_data to NULL
- */
-void dynamic_irq_cleanup_keep_chip_data(unsigned int irq)
-{
-       dynamic_irq_cleanup_x(irq, true);
-}
+#include <trace/events/irq.h>
 
+#include "internals.h"
 
 /**
- *     set_irq_chip - set the irq chip for an irq
+ *     irq_set_chip - set the irq chip for an irq
  *     @irq:   irq number
  *     @chip:  pointer to irq chip description structure
  */
-int set_irq_chip(unsigned int irq, struct irq_chip *chip)
+int irq_set_chip(unsigned int irq, struct irq_chip *chip)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
        unsigned long flags;
+       struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
 
-       if (!desc) {
-               WARN(1, KERN_ERR "Trying to install chip for IRQ%d\n", irq);
+       if (!desc)
                return -EINVAL;
-       }
 
        if (!chip)
                chip = &no_irq_chip;
 
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       irq_chip_set_defaults(chip);
-       desc->chip = chip;
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
-
+       desc->irq_data.chip = chip;
+       irq_put_desc_unlock(desc, flags);
+       /*
+        * For !CONFIG_SPARSE_IRQ make the irq show up in
+        * allocated_irqs. For the CONFIG_SPARSE_IRQ case, it is
+        * already marked, and this call is harmless.
+        */
+       irq_reserve_irq(irq);
        return 0;
 }
-EXPORT_SYMBOL(set_irq_chip);
+EXPORT_SYMBOL(irq_set_chip);
 
 /**
- *     set_irq_type - set the irq trigger type for an irq
+ *     irq_set_type - set the irq trigger type for an irq
  *     @irq:   irq number
  *     @type:  IRQ_TYPE_{LEVEL,EDGE}_* value - see include/linux/irq.h
  */
-int set_irq_type(unsigned int irq, unsigned int type)
+int irq_set_irq_type(unsigned int irq, unsigned int type)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
        unsigned long flags;
-       int ret = -ENXIO;
+       struct irq_desc *desc = irq_get_desc_buslock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL);
+       int ret = 0;
 
-       if (!desc) {
-               printk(KERN_ERR "Trying to set irq type for IRQ%d\n", irq);
-               return -ENODEV;
-       }
+       if (!desc)
+               return -EINVAL;
 
        type &= IRQ_TYPE_SENSE_MASK;
-       if (type == IRQ_TYPE_NONE)
-               return 0;
-
-       raw_spin_lock_irqsave(&desc->lock, flags);
        ret = __irq_set_trigger(desc, irq, type);
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
+       irq_put_desc_busunlock(desc, flags);
        return ret;
 }
-EXPORT_SYMBOL(set_irq_type);
+EXPORT_SYMBOL(irq_set_irq_type);
 
 /**
- *     set_irq_data - set irq type data for an irq
+ *     irq_set_handler_data - set irq handler data for an irq
  *     @irq:   Interrupt number
  *     @data:  Pointer to interrupt specific data
  *
  *     Set the hardware irq controller data for an irq
  */
-int set_irq_data(unsigned int irq, void *data)
+int irq_set_handler_data(unsigned int irq, void *data)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
        unsigned long flags;
+       struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
 
-       if (!desc) {
-               printk(KERN_ERR
-                      "Trying to install controller data for IRQ%d\n", irq);
+       if (!desc)
                return -EINVAL;
-       }
-
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       desc->handler_data = data;
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
+       desc->irq_data.handler_data = data;
+       irq_put_desc_unlock(desc, flags);
        return 0;
 }
-EXPORT_SYMBOL(set_irq_data);
+EXPORT_SYMBOL(irq_set_handler_data);
 
+#ifndef CONFIG_XEN
 /**
- *     set_irq_msi - set MSI descriptor data for an irq
+ *     irq_set_msi_desc - set MSI descriptor data for an irq
  *     @irq:   Interrupt number
  *     @entry: Pointer to MSI descriptor data
  *
  *     Set the MSI descriptor entry for an irq
  */
-int set_irq_msi(unsigned int irq, struct msi_desc *entry)
+int irq_set_msi_desc(unsigned int irq, struct msi_desc *entry)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
        unsigned long flags;
+       struct irq_desc *desc = irq_get_desc_lock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL);
 
-       if (!desc) {
-               printk(KERN_ERR
-                      "Trying to install msi data for IRQ%d\n", irq);
+       if (!desc)
                return -EINVAL;
-       }
-
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       desc->msi_desc = entry;
+       desc->irq_data.msi_desc = entry;
        if (entry)
                entry->irq = irq;
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
+       irq_put_desc_unlock(desc, flags);
        return 0;
 }
+#endif
 
 /**
- *     set_irq_chip_data - set irq chip data for an irq
+ *     irq_set_chip_data - set irq chip data for an irq
  *     @irq:   Interrupt number
  *     @data:  Pointer to chip specific data
  *
  *     Set the hardware irq chip data for an irq
  */
-int set_irq_chip_data(unsigned int irq, void *data)
+int irq_set_chip_data(unsigned int irq, void *data)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
        unsigned long flags;
+       struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
 
-       if (!desc) {
-               printk(KERN_ERR
-                      "Trying to install chip data for IRQ%d\n", irq);
-               return -EINVAL;
-       }
-
-       if (!desc->chip) {
-               printk(KERN_ERR "BUG: bad set_irq_chip_data(IRQ#%d)\n", irq);
+       if (!desc)
                return -EINVAL;
-       }
-
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       desc->chip_data = data;
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
-
+       desc->irq_data.chip_data = data;
+       irq_put_desc_unlock(desc, flags);
        return 0;
 }
-EXPORT_SYMBOL(set_irq_chip_data);
+EXPORT_SYMBOL(irq_set_chip_data);
 
-/**
- *     set_irq_nested_thread - Set/Reset the IRQ_NESTED_THREAD flag of an irq
- *
- *     @irq:   Interrupt number
- *     @nest:  0 to clear / 1 to set the IRQ_NESTED_THREAD flag
- *
- *     The IRQ_NESTED_THREAD flag indicates that on
- *     request_threaded_irq() no separate interrupt thread should be
- *     created for the irq as the handler are called nested in the
- *     context of a demultiplexing interrupt handler thread.
- */
-void set_irq_nested_thread(unsigned int irq, int nest)
+struct irq_data *irq_get_irq_data(unsigned int irq)
 {
        struct irq_desc *desc = irq_to_desc(irq);
-       unsigned long flags;
 
-       if (!desc)
-               return;
+       return desc ? &desc->irq_data : NULL;
+}
+EXPORT_SYMBOL_GPL(irq_get_irq_data);
 
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       if (nest)
-               desc->status |= IRQ_NESTED_THREAD;
-       else
-               desc->status &= ~IRQ_NESTED_THREAD;
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
+static void irq_state_clr_disabled(struct irq_desc *desc)
+{
+       irqd_clear(&desc->irq_data, IRQD_IRQ_DISABLED);
 }
-EXPORT_SYMBOL_GPL(set_irq_nested_thread);
 
-/*
- * default enable function
- */
-static void default_enable(unsigned int irq)
+static void irq_state_set_disabled(struct irq_desc *desc)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
+       irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED);
+}
 
-       desc->chip->unmask(irq);
-       desc->status &= ~IRQ_MASKED;
+static void irq_state_clr_masked(struct irq_desc *desc)
+{
+       irqd_clear(&desc->irq_data, IRQD_IRQ_MASKED);
 }
 
-/*
- * default disable function
- */
-static void default_disable(unsigned int irq)
+static void irq_state_set_masked(struct irq_desc *desc)
 {
+       irqd_set(&desc->irq_data, IRQD_IRQ_MASKED);
 }
 
-/*
- * default startup function
- */
-static unsigned int default_startup(unsigned int irq)
+int irq_startup(struct irq_desc *desc, bool resend)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
+       int ret = 0;
 
-       desc->chip->enable(irq);
-       return 0;
+       irq_state_clr_disabled(desc);
+       desc->depth = 0;
+
+       if (desc->irq_data.chip->irq_startup) {
+               ret = desc->irq_data.chip->irq_startup(&desc->irq_data);
+               irq_state_clr_masked(desc);
+       } else {
+               irq_enable(desc);
+       }
+       if (resend)
+               check_irq_resend(desc, desc->irq_data.irq);
+       return ret;
 }
 
-/*
- * default shutdown function
- */
-static void default_shutdown(unsigned int irq)
+void irq_shutdown(struct irq_desc *desc)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
+       irq_state_set_disabled(desc);
+       desc->depth = 1;
+       if (desc->irq_data.chip->irq_shutdown)
+               desc->irq_data.chip->irq_shutdown(&desc->irq_data);
+       else if (desc->irq_data.chip->irq_disable)
+               desc->irq_data.chip->irq_disable(&desc->irq_data);
+       else
+               desc->irq_data.chip->irq_mask(&desc->irq_data);
+       irq_state_set_masked(desc);
+}
 
-       desc->chip->mask(irq);
-       desc->status |= IRQ_MASKED;
+void irq_enable(struct irq_desc *desc)
+{
+       irq_state_clr_disabled(desc);
+       if (desc->irq_data.chip->irq_enable)
+               desc->irq_data.chip->irq_enable(&desc->irq_data);
+       else
+               desc->irq_data.chip->irq_unmask(&desc->irq_data);
+       irq_state_clr_masked(desc);
 }
 
-/*
- * Fixup enable/disable function pointers
- */
-void irq_chip_set_defaults(struct irq_chip *chip)
-{
-       if (!chip->enable)
-               chip->enable = default_enable;
-       if (!chip->disable)
-               chip->disable = default_disable;
-       if (!chip->startup)
-               chip->startup = default_startup;
-       /*
-        * We use chip->disable, when the user provided its own. When
-        * we have default_disable set for chip->disable, then we need
-        * to use default_shutdown, otherwise the irq line is not
-        * disabled on free_irq():
-        */
-       if (!chip->shutdown)
-               chip->shutdown = chip->disable != default_disable ?
-                       chip->disable : default_shutdown;
-       if (!chip->name)
-               chip->name = chip->typename;
-       if (!chip->end)
-               chip->end = dummy_irq_chip.end;
+void irq_disable(struct irq_desc *desc)
+{
+       irq_state_set_disabled(desc);
+       if (desc->irq_data.chip->irq_disable) {
+               desc->irq_data.chip->irq_disable(&desc->irq_data);
+               irq_state_set_masked(desc);
+       }
 }
 
-static inline void mask_ack_irq(struct irq_desc *desc, int irq)
+void irq_percpu_enable(struct irq_desc *desc, unsigned int cpu)
 {
-       if (desc->chip->mask_ack)
-               desc->chip->mask_ack(irq);
+       if (desc->irq_data.chip->irq_enable)
+               desc->irq_data.chip->irq_enable(&desc->irq_data);
+       else
+               desc->irq_data.chip->irq_unmask(&desc->irq_data);
+       cpumask_set_cpu(cpu, desc->percpu_enabled);
+}
+
+void irq_percpu_disable(struct irq_desc *desc, unsigned int cpu)
+{
+       if (desc->irq_data.chip->irq_disable)
+               desc->irq_data.chip->irq_disable(&desc->irq_data);
+       else
+               desc->irq_data.chip->irq_mask(&desc->irq_data);
+       cpumask_clear_cpu(cpu, desc->percpu_enabled);
+}
+
+static inline void mask_ack_irq(struct irq_desc *desc)
+{
+       if (desc->irq_data.chip->irq_mask_ack)
+               desc->irq_data.chip->irq_mask_ack(&desc->irq_data);
        else {
-               desc->chip->mask(irq);
-               if (desc->chip->ack)
-                       desc->chip->ack(irq);
+               desc->irq_data.chip->irq_mask(&desc->irq_data);
+               if (desc->irq_data.chip->irq_ack)
+                       desc->irq_data.chip->irq_ack(&desc->irq_data);
+       }
+       irq_state_set_masked(desc);
+}
+
+void mask_irq(struct irq_desc *desc)
+{
+       if (desc->irq_data.chip->irq_mask) {
+               desc->irq_data.chip->irq_mask(&desc->irq_data);
+               irq_state_set_masked(desc);
+       }
+}
+
+void unmask_irq(struct irq_desc *desc)
+{
+       if (desc->irq_data.chip->irq_unmask) {
+               desc->irq_data.chip->irq_unmask(&desc->irq_data);
+               irq_state_clr_masked(desc);
        }
 }
 
@@ -382,10 +277,10 @@ void handle_nested_irq(unsigned int irq)
        kstat_incr_irqs_this_cpu(irq, desc);
 
        action = desc->action;
-       if (unlikely(!action || (desc->status & IRQ_DISABLED)))
+       if (unlikely(!action || irqd_irq_disabled(&desc->irq_data)))
                goto out_unlock;
 
-       desc->status |= IRQ_INPROGRESS;
+       irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
        raw_spin_unlock_irq(&desc->lock);
 
        action_ret = action->thread_fn(action->irq, action->dev_id);
@@ -393,13 +288,20 @@ void handle_nested_irq(unsigned int irq)
                note_interrupt(irq, desc, action_ret);
 
        raw_spin_lock_irq(&desc->lock);
-       desc->status &= ~IRQ_INPROGRESS;
+       irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);
 
 out_unlock:
        raw_spin_unlock_irq(&desc->lock);
 }
 EXPORT_SYMBOL_GPL(handle_nested_irq);
 
+static bool irq_check_poll(struct irq_desc *desc)
+{
+       if (!(desc->istate & IRQS_POLL_INPROGRESS))
+               return false;
+       return irq_wait_for_poll(desc);
+}
+
 /**
  *     handle_simple_irq - Simple and software-decoded IRQs.
  *     @irq:   the interrupt number
@@ -415,32 +317,42 @@ EXPORT_SYMBOL_GPL(handle_nested_irq);
 void
 handle_simple_irq(unsigned int irq, struct irq_desc *desc)
 {
-       struct irqaction *action;
-       irqreturn_t action_ret;
-
        raw_spin_lock(&desc->lock);
 
-       if (unlikely(desc->status & IRQ_INPROGRESS))
-               goto out_unlock;
-       desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
+       if (unlikely(irqd_irq_inprogress(&desc->irq_data)))
+               if (!irq_check_poll(desc))
+                       goto out_unlock;
+
+       desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
        kstat_incr_irqs_this_cpu(irq, desc);
 
-       action = desc->action;
-       if (unlikely(!action || (desc->status & IRQ_DISABLED)))
+       if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data)))
                goto out_unlock;
 
-       desc->status |= IRQ_INPROGRESS;
-       raw_spin_unlock(&desc->lock);
-
-       action_ret = handle_IRQ_event(irq, action);
-       if (!noirqdebug)
-               note_interrupt(irq, desc, action_ret);
+       handle_irq_event(desc);
 
-       raw_spin_lock(&desc->lock);
-       desc->status &= ~IRQ_INPROGRESS;
 out_unlock:
        raw_spin_unlock(&desc->lock);
 }
+EXPORT_SYMBOL_GPL(handle_simple_irq);
+
+/*
+ * Called unconditionally from handle_level_irq() and only for oneshot
+ * interrupts from handle_fasteoi_irq()
+ */
+static void cond_unmask_irq(struct irq_desc *desc)
+{
+       /*
+        * We need to unmask in the following cases:
+        * - Standard level irq (IRQF_ONESHOT is not set)
+        * - Oneshot irq which did not wake the thread (caused by a
+        *   spurious interrupt or a primary handler handling it
+        *   completely).
+        */
+       if (!irqd_irq_disabled(&desc->irq_data) &&
+           irqd_irq_masked(&desc->irq_data) && !desc->threads_oneshot)
+               unmask_irq(desc);
+}
 
 /**
  *     handle_level_irq - Level type irq handler
@@ -455,44 +367,42 @@ out_unlock:
 void
 handle_level_irq(unsigned int irq, struct irq_desc *desc)
 {
-       struct irqaction *action;
-       irqreturn_t action_ret;
-
        raw_spin_lock(&desc->lock);
-       mask_ack_irq(desc, irq);
+       mask_ack_irq(desc);
 
-       if (unlikely(desc->status & IRQ_INPROGRESS))
-               goto out_unlock;
-       desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
+       if (unlikely(irqd_irq_inprogress(&desc->irq_data)))
+               if (!irq_check_poll(desc))
+                       goto out_unlock;
+
+       desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
        kstat_incr_irqs_this_cpu(irq, desc);
 
        /*
         * If its disabled or no action available
         * keep it masked and get out of here
         */
-       action = desc->action;
-       if (unlikely(!action || (desc->status & IRQ_DISABLED)))
+       if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data)))
                goto out_unlock;
 
-       desc->status |= IRQ_INPROGRESS;
-       raw_spin_unlock(&desc->lock);
-
-       action_ret = handle_IRQ_event(irq, action);
-       if (!noirqdebug)
-               note_interrupt(irq, desc, action_ret);
+       handle_irq_event(desc);
 
-       raw_spin_lock(&desc->lock);
-       desc->status &= ~IRQ_INPROGRESS;
+       cond_unmask_irq(desc);
 
-       if (unlikely(desc->status & IRQ_ONESHOT))
-               desc->status |= IRQ_MASKED;
-       else if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
-               desc->chip->unmask(irq);
 out_unlock:
        raw_spin_unlock(&desc->lock);
 }
 EXPORT_SYMBOL_GPL(handle_level_irq);
 
+#ifdef CONFIG_IRQ_PREFLOW_FASTEOI
+static inline void preflow_handler(struct irq_desc *desc)
+{
+       if (desc->preflow_handler)
+               desc->preflow_handler(&desc->irq_data);
+}
+#else
+static inline void preflow_handler(struct irq_desc *desc) { }
+#endif
+
 /**
  *     handle_fasteoi_irq - irq handler for transparent controllers
  *     @irq:   the interrupt number
@@ -506,43 +416,43 @@ EXPORT_SYMBOL_GPL(handle_level_irq);
 void
 handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
 {
-       struct irqaction *action;
-       irqreturn_t action_ret;
-
        raw_spin_lock(&desc->lock);
 
-       if (unlikely(desc->status & IRQ_INPROGRESS))
-               goto out;
+       if (unlikely(irqd_irq_inprogress(&desc->irq_data)))
+               if (!irq_check_poll(desc))
+                       goto out;
 
-       desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
+       desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
        kstat_incr_irqs_this_cpu(irq, desc);
 
        /*
         * If its disabled or no action available
         * then mask it and get out of here:
         */
-       action = desc->action;
-       if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
-               desc->status |= IRQ_PENDING;
-               if (desc->chip->mask)
-                       desc->chip->mask(irq);
+       if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) {
+               desc->istate |= IRQS_PENDING;
+               mask_irq(desc);
                goto out;
        }
 
-       desc->status |= IRQ_INPROGRESS;
-       desc->status &= ~IRQ_PENDING;
-       raw_spin_unlock(&desc->lock);
+       if (desc->istate & IRQS_ONESHOT)
+               mask_irq(desc);
 
-       action_ret = handle_IRQ_event(irq, action);
-       if (!noirqdebug)
-               note_interrupt(irq, desc, action_ret);
+       preflow_handler(desc);
+       handle_irq_event(desc);
 
-       raw_spin_lock(&desc->lock);
-       desc->status &= ~IRQ_INPROGRESS;
-out:
-       desc->chip->eoi(irq);
+       if (desc->istate & IRQS_ONESHOT)
+               cond_unmask_irq(desc);
 
+out_eoi:
+       desc->irq_data.chip->irq_eoi(&desc->irq_data);
+out_unlock:
        raw_spin_unlock(&desc->lock);
+       return;
+out:
+       if (!(desc->irq_data.chip->flags & IRQCHIP_EOI_IF_HANDLED))
+               goto out_eoi;
+       goto out_unlock;
 }
 
 /**
@@ -551,10 +461,10 @@ out:
  *     @desc:  the interrupt description structure for this irq
  *
  *     Interrupt occures on the falling and/or rising edge of a hardware
- *     signal. The occurence is latched into the irq controller hardware
+ *     signal. The occurrence is latched into the irq controller hardware
  *     and must be acked in order to be reenabled. After the ack another
  *     interrupt can happen on the same source even before the first one
- *     is handled by the assosiacted event handler. If this happens it
+ *     is handled by the associated event handler. If this happens it
  *     might be necessary to disable (mask) the interrupt depending on the
  *     controller hardware. This requires to reenable the interrupt inside
  *     of the loop which handles the interrupts which have arrived while
@@ -566,34 +476,28 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 {
        raw_spin_lock(&desc->lock);
 
-       desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-
+       desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
        /*
         * If we're currently running this IRQ, or its disabled,
         * we shouldn't process the IRQ. Mark it pending, handle
         * the necessary masking and go out
         */
-       if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
-                   !desc->action)) {
-               desc->status |= (IRQ_PENDING | IRQ_MASKED);
-               mask_ack_irq(desc, irq);
-               goto out_unlock;
+       if (unlikely(irqd_irq_disabled(&desc->irq_data) ||
+                    irqd_irq_inprogress(&desc->irq_data) || !desc->action)) {
+               if (!irq_check_poll(desc)) {
+                       desc->istate |= IRQS_PENDING;
+                       mask_ack_irq(desc);
+                       goto out_unlock;
+               }
        }
        kstat_incr_irqs_this_cpu(irq, desc);
 
        /* Start handling the irq */
-       if (desc->chip->ack)
-               desc->chip->ack(irq);
-
-       /* Mark the IRQ currently in progress.*/
-       desc->status |= IRQ_INPROGRESS;
+       desc->irq_data.chip->irq_ack(&desc->irq_data);
 
        do {
-               struct irqaction *action = desc->action;
-               irqreturn_t action_ret;
-
-               if (unlikely(!action)) {
-                       desc->chip->mask(irq);
+               if (unlikely(!desc->action)) {
+                       mask_irq(desc);
                        goto out_unlock;
                }
 
@@ -602,26 +506,66 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
                 * one, we could have masked the irq.
                 * Renable it, if it was not disabled in meantime.
                 */
-               if (unlikely((desc->status &
-                              (IRQ_PENDING | IRQ_MASKED | IRQ_DISABLED)) ==
-                             (IRQ_PENDING | IRQ_MASKED))) {
-                       desc->chip->unmask(irq);
-                       desc->status &= ~IRQ_MASKED;
+               if (unlikely(desc->istate & IRQS_PENDING)) {
+                       if (!irqd_irq_disabled(&desc->irq_data) &&
+                           irqd_irq_masked(&desc->irq_data))
+                               unmask_irq(desc);
                }
 
-               desc->status &= ~IRQ_PENDING;
-               raw_spin_unlock(&desc->lock);
-               action_ret = handle_IRQ_event(irq, action);
-               if (!noirqdebug)
-                       note_interrupt(irq, desc, action_ret);
-               raw_spin_lock(&desc->lock);
+               handle_irq_event(desc);
 
-       } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
+       } while ((desc->istate & IRQS_PENDING) &&
+                !irqd_irq_disabled(&desc->irq_data));
 
-       desc->status &= ~IRQ_INPROGRESS;
 out_unlock:
        raw_spin_unlock(&desc->lock);
 }
+EXPORT_SYMBOL(handle_edge_irq);
+
+#ifdef CONFIG_IRQ_EDGE_EOI_HANDLER
+/**
+ *     handle_edge_eoi_irq - edge eoi type IRQ handler
+ *     @irq:   the interrupt number
+ *     @desc:  the interrupt description structure for this irq
+ *
+ * Similar as the above handle_edge_irq, but using eoi and w/o the
+ * mask/unmask logic.
+ */
+void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc)
+{
+       struct irq_chip *chip = irq_desc_get_chip(desc);
+
+       raw_spin_lock(&desc->lock);
+
+       desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
+       /*
+        * If we're currently running this IRQ, or its disabled,
+        * we shouldn't process the IRQ. Mark it pending, handle
+        * the necessary masking and go out
+        */
+       if (unlikely(irqd_irq_disabled(&desc->irq_data) ||
+                    irqd_irq_inprogress(&desc->irq_data) || !desc->action)) {
+               if (!irq_check_poll(desc)) {
+                       desc->istate |= IRQS_PENDING;
+                       goto out_eoi;
+               }
+       }
+       kstat_incr_irqs_this_cpu(irq, desc);
+
+       do {
+               if (unlikely(!desc->action))
+                       goto out_eoi;
+
+               handle_irq_event(desc);
+
+       } while ((desc->istate & IRQS_PENDING) &&
+                !irqd_irq_disabled(&desc->irq_data));
+
+out_eoi:
+       chip->irq_eoi(&desc->irq_data);
+       raw_spin_unlock(&desc->lock);
+}
+#endif
 
 /**
  *     handle_percpu_irq - Per CPU local irq handler
@@ -633,115 +577,179 @@ out_unlock:
 void
 handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 {
-       irqreturn_t action_ret;
+       struct irq_chip *chip = irq_desc_get_chip(desc);
 
        kstat_incr_irqs_this_cpu(irq, desc);
 
-       if (desc->chip->ack)
-               desc->chip->ack(irq);
+       if (chip->irq_ack)
+               chip->irq_ack(&desc->irq_data);
 
-       action_ret = handle_IRQ_event(irq, desc->action);
-       if (!noirqdebug)
-               note_interrupt(irq, desc, action_ret);
+       handle_irq_event_percpu(desc, desc->action);
+
+       if (chip->irq_eoi)
+               chip->irq_eoi(&desc->irq_data);
+}
+
+/**
+ * handle_percpu_devid_irq - Per CPU local irq handler with per cpu dev ids
+ * @irq:       the interrupt number
+ * @desc:      the interrupt description structure for this irq
+ *
+ * Per CPU interrupts on SMP machines without locking requirements. Same as
+ * handle_percpu_irq() above but with the following extras:
+ *
+ * action->percpu_dev_id is a pointer to percpu variables which
+ * contain the real device id for the cpu on which this handler is
+ * called
+ */
+void handle_percpu_devid_irq(unsigned int irq, struct irq_desc *desc)
+{
+       struct irq_chip *chip = irq_desc_get_chip(desc);
+       struct irqaction *action = desc->action;
+       void *dev_id = __this_cpu_ptr(action->percpu_dev_id);
+       irqreturn_t res;
+
+       kstat_incr_irqs_this_cpu(irq, desc);
+
+       if (chip->irq_ack)
+               chip->irq_ack(&desc->irq_data);
 
-       if (desc->chip->eoi)
-               desc->chip->eoi(irq);
+       trace_irq_handler_entry(irq, action);
+       res = action->handler(irq, dev_id);
+       trace_irq_handler_exit(irq, action, res);
+
+       if (chip->irq_eoi)
+               chip->irq_eoi(&desc->irq_data);
 }
 
 void
-__set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
+__irq_set_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
                  const char *name)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
        unsigned long flags;
+       struct irq_desc *desc = irq_get_desc_buslock(irq, &flags, 0);
 
-       if (!desc) {
-               printk(KERN_ERR
-                      "Trying to install type control for IRQ%d\n", irq);
+       if (!desc)
                return;
-       }
 
-       if (!handle)
+       if (!handle) {
                handle = handle_bad_irq;
-       else if (desc->chip == &no_irq_chip) {
-               printk(KERN_WARNING "Trying to install %sinterrupt handler "
-                      "for IRQ%d\n", is_chained ? "chained " : "", irq);
-               /*
-                * Some ARM implementations install a handler for really dumb
-                * interrupt hardware without setting an irq_chip. This worked
-                * with the ARM no_irq_chip but the check in setup_irq would
-                * prevent us to setup the interrupt at all. Switch it to
-                * dummy_irq_chip for easy transition.
-                */
-               desc->chip = &dummy_irq_chip;
+       } else {
+               if (WARN_ON(desc->irq_data.chip == &no_irq_chip))
+                       goto out;
        }
 
-       chip_bus_lock(irq, desc);
-       raw_spin_lock_irqsave(&desc->lock, flags);
-
        /* Uninstall? */
        if (handle == handle_bad_irq) {
-               if (desc->chip != &no_irq_chip)
-                       mask_ack_irq(desc, irq);
-               desc->status |= IRQ_DISABLED;
+               if (desc->irq_data.chip != &no_irq_chip)
+                       mask_ack_irq(desc);
+               irq_state_set_disabled(desc);
                desc->depth = 1;
        }
        desc->handle_irq = handle;
        desc->name = name;
 
        if (handle != handle_bad_irq && is_chained) {
-               desc->status &= ~IRQ_DISABLED;
-               desc->status |= IRQ_NOREQUEST | IRQ_NOPROBE;
-               desc->depth = 0;
-               desc->chip->startup(irq);
+               irq_settings_set_noprobe(desc);
+               irq_settings_set_norequest(desc);
+               irq_settings_set_nothread(desc);
+               irq_startup(desc, true);
        }
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
-       chip_bus_sync_unlock(irq, desc);
+out:
+       irq_put_desc_busunlock(desc, flags);
 }
-EXPORT_SYMBOL_GPL(__set_irq_handler);
+EXPORT_SYMBOL_GPL(__irq_set_handler);
 
 void
-set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,
-                        irq_flow_handler_t handle)
+irq_set_chip_and_handler_name(unsigned int irq, struct irq_chip *chip,
+                             irq_flow_handler_t handle, const char *name)
 {
-       set_irq_chip(irq, chip);
-       __set_irq_handler(irq, handle, 0, NULL);
+       irq_set_chip(irq, chip);
+       __irq_set_handler(irq, handle, 0, name);
 }
 
-void
-set_irq_chip_and_handler_name(unsigned int irq, struct irq_chip *chip,
-                             irq_flow_handler_t handle, const char *name)
+void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
 {
-       set_irq_chip(irq, chip);
-       __set_irq_handler(irq, handle, 0, name);
+       unsigned long flags;
+       struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
+
+       if (!desc)
+               return;
+       irq_settings_clr_and_set(desc, clr, set);
+
+       irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU |
+                  IRQD_TRIGGER_MASK | IRQD_LEVEL | IRQD_MOVE_PCNTXT);
+       if (irq_settings_has_no_balance_set(desc))
+               irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
+       if (irq_settings_is_per_cpu(desc))
+               irqd_set(&desc->irq_data, IRQD_PER_CPU);
+       if (irq_settings_can_move_pcntxt(desc))
+               irqd_set(&desc->irq_data, IRQD_MOVE_PCNTXT);
+       if (irq_settings_is_level(desc))
+               irqd_set(&desc->irq_data, IRQD_LEVEL);
+
+       irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc));
+
+       irq_put_desc_unlock(desc, flags);
 }
+EXPORT_SYMBOL_GPL(irq_modify_status);
 
-void __init set_irq_noprobe(unsigned int irq)
+/**
+ *     irq_cpu_online - Invoke all irq_cpu_online functions.
+ *
+ *     Iterate through all irqs and invoke the chip.irq_cpu_online()
+ *     for each.
+ */
+void irq_cpu_online(void)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
+       struct irq_desc *desc;
+       struct irq_chip *chip;
        unsigned long flags;
+       unsigned int irq;
 
-       if (!desc) {
-               printk(KERN_ERR "Trying to mark IRQ%d non-probeable\n", irq);
-               return;
-       }
+       for_each_active_irq(irq) {
+               desc = irq_to_desc(irq);
+               if (!desc)
+                       continue;
+
+               raw_spin_lock_irqsave(&desc->lock, flags);
 
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       desc->status |= IRQ_NOPROBE;
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
+               chip = irq_data_get_irq_chip(&desc->irq_data);
+               if (chip && chip->irq_cpu_online &&
+                   (!(chip->flags & IRQCHIP_ONOFFLINE_ENABLED) ||
+                    !irqd_irq_disabled(&desc->irq_data)))
+                       chip->irq_cpu_online(&desc->irq_data);
+
+               raw_spin_unlock_irqrestore(&desc->lock, flags);
+       }
 }
 
-void __init set_irq_probe(unsigned int irq)
+/**
+ *     irq_cpu_offline - Invoke all irq_cpu_offline functions.
+ *
+ *     Iterate through all irqs and invoke the chip.irq_cpu_offline()
+ *     for each.
+ */
+void irq_cpu_offline(void)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
+       struct irq_desc *desc;
+       struct irq_chip *chip;
        unsigned long flags;
+       unsigned int irq;
 
-       if (!desc) {
-               printk(KERN_ERR "Trying to mark IRQ%d probeable\n", irq);
-               return;
-       }
+       for_each_active_irq(irq) {
+               desc = irq_to_desc(irq);
+               if (!desc)
+                       continue;
 
-       raw_spin_lock_irqsave(&desc->lock, flags);
-       desc->status &= ~IRQ_NOPROBE;
-       raw_spin_unlock_irqrestore(&desc->lock, flags);
+               raw_spin_lock_irqsave(&desc->lock, flags);
+
+               chip = irq_data_get_irq_chip(&desc->irq_data);
+               if (chip && chip->irq_cpu_offline &&
+                   (!(chip->flags & IRQCHIP_ONOFFLINE_ENABLED) ||
+                    !irqd_irq_disabled(&desc->irq_data)))
+                       chip->irq_cpu_offline(&desc->irq_data);
+
+               raw_spin_unlock_irqrestore(&desc->lock, flags);
+       }
 }