aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2011-09-30 05:48:47 -0400
committerThomas Gleixner <tglx@linutronix.de>2011-10-03 09:35:27 -0400
commit1e7c5fd29487ee88cb3abac945bafa60ae026146 (patch)
tree7fc04be24400b851a544ca3edde40f84116ddb95 /kernel/irq
parent31d9d9b6d83030f748d013e61502fa5477e2ac0e (diff)
genirq: percpu: allow interrupt type to be set at enable time
As request_percpu_irq() doesn't allow for a percpu interrupt to have its type configured (it is generally impossible to configure it on all CPUs at once), add a 'type' argument to enable_percpu_irq(). This allows some low-level, board specific init code to be switched to a generic API. [ tglx: Added WARN_ON argument ] Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Cc: Abhijeet Dharmapurikar <adharmap@codeaurora.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/manage.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 7b4b156d065c..2bc86869859e 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1419,7 +1419,7 @@ int request_any_context_irq(unsigned int irq, irq_handler_t handler,
1419} 1419}
1420EXPORT_SYMBOL_GPL(request_any_context_irq); 1420EXPORT_SYMBOL_GPL(request_any_context_irq);
1421 1421
1422void enable_percpu_irq(unsigned int irq) 1422void enable_percpu_irq(unsigned int irq, unsigned int type)
1423{ 1423{
1424 unsigned int cpu = smp_processor_id(); 1424 unsigned int cpu = smp_processor_id();
1425 unsigned long flags; 1425 unsigned long flags;
@@ -1428,7 +1428,20 @@ void enable_percpu_irq(unsigned int irq)
1428 if (!desc) 1428 if (!desc)
1429 return; 1429 return;
1430 1430
1431 type &= IRQ_TYPE_SENSE_MASK;
1432 if (type != IRQ_TYPE_NONE) {
1433 int ret;
1434
1435 ret = __irq_set_trigger(desc, irq, type);
1436
1437 if (ret) {
1438 WARN(1, "failed to set type for IRQ%d\n, irq");
1439 goto out;
1440 }
1441 }
1442
1431 irq_percpu_enable(desc, cpu); 1443 irq_percpu_enable(desc, cpu);
1444out:
1432 irq_put_desc_unlock(desc, flags); 1445 irq_put_desc_unlock(desc, flags);
1433} 1446}
1434 1447