Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7bd3ec0 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Rafael J. Wysocki
Browse files

genirq: Create helper for flow handler entry check 



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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c3d7acd0

kernel/irq/chip.c

+20 −28
Original line number Diff line number Diff line
@@ -342,6 +342,13 @@ static bool irq_check_poll(struct irq_desc *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.

 *	@irq:	the interrupt number
@@ -359,8 +366,7 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc) 
{

	raw_spin_lock(&desc->lock);



	if (unlikely(irqd_irq_inprogress(&desc->irq_data)))

		if (!irq_check_poll(desc))

	if (!irq_may_run(desc))

		goto out_unlock;



	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
@@ -412,8 +418,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc) 
	raw_spin_lock(&desc->lock);

	mask_ack_irq(desc);



	if (unlikely(irqd_irq_inprogress(&desc->irq_data)))

		if (!irq_check_poll(desc))

	if (!irq_may_run(desc))

		goto out_unlock;



	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
@@ -485,8 +490,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) 


	raw_spin_lock(&desc->lock);



	if (unlikely(irqd_irq_inprogress(&desc->irq_data)))

		if (!irq_check_poll(desc))

	if (!irq_may_run(desc))

		goto out;



	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
@@ -541,17 +545,11 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) 


	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);



	/*

	 * If the handler is currently running, mark it pending,

	 * handle the necessary masking and go out

	 */

	if (unlikely(irqd_irq_inprogress(&desc->irq_data))) {

		if (!irq_check_poll(desc)) {

	if (!irq_may_run(desc)) {

		desc->istate |= IRQS_PENDING;

		mask_ack_irq(desc);

		goto out_unlock;

	}

	}



	/*

	 * If its disabled or no action available then mask it and get
@@ -612,16 +610,10 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc) 


	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);



	/*

	 * If the handler is currently running, mark it pending,

	 * handle the necessary masking and go out

	 */

	if (unlikely(irqd_irq_inprogress(&desc->irq_data))) {

		if (!irq_check_poll(desc)) {

	if (!irq_may_run(desc)) {

		desc->istate |= IRQS_PENDING;

		goto out_eoi;

	}

	}



	/*

	 * If its disabled or no action available then mask it and get