Messages in this thread Patch in this message | | | Date | Thu, 10 Feb 2011 23:30:48 GMT | From | tip-bot for David Daney <> | Subject | [tip:irq/core] genirq: Call bus_lock/unlock functions in setup_irq() |
| |
Commit-ID: 986c011ddbb3ed44b35e1bfd67f6aa60b293b495 Gitweb: http://git.kernel.org/tip/986c011ddbb3ed44b35e1bfd67f6aa60b293b495 Author: David Daney <ddaney@caviumnetworks.com> AuthorDate: Wed, 9 Feb 2011 16:04:25 -0800 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Fri, 11 Feb 2011 00:25:13 +0100
genirq: Call bus_lock/unlock functions in setup_irq()
irq_chips that supply .irq_bus_lock/.irq_bus_sync_unlock functions, expect that the other chip methods will be called inside of calls to the pair. If this expectation is not met, things tend to not work.
Make setup_irq() call chip_bus_lock()/chip_bus_sync_unlock() too.
For the vast majority of irq_chips, this will be a NOP as most don't have these bus lock functions.
[ tglx: No we don't want to call that in __setup_irq(). Way too many error exit pathes. ]
Signed-off-by: David Daney <ddaney@caviumnetworks.com> LKML-Reference: <1297296265-18680-1-git-send-email-ddaney@caviumnetworks.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/irq/manage.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 0caa59f..a00bf2c 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -871,9 +871,14 @@ out_thread: */ int setup_irq(unsigned int irq, struct irqaction *act) { + int retval; struct irq_desc *desc = irq_to_desc(irq); - return __setup_irq(irq, desc, act); + chip_bus_lock(desc); + retval = __setup_irq(irq, desc, act); + chip_bus_sync_unlock(desc); + + return retval; } EXPORT_SYMBOL_GPL(setup_irq);
| |