Commit 6f8b7968 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Thomas Gleixner
Browse files

genirq: Move irq_thread_fn() further up in the code 



In a preparation to reuse irq_thread_fn() move it further up in the
code. No functional change intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241119104339.2112455-2-andriy.shevchenko@linux.intel.com
parent e70140ba

kernel/irq/manage.c

+16 −19
Original line number Diff line number Diff line
@@ -1182,45 +1182,42 @@ static void irq_finalize_oneshot(struct irq_desc *desc, 
}



/*

 * Interrupts which are not explicitly requested as threaded

 * interrupts rely on the implicit bh/preempt disable of the hard irq

 * context. So we need to disable bh here to avoid deadlocks and other

 * side effects.

 * Interrupts explicitly requested as threaded interrupts want to be

 * preemptible - many of them need to sleep and wait for slow busses to

 * complete.

 */

static irqreturn_t

irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)

static irqreturn_t irq_thread_fn(struct irq_desc *desc,	struct irqaction *action)

{

	irqreturn_t ret;

	irqreturn_t ret = action->thread_fn(action->irq, action->dev_id);



	local_bh_disable();

	if (!IS_ENABLED(CONFIG_PREEMPT_RT))

		local_irq_disable();

	ret = action->thread_fn(action->irq, action->dev_id);

	if (ret == IRQ_HANDLED)

		atomic_inc(&desc->threads_handled);



	irq_finalize_oneshot(desc, action);

	if (!IS_ENABLED(CONFIG_PREEMPT_RT))

		local_irq_enable();

	local_bh_enable();

	return ret;

}



/*

 * Interrupts explicitly requested as threaded interrupts want to be

 * preemptible - many of them need to sleep and wait for slow busses to

 * complete.

 * Interrupts which are not explicitly requested as threaded

 * interrupts rely on the implicit bh/preempt disable of the hard irq

 * context. So we need to disable bh here to avoid deadlocks and other

 * side effects.

 */

static irqreturn_t irq_thread_fn(struct irq_desc *desc,

		struct irqaction *action)

static irqreturn_t irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)

{

	irqreturn_t ret;



	local_bh_disable();

	if (!IS_ENABLED(CONFIG_PREEMPT_RT))

		local_irq_disable();

	ret = action->thread_fn(action->irq, action->dev_id);

	if (ret == IRQ_HANDLED)

		atomic_inc(&desc->threads_handled);



	irq_finalize_oneshot(desc, action);

	if (!IS_ENABLED(CONFIG_PREEMPT_RT))

		local_irq_enable();

	local_bh_enable();

	return ret;

}