Skip to content

Commit

Permalink
genirq: Move IRQ_SPURIOUS_DISABLED to core state
Browse files Browse the repository at this point in the history
No users outside.

Signed-off-by: Thomas Gleixner <[email protected]>
  • Loading branch information
KAGA-KOKO committed Feb 19, 2011
1 parent bd062e7 commit 7acdd53
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
1 change: 0 additions & 1 deletion include/linux/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ typedef void (*irq_flow_handler_t)(unsigned int irq,
#define IRQ_WAKEUP 0x00100000 /* IRQ triggers system wakeup */
#define IRQ_MOVE_PENDING 0x00200000 /* need to re-target IRQ destination */
#define IRQ_NO_BALANCING 0x00400000 /* IRQ is excluded from balancing */
#define IRQ_SPURIOUS_DISABLED 0x00800000 /* IRQ was disabled by the spurious trap */
#define IRQ_MOVE_PCNTXT 0x01000000 /* IRQ migration from process context */
#define IRQ_AFFINITY_SET 0x02000000 /* IRQ affinity was set from userspace*/
#define IRQ_SUSPENDED 0x04000000 /* IRQ has gone through suspend sequence */
Expand Down
3 changes: 3 additions & 0 deletions kernel/irq/internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@ enum {
* Bit masks for desc->state
*
* IRQS_AUTODETECT - autodetection in progress
* IRQS_SPURIOUS_DISABLED - was disabled due to spurious interrupt
* detection
*/
enum {
IRQS_AUTODETECT = 0x00000001,
IRQS_SPURIOUS_DISABLED = 0x00000002,
};

#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)
Expand Down
9 changes: 4 additions & 5 deletions kernel/irq/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -897,9 +897,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
desc->status |= IRQ_PER_CPU;
#endif

desc->status &= ~(IRQ_WAITING | IRQ_ONESHOT |
IRQ_INPROGRESS | IRQ_SPURIOUS_DISABLED);
desc->istate &= ~IRQS_AUTODETECT;
desc->status &= ~(IRQ_WAITING | IRQ_ONESHOT | IRQ_INPROGRESS);
desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED);

if (new->flags & IRQF_ONESHOT)
desc->status |= IRQ_ONESHOT;
Expand Down Expand Up @@ -937,8 +936,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
* Check whether we disabled the irq via the spurious handler
* before. Reenable it and give it another chance.
*/
if (shared && (desc->status & IRQ_SPURIOUS_DISABLED)) {
desc->status &= ~IRQ_SPURIOUS_DISABLED;
if (shared && (desc->istate & IRQS_SPURIOUS_DISABLED)) {
desc->istate &= ~IRQS_SPURIOUS_DISABLED;
__enable_irq(desc, irq, false);
}

Expand Down
8 changes: 4 additions & 4 deletions kernel/irq/spurious.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ static void poll_spurious_irqs(unsigned long dummy)
irq_poll_cpu = smp_processor_id();

for_each_irq_desc(i, desc) {
unsigned int status;
unsigned int state;

if (!i)
continue;

/* Racy but it doesn't matter */
status = desc->status;
state = desc->istate;
barrier();
if (!(status & IRQ_SPURIOUS_DISABLED))
if (!(state & IRQS_SPURIOUS_DISABLED))
continue;

local_irq_disable();
Expand Down Expand Up @@ -298,7 +298,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
* Now kill the IRQ
*/
printk(KERN_EMERG "Disabling IRQ #%d\n", irq);
desc->status |= IRQ_SPURIOUS_DISABLED;
desc->istate |= IRQS_SPURIOUS_DISABLED;
desc->depth++;
irq_disable(desc);

Expand Down

0 comments on commit 7acdd53

Please sign in to comment.