[patch 65/75] genirq: Reflect IRQ_INPROGRESS/DISABLED inirq_data.state

[Thomas Gleixner]

Some irq_chips check irq_desc->state for IRQ_DISABLED or
IRQ_INPROGRESS in their irq_eoi() function. Reflect the state in
irq_data.state so they can access it there.

Note, that this state is only valid in the irq_chip callbacks. Looking
at the state in other context has no guarantee for correctness.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
---
 include/linux/irq.h |   16 ++++++++++++++++
 kernel/irq/chip.c   |    2 ++
 kernel/irq/handle.c |    2 ++
 3 files changed, 20 insertions(+)

Index: linux-2.6-tip/include/linux/irq.h
===================================================================
--- linux-2.6-tip.orig/include/linux/irq.h
+++ linux-2.6-tip/include/linux/irq.h
@@ -167,6 +167,10 @@ struct irq_data {
  * IRQD_LEVEL			- Interrupt is level triggered
  * IRQD_WAKEUP_STATE		- Interrupt is configured for wakeup
  *				  from suspend
+ * IRDQ_DISABLED		- Interrupt is disabled, only
+ *				  valid in irq_chip.functions
+ * IRDQ_INPROGRESS		- Interrupt is in progress, only
+ *				  valid in irq_chip.functions
  */
 enum {
 	IRQD_TRIGGER_MASK		= 0xf,
@@ -176,6 +180,8 @@ enum {
 	IRQD_AFFINITY_SET		= (1 << 12),
 	IRQD_LEVEL			= (1 << 13),
 	IRQD_WAKEUP_STATE		= (1 << 14),
+	IRQD_DISABLED			= (1 << 15),
+	IRQD_INPROGRESS			= (1 << 16),
 };
 
 static inline bool irqd_is_setaffinity_pending(struct irq_data *d)
@@ -222,6 +228,16 @@ static inline bool irqd_is_wakeup_set(st
 	return d->state_use_accessors & IRQD_WAKEUP_STATE;
 }
 
+static inline bool irqd_is_inprogres(struct irq_data *d)
+{
+	return d->state_use_accessors & IRQD_INPROGRESS;
+}
+
+static inline bool irqd_is_disabled(struct irq_data *d)
+{
+	return d->state_use_accessors & IRQD_DISABLED;
+}
+
 /**
  * struct irq_chip - hardware interrupt chip descriptor
  *
Index: linux-2.6-tip/kernel/irq/chip.c
===================================================================
--- linux-2.6-tip.orig/kernel/irq/chip.c
+++ linux-2.6-tip/kernel/irq/chip.c
@@ -194,12 +194,14 @@ static void irq_state_clr_disabled(struc
 {
 	desc->istate &= ~IRQS_DISABLED;
 	irq_compat_clr_disabled(desc);
+	irqd_clear(&desc->irq_data, IRQD_DISABLED);
 }
 
 static void irq_state_set_disabled(struct irq_desc *desc)
 {
 	desc->istate |= IRQS_DISABLED;
 	irq_compat_set_disabled(desc);
+	irqd_set(&desc->irq_data, IRQD_DISABLED);
 }
 
 static void irq_state_clr_masked(struct irq_desc *desc)
Index: linux-2.6-tip/kernel/irq/handle.c
===================================================================
--- linux-2.6-tip.orig/kernel/irq/handle.c
+++ linux-2.6-tip/kernel/irq/handle.c
@@ -126,6 +126,7 @@ irqreturn_t handle_irq_event(struct irq_
 	desc->istate &= ~IRQS_PENDING;
 	irq_compat_set_progress(desc);
 	desc->istate |= IRQS_INPROGRESS;
+	irqd_set(&desc->irq_data, IRQD_INPROGRESS);
 	raw_spin_unlock(&desc->lock);
 
 	ret = handle_irq_event_percpu(desc, action);
@@ -133,6 +134,7 @@ irqreturn_t handle_irq_event(struct irq_
 	raw_spin_lock(&desc->lock);
 	desc->istate &= ~IRQS_INPROGRESS;
 	irq_compat_clr_progress(desc);
+	irqd_clear(&desc->irq_data, IRQD_INPROGRESS);
 	return ret;
 }
 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/