Commit 293a7a0a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Provide means to retrigger parent 



Attempts to retrigger nested threaded IRQs currently fail because they
have no primary handler. In order to support retrigger of nested
IRQs, the parent IRQ needs to be retriggered.

To fix, when an IRQ needs to be resent, if the interrupt has a parent
IRQ and runs in the context of the parent IRQ, then resend the parent.

Also, handle_nested_irq() needs to clear the replay flag like the
other handlers, otherwise check_irq_resend() will set it and it will
never be cleared.  Without clearing, it results in the first resend
working fine, but check_irq_resend() returning early on subsequent
resends because the replay flag is still set.

Problem discovered on ARM/OMAP platforms where a nested IRQ that's
also a wakeup IRQ happens late in suspend and needed to be retriggered
during the resume process.

[khilman@ti.com: changelog edits, clear IRQS_REPLAY in handle_nested_irq()]

Reported-by: default avatarKevin Hilman <khilman@ti.com>
Tested-by: default avatarKevin Hilman <khilman@ti.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1350425269-11489-1-git-send-email-khilman@deeprootsystems.com


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

include/linux/irq.h

+9 −0
Original line number Diff line number Diff line
@@ -392,6 +392,15 @@ static inline void irq_move_masked_irq(struct irq_data *data) { } 


extern int no_irq_affinity;



#ifdef CONFIG_HARDIRQS_SW_RESEND

int irq_set_parent(int irq, int parent_irq);

#else

static inline int irq_set_parent(int irq, int parent_irq)

{

	return 0;

}

#endif



/*

 * Built-in IRQ handlers for various IRQ types,

 * callable via desc->handle_irq()

include/linux/irqdesc.h

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
struct irq_affinity_notify;

struct proc_dir_entry;

struct module;

struct irq_desc;



/**

 * struct irq_desc - interrupt descriptor

 * @irq_data:		per irq and chip data passed down to chip functions
@@ -65,6 +67,7 @@ struct irq_desc { 
#ifdef CONFIG_PROC_FS

	struct proc_dir_entry	*dir;

#endif

	int			parent_irq;

	struct module		*owner;

	const char		*name;

} ____cacheline_internodealigned_in_smp;

kernel/irq/chip.c

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ void handle_nested_irq(unsigned int irq) 


	raw_spin_lock_irq(&desc->lock);



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

	kstat_incr_irqs_this_cpu(irq, desc);



	action = desc->action;

kernel/irq/manage.c

+16 −0
Original line number Diff line number Diff line
@@ -616,6 +616,22 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, 
	return ret;

}



#ifdef CONFIG_HARDIRQS_SW_RESEND

int irq_set_parent(int irq, int parent_irq)

{

	unsigned long flags;

	struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);



	if (!desc)

		return -EINVAL;



	desc->parent_irq = parent_irq;



	irq_put_desc_unlock(desc, flags);

	return 0;

}

#endif



/*

 * Default primary interrupt handler for threaded interrupts. Is

 * assigned as primary handler when request_threaded_irq is called

kernel/irq/resend.c

+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,14 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq) 
		if (!desc->irq_data.chip->irq_retrigger ||

		    !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) {

#ifdef CONFIG_HARDIRQS_SW_RESEND

			/*

			 * If the interrupt has a parent irq and runs

			 * in the thread context of the parent irq,

			 * retrigger the parent.

			 */

			if (desc->parent_irq &&

			    irq_settings_is_nested_thread(desc))

				irq = desc->parent_irq;

			/* Set it pending and activate the softirq: */

			set_bit(irq, irqs_resend);

			tasklet_schedule(&resend_tasklet);

CRA Git | Maintained and supported by SUSTech CRA and CCSE