xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

genirq: Create helper for flow handler entry check

Browse Source 
All flow handlers - except the per cpu ones - check for an interrupt
in progress and an eventual concurrent polling on another cpu.

Create a helper function for the repeated code pattern.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Thomas Gleixner
2014-08-29 13:39:37 +02:00
committed by Rafael J. Wysocki
parent c3d7acd027
commit c7bd3ec053
1 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
kernel/irq/chip.c
View File

@@ -342,6 +342,13 @@ static bool irq_check_poll(struct irq_desc *desc)
return irq_wait_for_poll(desc); return irq_wait_for_poll(desc);
} }
static bool irq_may_run(struct irq_desc *desc)
{
if (!irqd_irq_inprogress(&desc->irq_data))
return true;
return irq_check_poll(desc);
}
/** /**
* handle_simple_irq - Simple and software-decoded IRQs. * handle_simple_irq - Simple and software-decoded IRQs.
* @irq: the interrupt number * @irq: the interrupt number
@@ -359,9 +366,8 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
{ {
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
if (unlikely(irqd_irq_inprogress(&desc->irq_data))) if (!irq_may_run(desc))
if (!irq_check_poll(desc)) goto out_unlock;
goto out_unlock;
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING); desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
kstat_incr_irqs_this_cpu(irq, desc); kstat_incr_irqs_this_cpu(irq, desc);
@@ -412,9 +418,8 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
mask_ack_irq(desc); mask_ack_irq(desc);
if (unlikely(irqd_irq_inprogress(&desc->irq_data))) if (!irq_may_run(desc))
if (!irq_check_poll(desc)) goto out_unlock;
goto out_unlock;
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING); desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
kstat_incr_irqs_this_cpu(irq, desc); kstat_incr_irqs_this_cpu(irq, desc);
@@ -485,9 +490,8 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
if (unlikely(irqd_irq_inprogress(&desc->irq_data))) if (!irq_may_run(desc))
if (!irq_check_poll(desc)) goto out;
goto out;
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING); desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
kstat_incr_irqs_this_cpu(irq, desc); kstat_incr_irqs_this_cpu(irq, desc);
@@ -541,16 +545,10 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING); desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
/* if (!irq_may_run(desc)) {
* If the handler is currently running, mark it pending, desc->istate |= IRQS_PENDING;
* handle the necessary masking and go out mask_ack_irq(desc);
*/ goto out_unlock;
if (unlikely(irqd_irq_inprogress(&desc->irq_data))) {
if (!irq_check_poll(desc)) {
desc->istate |= IRQS_PENDING;
mask_ack_irq(desc);
goto out_unlock;
}
} }
/* /*
@@ -612,15 +610,9 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc)
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING); desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
/* if (!irq_may_run(desc)) {
* If the handler is currently running, mark it pending, desc->istate |= IRQS_PENDING;
* handle the necessary masking and go out goto out_eoi;
*/
if (unlikely(irqd_irq_inprogress(&desc->irq_data))) {
if (!irq_check_poll(desc)) {
desc->istate |= IRQS_PENDING;
goto out_eoi;
}
} }
/* /*