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

Commit 6954b75b authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Move IRQ_POLL_INPROGRESS to core 



No users outside of core.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6f91a52d

include/linux/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, 
#define IRQ_SUSPENDED		0x04000000	/* IRQ has gone through suspend sequence */

#define IRQ_ONESHOT		0x08000000	/* IRQ is not unmasked after hardirq */

#define IRQ_NESTED_THREAD	0x10000000	/* IRQ is nested into another, no own handler thread */

#define IRQ_POLL_INPROGRESS	0x20000000	/* IRQ poll is in progress */



#define IRQF_MODIFY_MASK	\

	(IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \

kernel/irq/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ EXPORT_SYMBOL_GPL(handle_nested_irq); 


static bool irq_check_poll(struct irq_desc *desc)

{

	if (!(desc->status & IRQ_POLL_INPROGRESS))

	if (!(desc->istate & IRQS_POLL_INPROGRESS))

		return false;

	return irq_wait_for_poll(desc);

}

kernel/irq/internals.h

+2 −0
Original line number Diff line number Diff line
@@ -39,10 +39,12 @@ enum { 
 * IRQS_AUTODETECT		- autodetection in progress

 * IRQS_SPURIOUS_DISABLED	- was disabled due to spurious interrupt

 *				  detection

 * IRQS_POLL_INPROGRESS		- polling in progress

 */

enum {

	IRQS_AUTODETECT		= 0x00000001,

	IRQS_SPURIOUS_DISABLED	= 0x00000002,

	IRQS_POLL_INPROGRESS	= 0x00000008,

};



#define irq_data_to_desc(data)	container_of(data, struct irq_desc, irq_data)

kernel/irq/spurious.c

+3 −3
Original line number Diff line number Diff line
@@ -98,13 +98,13 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force) 
	}



	/* Mark it poll in progress */

	desc->status |= IRQ_POLL_INPROGRESS;

	desc->istate |= IRQS_POLL_INPROGRESS;

	do {

		if (handle_irq_event(desc) == IRQ_HANDLED)

			ret = IRQ_HANDLED;

		action = desc->action;

	} while ((desc->status & IRQ_PENDING) && action);

	desc->status &= ~IRQ_POLL_INPROGRESS;

	desc->istate &= ~IRQS_POLL_INPROGRESS;

out:

	raw_spin_unlock(&desc->lock);

	return ret == IRQ_HANDLED;
@@ -259,7 +259,7 @@ try_misrouted_irq(unsigned int irq, struct irq_desc *desc, 
void note_interrupt(unsigned int irq, struct irq_desc *desc,

		    irqreturn_t action_ret)

{

	if (desc->status & IRQ_POLL_INPROGRESS)

	if (desc->istate & IRQS_POLL_INPROGRESS)

		return;



	if (unlikely(action_ret != IRQ_HANDLED)) {