irq/threaded for v2.6.32
Linus,
Please pull the latest irq-threaded-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-threaded-for-linus
Thanks,
Ingo
------------------>
Thomas Gleixner (4):
genirq: Add oneshot support
genirq: Add buslock support
genirq: Support nested threaded irq handling
genirq: Do not mask oneshot edge type interrupts
include/linux/interrupt.h | 4 ++ include/linux/irq.h | 10 ++++ kernel/irq/chip.c | 74 ++++++++++++++++++++++++++++++++- kernel/irq/internals.h | 13 ++++++ kernel/irq/manage.c | 102 +++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 194 insertions(+), 9 deletions(-)
include/linux/interrupt.h +4 -0
@@ -50,6 +50,9 @@* IRQF_IRQPOLL - Interrupt is used for polling (only the interrupt that is * registered first in an shared interrupt is considered for * performance reasons) +* IRQF_ONESHOT - Interrupt is not reenabled after the hardirq handler finished. +* Used by threaded interrupts which need to keep the +* irq line disabled until the threaded handler has been run. */ #define IRQF_DISABLED 0x00000020#define IRQF_SAMPLE_RANDOM 0x00000040
@@ -59,6 +62,7 @@#define IRQF_PERCPU 0x00000400#define IRQF_NOBALANCING 0x00000800#define IRQF_IRQPOLL 0x00001000 +#define IRQF_ONESHOT 0x00002000/* * Bits used by threaded handlers:
include/linux/irq.h +10 -0
@@ -69,6 +69,8 @@ typedef void (*irq_flow_handler_t)(unsigned int irq,#define IRQ_MOVE_PCNTXT 0x01000000/* IRQ migration from process context */ #define IRQ_AFFINITY_SET 0x02000000/* IRQ affinity was set from userspace*/ #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 */ #ifdef CONFIG_IRQ_PER_CPU # define CHECK_IRQ_PER_CPU (var) ((var) & IRQ_PER_CPU)
@@ -100,6 +102,9 @@ struct msi_desc;* @set_type: set the flow type (IRQ_TYPE_LEVEL/etc.) of an IRQ * @set_wake: enable/disable power-management wake-on of an IRQ * +* @bus_lock: function to lock access to slow bus (i2c) chips +* @bus_sync_unlock: function to sync and unlock slow bus (i2c) chips +* * @release: release function solely used by UML * @typename: obsoleted by name, kept as migration helper */
@@ -123,6 +128,9 @@ struct irq_chip {int (*set_type)(unsigned int irq,unsigned int flow_type);int (*set_wake)(unsigned int irq,unsigned int on); +void (*bus_lock)(unsigned int irq); +void (*bus_sync_unlock)(unsigned int irq); +/* Currently used only by UML, might disappear one day.*/ #ifdef CONFIG_IRQ_RELEASE_METHOD void (*release)(unsigned int irq,void *dev_id);
@@ -379,6 +387,8 @@ set_irq_chained_handler(unsigned int irq,__set_irq_handler (irq, handle,1 ,NULL ); } +extern void set_irq_nested_thread (unsigned int irq,int nest); +extern void set_irq_noprobe (unsigned int irq);extern void set_irq_probe (unsigned int irq);
kernel/irq/chip.c +73 -1
104 lines not on this page · raw message
kernel/irq/internals.h +13 -0
@@ -44,6 +44,19 @@ extern int irq_select_affinity_usr(unsigned int irq);extern void irq_set_thread_affinity (struct irq_desc *desc); +/* Inline functions for support of irq chips on slow busses */ +static inline void chip_bus_lock (unsigned int irq,struct irq_desc *desc) +{ +if (unlikely (desc->chip->bus_lock)) + desc->chip->bus_lock (irq); +} + +static inline void chip_bus_sync_unlock (unsigned int irq,struct irq_desc *desc) +{ +if (unlikely (desc->chip->bus_sync_unlock)) + desc->chip->bus_sync_unlock (irq); +} +/* * Debugging printout: */
kernel/irq/manage.c +94 -8
198 lines not on this page · raw message