[PATCH 05/12] irqchip: nvic: increase number of external interrupts to 112

Stefan Agner
2014-12-03T17:40:21Z

On 2014-12-03 09:12, Uwe Kleine-K?nig wrote:
> Hallo Stefan,
>
> On Wed, Dec 03, 2014 at 01:12:04AM +0100, Stefan Agner wrote:
>> So far only vectors for up to 48 external interrupts have been
>> registred in the vector table. Increase the amount of registred
> s/registred/registered/
>
>> external vectors to 112. Also, add a warning in case NVIC reports
>> support for more interrupts than 128.
> s/interrupts than 128/than 128 interrupts/ (not sure about this one)
>
>> Note: the vector table must align to the number of entires in the
> s/entires/entries/
>
> Maybe point out that "X external interrupts" corresponds to "X + 16
> vectors".
>
>> 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)
> This comment needs fixing
>
>> */
>> @@ -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");
>> +
> That's pointless. Better do:
>
> if (WARN(irqs > 128, "vector table in entry-v7m.S configured for 128 irqs"))
> irqs = 128;
>
> Hmm, I wonder if that is correct. The first 16 exceptions are the system
> exception that will not be registered be drivers and so exception 16
> (i.e. the first regular irq) is reported as hwirq 0. So I think we can
> (in a separate patch) pass irqs - 16 to irq_domain_add_linear. Didn't
> test that though.

Hm, I think you are correct yes. NVIC interrupt ID's are shifted by 16
compared to the Cortex-M4 vector table. Also the irq check above would
need to take care of that.

I anyway need to have a look into that, since I need to make sure that I
work with the right interrupt ID's for both cores M4 (NVIC) and A5
(GIC)... The assignment is quite nicely listed in chapter 3.2.4
(Interrupt Assignments) in the Vybrid RM. The table also supports your
statement above.

Agreed on all the rest.

--
Stefan

>
>> nvic_irq_domain =
>> irq_domain_add_linear(node, irqs, &nvic_irq_domain_ops, NULL);
>> if (!nvic_irq_domain) {