Skip to content

Commit

Permalink
genirq: Move IRQ_MASKED to core
Browse files Browse the repository at this point in the history
Keep status in sync until all users are fixed.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Feb 19, 2011
1 parent 2a0d6fb commit 6e40262
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 13 deletions.
2 changes: 1 addition & 1 deletion include/linux/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ typedef void (*irq_flow_handler_t)(unsigned int irq,
#define IRQ_WAITING 0x00000400 /* DEPRECATED */
#define IRQ_DISABLED 0x00000800 /* DEPRECATED */
#define IRQ_PENDING 0x00001000 /* DEPRECATED */
#define IRQ_MASKED 0x00002000 /* DEPRECATED */
#endif


#define IRQ_LEVEL 0x00004000 /* IRQ level triggered */
#define IRQ_MASKED 0x00008000 /* IRQ masked - shouldn't be seen again */
#define IRQ_PER_CPU 0x00010000 /* IRQ is per CPU */
#define IRQ_NOPROBE 0x00020000 /* IRQ is not valid for probing */
#define IRQ_NOREQUEST 0x00040000 /* IRQ cannot be requested */
Expand Down
28 changes: 20 additions & 8 deletions kernel/irq/chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,26 @@ static void irq_state_set_disabled(struct irq_desc *desc)
irq_compat_set_disabled(desc);
}

static void irq_state_clr_masked(struct irq_desc *desc)
{
desc->istate &= ~IRQS_MASKED;
irq_compat_clr_masked(desc);
}

static void irq_state_set_masked(struct irq_desc *desc)
{
desc->istate |= IRQS_MASKED;
irq_compat_set_masked(desc);
}

int irq_startup(struct irq_desc *desc)
{
irq_state_clr_disabled(desc);
desc->depth = 0;

if (desc->irq_data.chip->irq_startup) {
int ret = desc->irq_data.chip->irq_startup(&desc->irq_data);
desc->status &= ~IRQ_MASKED;
irq_state_clr_masked(desc);
return ret;
}

Expand All @@ -201,7 +213,7 @@ void irq_shutdown(struct irq_desc *desc)
desc->irq_data.chip->irq_disable(&desc->irq_data);
else
desc->irq_data.chip->irq_mask(&desc->irq_data);
desc->status |= IRQ_MASKED;
irq_state_set_masked(desc);
}

void irq_enable(struct irq_desc *desc)
Expand All @@ -211,16 +223,16 @@ void irq_enable(struct irq_desc *desc)
desc->irq_data.chip->irq_enable(&desc->irq_data);
else
desc->irq_data.chip->irq_unmask(&desc->irq_data);
desc->status &= ~IRQ_MASKED;
irq_state_clr_masked(desc);
}

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);
desc->status |= IRQ_MASKED;
}
irq_state_set_masked(desc);
}

#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
Expand Down Expand Up @@ -352,22 +364,22 @@ static inline void mask_ack_irq(struct irq_desc *desc)
if (desc->irq_data.chip->irq_ack)
desc->irq_data.chip->irq_ack(&desc->irq_data);
}
desc->status |= IRQ_MASKED;
irq_state_set_masked(desc);
}

static inline void mask_irq(struct irq_desc *desc)
{
if (desc->irq_data.chip->irq_mask) {
desc->irq_data.chip->irq_mask(&desc->irq_data);
desc->status |= IRQ_MASKED;
irq_state_set_masked(desc);
}
}

static inline void unmask_irq(struct irq_desc *desc)
{
if (desc->irq_data.chip->irq_unmask) {
desc->irq_data.chip->irq_unmask(&desc->irq_data);
desc->status &= ~IRQ_MASKED;
irq_state_clr_masked(desc);
}
}

Expand Down Expand Up @@ -583,7 +595,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
*/
if (unlikely(desc->istate & IRQS_PENDING)) {
if (!(desc->istate & IRQS_DISABLED) &&
(desc->status & IRQ_MASKED))
(desc->istate & IRQS_MASKED))
unmask_irq(desc);
}

Expand Down
11 changes: 11 additions & 0 deletions kernel/irq/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,23 @@ static inline void irq_compat_clr_pending(struct irq_desc *desc)
{
desc->status &= ~IRQ_PENDING;
}
static inline void irq_compat_set_masked(struct irq_desc *desc)
{
desc->status |= IRQ_MASKED;
}

static inline void irq_compat_clr_masked(struct irq_desc *desc)
{
desc->status &= ~IRQ_MASKED;
}
#else
static inline void irq_compat_set_progress(struct irq_desc *desc) { }
static inline void irq_compat_clr_progress(struct irq_desc *desc) { }
static inline void irq_compat_set_disabled(struct irq_desc *desc) { }
static inline void irq_compat_clr_disabled(struct irq_desc *desc) { }
static inline void irq_compat_set_pending(struct irq_desc *desc) { }
static inline void irq_compat_clr_pending(struct irq_desc *desc) { }
static inline void irq_compat_set_masked(struct irq_desc *desc) { }
static inline void irq_compat_clr_masked(struct irq_desc *desc) { }
#endif

4 changes: 3 additions & 1 deletion kernel/irq/internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ enum {
* IRQS_WAITING - irq is waiting
* IRQS_DISABLED - irq is disabled
* IRQS_PENDING - irq is pending and replayed later
* IRQS_MASKED - irq is masked
*/
enum {
IRQS_AUTODETECT = 0x00000001,
Expand All @@ -58,6 +59,7 @@ enum {
IRQS_WAITING = 0x00000080,
IRQS_DISABLED = 0x00000100,
IRQS_PENDING = 0x00000200,
IRQS_MASKED = 0x00000400,
};

#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)
Expand Down Expand Up @@ -142,7 +144,6 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
}

P(IRQ_LEVEL);
P(IRQ_MASKED);
#ifdef CONFIG_IRQ_PER_CPU
P(IRQ_PER_CPU);
#endif
Expand All @@ -156,6 +157,7 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
PS(IRQS_WAITING);
PS(IRQS_DISABLED);
PS(IRQS_PENDING);
PS(IRQS_MASKED);
}

#undef P
Expand Down
5 changes: 3 additions & 2 deletions kernel/irq/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,9 @@ static void irq_finalize_oneshot(unsigned int irq, struct irq_desc *desc)
goto again;
}

if (!(desc->istate & IRQS_DISABLED) && (desc->status & IRQ_MASKED)) {
desc->status &= ~IRQ_MASKED;
if (!(desc->istate & IRQS_DISABLED) && (desc->istate & IRQS_MASKED)) {
irq_compat_clr_masked(desc);
desc->istate &= ~IRQS_MASKED;
desc->irq_data.chip->irq_unmask(&desc->irq_data);
}
raw_spin_unlock_irq(&desc->lock);
Expand Down
2 changes: 1 addition & 1 deletion kernel/irq/migration.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void move_native_irq(int irq)
* threaded interrupt with ONESHOT set, we can end up with an
* interrupt storm.
*/
masked = desc->status & IRQ_MASKED;
masked = desc->istate & IRQS_MASKED;
if (!masked)
desc->irq_data.chip->irq_mask(&desc->irq_data);
move_masked_irq(irq);
Expand Down
2 changes: 2 additions & 0 deletions kernel/irq/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ enum {
#define IRQ_DISABLED GOT_YOU_MORON
#undef IRQ_PENDING
#define IRQ_PENDING GOT_YOU_MORON
#undef IRQ_MASKED
#define IRQ_MASKED GOT_YOU_MORON

0 comments on commit 6e40262

Please sign in to comment.