1 files changed, 21 insertions, 105 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 3aca9f29d30..dc5114b4c16 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -16,8 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 
-#include <trace/events/irq.h>
-
 #include "internals.h"
 
 /**
@@ -28,7 +26,7 @@
 int irq_set_chip(unsigned int irq, struct irq_chip *chip)
 {
         unsigned long flags;
-        struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
+        struct irq_desc *desc = irq_get_desc_lock(irq, &flags);
 
         if (!desc)
                 return -EINVAL;
@@ -56,14 +54,15 @@ EXPORT_SYMBOL(irq_set_chip);
 int irq_set_irq_type(unsigned int irq, unsigned int type)
 {
         unsigned long flags;
-        struct irq_desc *desc = irq_get_desc_buslock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL);
+        struct irq_desc *desc = irq_get_desc_buslock(irq, &flags);
         int ret = 0;
 
         if (!desc)
                 return -EINVAL;
 
         type &= IRQ_TYPE_SENSE_MASK;
-        ret = __irq_set_trigger(desc, irq, type);
+        if (type != IRQ_TYPE_NONE)
+                ret = __irq_set_trigger(desc, irq, type);
         irq_put_desc_busunlock(desc, flags);
         return ret;
 }
@@ -79,7 +78,7 @@ EXPORT_SYMBOL(irq_set_irq_type);
 int irq_set_handler_data(unsigned int irq, void *data)
 {
         unsigned long flags;
-        struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
+        struct irq_desc *desc = irq_get_desc_lock(irq, &flags);
 
         if (!desc)
                 return -EINVAL;
@@ -99,7 +98,7 @@ EXPORT_SYMBOL(irq_set_handler_data);
 int irq_set_msi_desc(unsigned int irq, struct msi_desc *entry)
 {
         unsigned long flags;
-        struct irq_desc *desc = irq_get_desc_lock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL);
+        struct irq_desc *desc = irq_get_desc_lock(irq, &flags);
 
         if (!desc)
                 return -EINVAL;
@@ -120,7 +119,7 @@ int irq_set_msi_desc(unsigned int irq, struct msi_desc *entry)
 int irq_set_chip_data(unsigned int irq, void *data)
 {
         unsigned long flags;
-        struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
+        struct irq_desc *desc = irq_get_desc_lock(irq, &flags);
 
         if (!desc)
                 return -EINVAL;
@@ -158,22 +157,19 @@ static void irq_state_set_masked(struct irq_desc *desc)
         irqd_set(&desc->irq_data, IRQD_IRQ_MASKED);
 }
 
-int irq_startup(struct irq_desc *desc, bool resend)
+int irq_startup(struct irq_desc *desc)
 {
-        int ret = 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);
+                int ret = desc->irq_data.chip->irq_startup(&desc->irq_data);
                 irq_state_clr_masked(desc);
-        } else {
-                irq_enable(desc);
+                return ret;
         }
-        if (resend)
-                check_irq_resend(desc, desc->irq_data.irq);
-        return ret;
+
+        irq_enable(desc);
+        return 0;
 }
 
 void irq_shutdown(struct irq_desc *desc)
@@ -208,24 +204,6 @@ void irq_disable(struct irq_desc *desc)
         }
 }
 
-void irq_percpu_enable(struct irq_desc *desc, unsigned int cpu)
-{
-        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)
@@ -272,14 +250,11 @@ void handle_nested_irq(unsigned int irq)
 
         raw_spin_lock_irq(&desc->lock);
 
-        desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
         kstat_incr_irqs_this_cpu(irq, desc);
 
         action = desc->action;
-        if (unlikely(!action || irqd_irq_disabled(&desc->irq_data))) {
-                desc->istate |= IRQS_PENDING;
+        if (unlikely(!action || irqd_irq_disabled(&desc->irq_data)))
                 goto out_unlock;
-        }
 
         irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
         raw_spin_unlock_irq(&desc->lock);
@@ -327,10 +302,8 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
         desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
         kstat_incr_irqs_this_cpu(irq, desc);
 
-        if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) {
-                desc->istate |= IRQS_PENDING;
+        if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data)))
                 goto out_unlock;
-        }
 
         handle_irq_event(desc);
 
@@ -339,24 +312,6 @@ out_unlock:
 }
 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
  *      @irq:   the interrupt number
@@ -384,15 +339,13 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
          * If its disabled or no action available
          * keep it masked and get out of here
          */
-        if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) {
-                desc->istate |= IRQS_PENDING;
+        if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data)))
                 goto out_unlock;
-        }
 
         handle_irq_event(desc);
 
-        cond_unmask_irq(desc);
-
+        if (!irqd_irq_disabled(&desc->irq_data) && !(desc->istate & IRQS_ONESHOT))
+                unmask_irq(desc);
 out_unlock:
         raw_spin_unlock(&desc->lock);
 }
@@ -446,9 +399,6 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
         preflow_handler(desc);
         handle_irq_event(desc);
 
-        if (desc->istate & IRQS_ONESHOT)
-                cond_unmask_irq(desc);
-
 out_eoi:
         desc->irq_data.chip->irq_eoi(&desc->irq_data);
 out_unlock:
@@ -525,7 +475,6 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 out_unlock:
         raw_spin_unlock(&desc->lock);
 }
-EXPORT_SYMBOL(handle_edge_irq);
 
 #ifdef CONFIG_IRQ_EDGE_EOI_HANDLER
 /**
@@ -595,44 +544,12 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
                 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);
-
-        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
 __irq_set_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
                   const char *name)
 {
         unsigned long flags;
-        struct irq_desc *desc = irq_get_desc_buslock(irq, &flags, 0);
+        struct irq_desc *desc = irq_get_desc_buslock(irq, &flags);
 
         if (!desc)
                 return;
@@ -658,7 +575,7 @@ __irq_set_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
                 irq_settings_set_noprobe(desc);
                 irq_settings_set_norequest(desc);
                 irq_settings_set_nothread(desc);
-                irq_startup(desc, true);
+                irq_startup(desc);
         }
 out:
         irq_put_desc_busunlock(desc, flags);
@@ -672,12 +589,11 @@ irq_set_chip_and_handler_name(unsigned int irq, struct irq_chip *chip,
         irq_set_chip(irq, chip);
         __irq_set_handler(irq, handle, 0, name);
 }
-EXPORT_SYMBOL_GPL(irq_set_chip_and_handler_name);
 
 void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
 {
         unsigned long flags;
-        struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
+        struct irq_desc *desc = irq_get_desc_lock(irq, &flags);
 
         if (!desc)
                 return;