Commit faf3502a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Handle pending irqs in irq_startup()
  genirq: Unmask oneshot irqs when thread was not woken
parents 048cd4e5 b4bc724e

kernel/irq/autoprobe.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ unsigned long probe_irq_on(void) 
			if (desc->irq_data.chip->irq_set_type)

				desc->irq_data.chip->irq_set_type(&desc->irq_data,

							 IRQ_TYPE_PROBE);

			irq_startup(desc);

			irq_startup(desc, false);

		}

		raw_spin_unlock_irq(&desc->lock);

	}
@@ -70,7 +70,7 @@ unsigned long probe_irq_on(void) 
		raw_spin_lock_irq(&desc->lock);

		if (!desc->action && irq_settings_can_probe(desc)) {

			desc->istate |= IRQS_AUTODETECT | IRQS_WAITING;

			if (irq_startup(desc))

			if (irq_startup(desc, false))

				desc->istate |= IRQS_PENDING;

		}

		raw_spin_unlock_irq(&desc->lock);

kernel/irq/chip.c

+33 −9
Original line number Diff line number Diff line
@@ -157,19 +157,22 @@ static void irq_state_set_masked(struct irq_desc *desc) 
	irqd_set(&desc->irq_data, IRQD_IRQ_MASKED);

}



int irq_startup(struct irq_desc *desc)

int irq_startup(struct irq_desc *desc, bool resend)

{

	int ret = 0;



	irq_state_clr_disabled(desc);

	desc->depth = 0;



	if (desc->irq_data.chip->irq_startup) {

		int ret = desc->irq_data.chip->irq_startup(&desc->irq_data);

		ret = desc->irq_data.chip->irq_startup(&desc->irq_data);

		irq_state_clr_masked(desc);

		return ret;

	}



	} else {

		irq_enable(desc);

	return 0;

	}

	if (resend)

		check_irq_resend(desc, desc->irq_data.irq);

	return ret;

}



void irq_shutdown(struct irq_desc *desc)
@@ -330,6 +333,24 @@ out_unlock: 
}

EXPORT_SYMBOL_GPL(handle_simple_irq);



/*

 * Called unconditionally from handle_level_irq() and only for oneshot

 * interrupts from handle_fasteoi_irq()

 */

static void cond_unmask_irq(struct irq_desc *desc)

{

	/*

	 * We need to unmask in the following cases:

	 * - Standard level irq (IRQF_ONESHOT is not set)

	 * - Oneshot irq which did not wake the thread (caused by a

	 *   spurious interrupt or a primary handler handling it

	 *   completely).

	 */

	if (!irqd_irq_disabled(&desc->irq_data) &&

	    irqd_irq_masked(&desc->irq_data) && !desc->threads_oneshot)

		unmask_irq(desc);

}



/**

 *	handle_level_irq - Level type irq handler

 *	@irq:	the interrupt number
@@ -362,8 +383,8 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc) 


	handle_irq_event(desc);



	if (!irqd_irq_disabled(&desc->irq_data) && !(desc->istate & IRQS_ONESHOT))

		unmask_irq(desc);

	cond_unmask_irq(desc);



out_unlock:

	raw_spin_unlock(&desc->lock);

}
@@ -417,6 +438,9 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) 
	preflow_handler(desc);

	handle_irq_event(desc);



	if (desc->istate & IRQS_ONESHOT)

		cond_unmask_irq(desc);



out_eoi:

	desc->irq_data.chip->irq_eoi(&desc->irq_data);

out_unlock:
@@ -625,7 +649,7 @@ __irq_set_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained, 
		irq_settings_set_noprobe(desc);

		irq_settings_set_norequest(desc);

		irq_settings_set_nothread(desc);

		irq_startup(desc);

		irq_startup(desc, true);

	}

out:

	irq_put_desc_busunlock(desc, flags);

kernel/irq/internals.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, 
extern void __disable_irq(struct irq_desc *desc, unsigned int irq, bool susp);

extern void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume);



extern int irq_startup(struct irq_desc *desc);

extern int irq_startup(struct irq_desc *desc, bool resend);

extern void irq_shutdown(struct irq_desc *desc);

extern void irq_enable(struct irq_desc *desc);

extern void irq_disable(struct irq_desc *desc);

kernel/irq/manage.c

+1 −1
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
			desc->istate |= IRQS_ONESHOT;



		if (irq_settings_can_autoenable(desc))

			irq_startup(desc);

			irq_startup(desc, true);

		else

			/* Undo nested disables: */

			desc->depth = 1;