ARM: 8340/1: ARMv7-M: Enlarge vector table up to 256 entries

From Cortex-M reference manuals, the nvic supports up to 240 interrupts.
So the number of entries in vectors table is up to 256.

This patch adds a new config flag to specify the number of external interrupts.
Some ifdeferies are added in order to respect the natural alignment without
wasting too much space on smaller systems.

Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Stefan Agner <stefan@agner.ch>
Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S
index 8944f4991c3cfd4e76585cdc11b78e3c3b2257d2..b6c8bb9315e7bb6c15b9eb015ad9627fe545fdcb 100644 (file)
--- a/arch/arm/kernel/entry-v7m.S
+++ b/arch/arm/kernel/entry-v7m.S
@@ -117,9 +117,14 @@ ENTRY(__switch_to)
 ENDPROC(__switch_to)
 
        .data
-       .align  8
+#if CONFIG_CPU_V7M_NUM_IRQ <= 112
+       .align  9
+#else
+       .align  10
+#endif
+
 /*
- * Vector table (64 words => 256 bytes natural alignment)
+ * Vector table (Natural alignment need to be ensured)
  */
 ENTRY(vector_table)
        .long   0                       @ 0 - Reset stack pointer
@@ -138,6 +143,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   CONFIG_CPU_V7M_NUM_IRQ
+       .long   __irq_entry             @ External Interrupts
        .endr

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index b4f92b9a13ac85c1c425542ff50b6df2783b3c50..6173aa3b7f448180e0e4d68ad2b37264fb114551 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -604,6 +604,21 @@ config CPU_USE_DOMAINS
          This option enables or disables the use of domain switching
          via the set_fs() function.
 
+config CPU_V7M_NUM_IRQ
+       int "Number of external interrupts connected to the NVIC"
+       depends on CPU_V7M
+       default 90 if ARCH_STM32
+       default 38 if ARCH_EFM32
+       default 240
+       help
+         This option indicates the number of interrupts connected to the NVIC.
+         The value can be larger than the real number of interrupts supported
+         by the system, but must not be lower.
+         The default value is 240, corresponding to the maximum number of
+         interrupts supported by the NVIC on Cortex-M family.
+
+         If unsure, keep default value.
+
 #
 # CPU supports 36-bit I/O
 #