interrupts: simplify position of sw ISR table

We now place the linker directives for the SW ISR table in the common linker scripts, instead of repeating it everywhere. The table will be placed in RAM if dynamic interrupts are enabled. A dedicated section is used, as this data must not move in between build phases. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2018-11-08 14:44:31 -08:00 · 2018-11-08 14:44:31 -08:00 · 506f15c381
commit 506f15c381
parent 47d30d087b
22 changed files with 16 additions and 31 deletions
--- a/include/arch/arc/v2/linker.ld
+++ b/include/arch/arc/v2/linker.ld
@ -88,9 +88,6 @@ SECTIONS {
 		KEEP(*(".exc_vector_table.*"))
 		KEEP(*(IRQ_VECTOR_TABLE))

-#ifdef CONFIG_GEN_SW_ISR_TABLE
-		KEEP(*(SW_ISR_TABLE))
-#endif
 		*(.text)
 		*(".text.*")
 		*(.gnu.linkonce.t.*)
--- a/include/arch/arm/cortex_m/scripts/linker.ld
+++ b/include/arch/arm/cortex_m/scripts/linker.ld
@ -141,9 +141,6 @@ SECTIONS
 	KEEP(*(.kinetis_flash_config))
 	KEEP(*(".kinetis_flash_config.*"))

-#ifdef CONFIG_GEN_SW_ISR_TABLE
-	KEEP(*(SW_ISR_TABLE))
-#endif
 	_vector_end = .;
 	_image_text_start = .;
 	*(.text)
--- a/include/arch/nios2/linker.ld
+++ b/include/arch/nios2/linker.ld
@ -189,9 +189,6 @@ SECTIONS

    SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
        {
-#ifdef CONFIG_GEN_SW_ISR_TABLE
-	KEEP(*(SW_ISR_TABLE))
-#endif
        *(.data)
        *(".data.*")

--- a/include/arch/riscv32/common/linker.ld
+++ b/include/arch/riscv32/common/linker.ld
@ -87,9 +87,6 @@ SECTIONS
    SECTION_PROLOGUE(_TEXT_SECTION_NAME,,)
 	{
 		. = ALIGN(4);
-#ifdef CONFIG_GEN_SW_ISR_TABLE
-		KEEP(*(SW_ISR_TABLE))
-#endif
 		KEEP(*(.openocd_debug))
 		KEEP(*(".openocd_debug.*"))

--- a/include/arch/riscv32/pulpino/linker.ld
+++ b/include/arch/riscv32/pulpino/linker.ld
@ -102,9 +102,6 @@ SECTIONS
    SECTION_PROLOGUE(_RODATA_SECTION_NAME,,)
 	{
 		 . = ALIGN(4);
-#ifdef CONFIG_GEN_SW_ISR_TABLE
-		KEEP(*(SW_ISR_TABLE))
-#endif
 		*(.rodata)
 		*(".rodata.*")
 		*(.gnu.linkonce.r.*)
--- a/include/linker/common-ram.ld
+++ b/include/linker/common-ram.ld
@ -3,6 +3,13 @@
 		DEVICE_INIT_SECTIONS()
 	} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)

+#if defined(CONFIG_GEN_ISR_TABLES) && defined(CONFIG_DYNAMIC_INTERRUPTS)
+	SECTION_DATA_PROLOGUE(sw_isr_table, (OPTIONAL),)
+	{
+		*(SW_ISR_TABLE)
+	} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
+#endif
+
 	/* verify we don't have rogue .init_<something> initlevel sections */
 	SECTION_DATA_PROLOGUE(initlevel_error, (OPTIONAL), )
 	{
--- a/include/linker/common-rom.ld
+++ b/include/linker/common-rom.ld
@ -1,3 +1,9 @@
+#if defined(CONFIG_GEN_ISR_TABLES) && !defined(CONFIG_DYNAMIC_INTERRUPTS)
+	SECTION_PROLOGUE(sw_isr_table, (OPTIONAL),)
+	{
+		*(SW_ISR_TABLE)
+	} GROUP_LINK_IN(ROMABLE_REGION)
+#endif
 #ifdef CONFIG_CPLUSPLUS
 	SECTION_PROLOGUE(_CTOR_SECTION_NAME,,)
 	{
--- a/scripts/sanitycheck
+++ b/scripts/sanitycheck
@ -646,7 +646,7 @@ class SizeCalculator:
    rw_sections = ["datas", "initlevel", "_k_task_list", "_k_event_list",
                   "_k_memory_pool", "exceptions", "initshell",
                   "_static_thread_area", "_k_timer_area", "_k_work_area",
-                   "_k_mem_slab_area", "_k_mem_pool_area",
+                   "_k_mem_slab_area", "_k_mem_pool_area", "sw_isr_table",
                   "_k_sem_area", "_k_mutex_area", "_k_alert_area",
                   "_k_fifo_area", "_k_lifo_area", "_k_stack_area",
                   "_k_msgq_area", "_k_mbox_area", "_k_pipe_area",
@ -660,7 +660,8 @@ class SizeCalculator:
                   "priv_stacks_noinit"]
    # These get copied into RAM only on non-XIP
    ro_sections = ["text", "ctors", "init_array", "reset", "object_access",
-                   "rodata", "devconfig", "net_l2", "vector", "_bt_settings_area"]
+                   "rodata", "devconfig", "net_l2", "vector", "sw_isr_table",
+                   "_bt_settings_area"]

    def __init__(self, filename, extra_sections):
        """Constructor
--- a/soc/xtensa/D_108mini/linker.ld
+++ b/soc/xtensa/D_108mini/linker.ld
@ -521,7 +521,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/D_212GP/linker.ld
+++ b/soc/xtensa/D_212GP/linker.ld
@ -527,7 +527,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/D_233L/linker.ld
+++ b/soc/xtensa/D_233L/linker.ld
@ -403,7 +403,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/XRC_D2PM_5swIrq/linker.ld
+++ b/soc/xtensa/XRC_D2PM_5swIrq/linker.ld
@ -531,7 +531,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/XRC_FUSION_AON_ALL_LM/linker.ld
+++ b/soc/xtensa/XRC_FUSION_AON_ALL_LM/linker.ld
@ -359,7 +359,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/esp32/linker.ld
+++ b/soc/xtensa/esp32/linker.ld
@ -169,7 +169,6 @@ SECTIONS
    *(.gnu.linkonce.s2.*)
    KEEP(*(.jcr))
    *(.dram1 .dram1.*)
-    KEEP(*(SW_ISR_TABLE))
    _data_end = ABSOLUTE(.);
    . = ALIGN(4);
  } GROUP_LINK_IN(RAMABLE_REGION)
--- a/soc/xtensa/hifi2_std/linker.ld
+++ b/soc/xtensa/hifi2_std/linker.ld
@ -531,7 +531,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/hifi3_bd5/linker.ld
+++ b/soc/xtensa/hifi3_bd5/linker.ld
@ -307,7 +307,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/hifi3_bd5_call0/linker.ld
+++ b/soc/xtensa/hifi3_bd5_call0/linker.ld
@ -307,7 +307,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/hifi4_bd7/linker.ld
+++ b/soc/xtensa/hifi4_bd7/linker.ld
@ -354,7 +354,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/hifi_mini/linker.ld
+++ b/soc/xtensa/hifi_mini/linker.ld
@ -197,7 +197,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/hifi_mini_4swIrq/linker.ld
+++ b/soc/xtensa/hifi_mini_4swIrq/linker.ld
@ -197,7 +197,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/intel_s1000/linker.ld
+++ b/soc/xtensa/intel_s1000/linker.ld
@ -371,7 +371,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)
--- a/soc/xtensa/sample_controller/linker.ld
+++ b/soc/xtensa/sample_controller/linker.ld
@ -521,7 +521,6 @@ SECTIONS
    _data_start = ABSOLUTE(.);
    *(.data)
    *(.data.*)
-    KEEP(*(SW_ISR_TABLE))
    *(.gnu.linkonce.d.*)
    KEEP(*(.gnu.linkonce.d.*personality*))
    *(.data1)