genirq: Move INPROGRESS, MASKED and DISABLED state flags to irq_data

We really need these flags for some of the interrupt chips. Move it
from internal state to irq_data and provide proper accessors.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Daney <ddaney@caviumnetworks.com>

9 files changed, 64 insertions, 59 deletions

diff --git a/include/linux/irq.h b/include/linux/irq.h
index a10717e1c1f3..18aacccb0fae 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -174,8 +174,9 @@ struct irq_data {
  *                                from suspend
  * IRDQ_MOVE_PCNTXT             - Interrupt can be moved in process
  *                                context
- * IRQD_IRQ_DISABLED            - Some chip function need to know the
- *                                disabled state.
+ * IRQD_IRQ_DISABLED            - Disabled state of the interrupt
+ * IRQD_IRQ_MASKED              - Masked state of the interrupt
+ * IRQD_IRQ_INPROGRESS          - In progress state of the interrupt
  */
 enum {
         IRQD_TRIGGER_MASK               = 0xf,
@@ -187,6 +188,8 @@ enum {
         IRQD_WAKEUP_STATE               = (1 << 14),
         IRQD_MOVE_PCNTXT                = (1 << 15),
         IRQD_IRQ_DISABLED               = (1 << 16),
+        IRQD_IRQ_MASKED                 = (1 << 17),
+        IRQD_IRQ_INPROGRESS             = (1 << 18),
 };
 
 static inline bool irqd_is_setaffinity_pending(struct irq_data *d)
@@ -243,6 +246,16 @@ static inline bool irqd_irq_disabled(struct irq_data *d)
         return d->state_use_accessors & IRQD_IRQ_DISABLED;
 }
 
+static inline bool irqd_irq_masked(struct irq_data *d)
+{
+        return d->state_use_accessors & IRQD_IRQ_MASKED;
+}
+
+static inline bool irqd_irq_inprogress(struct irq_data *d)
+{
+        return d->state_use_accessors & IRQD_IRQ_INPROGRESS;
+}
+
 /**
  * struct irq_chip - hardware interrupt chip descriptor
  *
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 9283d3300ea9..e00bdc56269f 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -140,27 +140,25 @@ EXPORT_SYMBOL_GPL(irq_get_irq_data);
 
 static void irq_state_clr_disabled(struct irq_desc *desc)
 {
-        desc->istate &= ~IRQS_DISABLED;
         irqd_clear(&desc->irq_data, IRQD_IRQ_DISABLED);
         irq_compat_clr_disabled(desc);
 }
 
 static void irq_state_set_disabled(struct irq_desc *desc)
 {
-        desc->istate |= IRQS_DISABLED;
         irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED);
         irq_compat_set_disabled(desc);
 }
 
 static void irq_state_clr_masked(struct irq_desc *desc)
 {
-        desc->istate &= ~IRQS_MASKED;
+        irqd_clear(&desc->irq_data, IRQD_IRQ_MASKED);
         irq_compat_clr_masked(desc);
 }
 
 static void irq_state_set_masked(struct irq_desc *desc)
 {
-        desc->istate |= IRQS_MASKED;
+        irqd_set(&desc->irq_data, IRQD_IRQ_MASKED);
         irq_compat_set_masked(desc);
 }
 
@@ -380,11 +378,11 @@ void handle_nested_irq(unsigned int irq)
         kstat_incr_irqs_this_cpu(irq, desc);
 
         action = desc->action;
-        if (unlikely(!action || (desc->istate & IRQS_DISABLED)))
+        if (unlikely(!action || irqd_irq_disabled(&desc->irq_data)))
                 goto out_unlock;
 
         irq_compat_set_progress(desc);
-        desc->istate |= IRQS_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);
@@ -392,7 +390,7 @@ void handle_nested_irq(unsigned int irq)
                 note_interrupt(irq, desc, action_ret);
 
         raw_spin_lock_irq(&desc->lock);
-        desc->istate &= ~IRQS_INPROGRESS;
+        irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);
         irq_compat_clr_progress(desc);
 
 out_unlock:
@@ -424,14 +422,14 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
 {
         raw_spin_lock(&desc->lock);
 
-        if (unlikely(desc->istate & IRQS_INPROGRESS))
+        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 (unlikely(!desc->action || (desc->istate & IRQS_DISABLED)))
+        if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data)))
                 goto out_unlock;
 
         handle_irq_event(desc);
@@ -456,7 +454,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
         raw_spin_lock(&desc->lock);
         mask_ack_irq(desc);
 
-        if (unlikely(desc->istate & IRQS_INPROGRESS))
+        if (unlikely(irqd_irq_inprogress(&desc->irq_data)))
                 if (!irq_check_poll(desc))
                         goto out_unlock;
 
@@ -467,12 +465,12 @@ 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 || (desc->istate & IRQS_DISABLED)))
+        if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data)))
                 goto out_unlock;
 
         handle_irq_event(desc);
 
-        if (!(desc->istate & (IRQS_DISABLED | IRQS_ONESHOT)))
+        if (!irqd_irq_disabled(&desc->irq_data) && !(desc->istate & IRQS_ONESHOT))
                 unmask_irq(desc);
 out_unlock:
         raw_spin_unlock(&desc->lock);
@@ -504,7 +502,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
 {
         raw_spin_lock(&desc->lock);
 
-        if (unlikely(desc->istate & IRQS_INPROGRESS))
+        if (unlikely(irqd_irq_inprogress(&desc->irq_data)))
                 if (!irq_check_poll(desc))
                         goto out;
 
@@ -515,7 +513,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
          * If its disabled or no action available
          * then mask it and get out of here:
          */
-        if (unlikely(!desc->action || (desc->istate & IRQS_DISABLED))) {
+        if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) {
                 irq_compat_set_pending(desc);
                 desc->istate |= IRQS_PENDING;
                 mask_irq(desc);
@@ -566,8 +564,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
          * we shouldn't process the IRQ. Mark it pending, handle