Commit 84f3fe46 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 

Pull irq fixes from Thomas Gleixner:
 "A series of small fixlets for a regression visible on OMAP devices
  caused by the conversion of the OMAP interrupt chips to hierarchical
  interrupt domains.  Mostly one liners on the driver side plus a small
  helper function in the core to avoid open coded mess in the drivers"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/crossbar: Restore set_wake functionality
  irqchip/crossbar: Restore the mask on suspend behaviour
  ARM: OMAP: wakeupgen: Restore the irq_set_type() mechanism
  irqchip/crossbar: Restore the irq_set_type() mechanism
  genirq: Introduce irq_chip_set_type_parent() helper
  genirq: Don't return ENOSYS in irq_chip_retrigger_hierarchy
parents f8a89fc0 8200fe43

arch/arm/mach-omap2/omap-wakeupgen.c

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ static struct irq_chip wakeupgen_chip = { 
	.irq_mask		= wakeupgen_mask,

	.irq_unmask		= wakeupgen_unmask,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_type		= irq_chip_set_type_parent,

	.flags			= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND,

#ifdef CONFIG_SMP

	.irq_set_affinity	= irq_chip_set_affinity_parent,

drivers/irqchip/irq-crossbar.c

+3 −1
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ static struct irq_chip crossbar_chip = { 
	.irq_mask		= irq_chip_mask_parent,

	.irq_unmask		= irq_chip_unmask_parent,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_wake		= irq_chip_set_wake_parent,

	.irq_set_type		= irq_chip_set_type_parent,

	.flags			= IRQCHIP_MASK_ON_SUSPEND |

				  IRQCHIP_SKIP_SET_WAKE,

#ifdef CONFIG_SMP

	.irq_set_affinity	= irq_chip_set_affinity_parent,

#endif

include/linux/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ extern int irq_chip_set_affinity_parent(struct irq_data *data, 
extern int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on);

extern int irq_chip_set_vcpu_affinity_parent(struct irq_data *data,

					     void *vcpu_info);

extern int irq_chip_set_type_parent(struct irq_data *data, unsigned int type);

#endif



/* Handling of unhandled and spurious interrupts: */

kernel/irq/chip.c

+18 −1
Original line number Diff line number Diff line
@@ -984,6 +984,23 @@ int irq_chip_set_affinity_parent(struct irq_data *data, 
	return -ENOSYS;

}



/**

 * irq_chip_set_type_parent - Set IRQ type on the parent interrupt

 * @data:	Pointer to interrupt specific data

 * @type:	IRQ_TYPE_{LEVEL,EDGE}_* value - see include/linux/irq.h

 *

 * Conditional, as the underlying parent chip might not implement it.

 */

int irq_chip_set_type_parent(struct irq_data *data, unsigned int type)

{

	data = data->parent_data;



	if (data->chip->irq_set_type)

		return data->chip->irq_set_type(data, type);



	return -ENOSYS;

}



/**

 * irq_chip_retrigger_hierarchy - Retrigger an interrupt in hardware

 * @data:	Pointer to interrupt specific data
@@ -997,7 +1014,7 @@ int irq_chip_retrigger_hierarchy(struct irq_data *data) 
		if (data->chip && data->chip->irq_retrigger)

			return data->chip->irq_retrigger(data);



	return -ENOSYS;

	return 0;

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE