[PATCH 05/12] irqchip: nvic: increase number of external interrupts to 112
From: stefan@agner.ch (Stefan Agner)
Date: 2014-12-03 00:16:34
Also in:
linux-devicetree, lkml
Subsystem:
arm port, irqchip drivers, the rest · Maintainers:
Russell King, Thomas Gleixner, Linus Torvalds
So far only vectors for up to 48 external interrupts have been registred in the vector table. Increase the amount of registred external vectors to 112. Also, add a warning in case NVIC reports support for more interrupts than 128. Note: the vector table must align to the number of entires in the vector table, hence increase the alignment to 0x200. Signed-off-by: Stefan Agner <stefan@agner.ch> --- arch/arm/kernel/entry-v7m.S | 6 +++--- drivers/irqchip/irq-nvic.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S
index 2260f18..754a1fa 100644
--- a/arch/arm/kernel/entry-v7m.S
+++ b/arch/arm/kernel/entry-v7m.S@@ -115,7 +115,7 @@ ENTRY(__switch_to) ENDPROC(__switch_to) .data - .align 8 + .align 9 /* * Vector table (64 words => 256 bytes natural alignment) */
@@ -136,6 +136,6 @@ ENTRY(vector_table) .long __invalid_entry @ 13 - Reserved .long __pendsv_entry @ 14 - PendSV .long __invalid_entry @ 15 - SysTick - .rept 64 - 16 - .long __irq_entry @ 16..64 - External Interrupts + .rept 128 - 16 + .long __irq_entry @ 16..128 - External Interrupts .endr
diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c
index dbfb5be..40f62a9 100644
--- a/drivers/irqchip/irq-nvic.c
+++ b/drivers/irqchip/irq-nvic.c@@ -137,6 +137,8 @@ static int __init nvic_of_init(struct device_node *node, if (irqs > NVIC_MAX_IRQ) irqs = NVIC_MAX_IRQ; + WARN(irqs > 128, "vector table in entry-v7m.S configured for 128 irqs"); + nvic_irq_domain = irq_domain_add_linear(node, irqs, &nvic_irq_domain_ops, NULL); if (!nvic_irq_domain) {
--
2.1.3