From 1ff24b34ebe568a5d606928af69914de946b9762 Mon Sep 17 00:00:00 2001
From: Radoslaw Koppel <radoslaw.koppel@nordicsemi.no>
Date: Tue, 19 Dec 2023 16:54:18 +0100
Subject: [PATCH] arch: arm: Update to support local ISR declaration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit updates the arm and arm64 architecture files
to support the new ISR handlers creation parser.

Signed-off-by: Radosław Koppel <radoslaw.koppel@nordicsemi.no>
---
 arch/arm/core/CMakeLists.txt                      | 8 ++++++++
 arch/arm/core/swi_tables.ld                       | 8 ++++++++
 arch/arm/core/vector_table.ld                     | 4 ++++
 arch/arm64/core/CMakeLists.txt                    | 8 ++++++++
 arch/arm64/core/swi_tables.ld                     | 8 ++++++++
 arch/common/CMakeLists.txt                        | 5 +++++
 include/zephyr/arch/arm64/scripts/linker.ld       | 5 ++++-
 include/zephyr/linker/irq-vector-table-section.ld | 2 ++
 include/zephyr/linker/isr-local-drop-unused.ld    | 9 +++++++++
 9 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/core/swi_tables.ld
 create mode 100644 arch/arm64/core/swi_tables.ld
 create mode 100644 include/zephyr/linker/isr-local-drop-unused.ld

diff --git a/arch/arm/core/CMakeLists.txt b/arch/arm/core/CMakeLists.txt
index 41e3dc485ff..922dab2ddba 100644
--- a/arch/arm/core/CMakeLists.txt
+++ b/arch/arm/core/CMakeLists.txt
@@ -35,3 +35,11 @@ else()
 zephyr_linker_sources(ROM_START SORT_KEY 0x0vectors vector_table.ld)
 zephyr_linker_sources(ROM_START SORT_KEY 0x1vectors cortex_m/vector_table_pad.ld)
 endif()
+
+if(CONFIG_GEN_SW_ISR_TABLE)
+  if(CONFIG_DYNAMIC_INTERRUPTS)
+    zephyr_linker_sources(RWDATA swi_tables.ld)
+  else()
+    zephyr_linker_sources(RODATA swi_tables.ld)
+  endif()
+endif()
diff --git a/arch/arm/core/swi_tables.ld b/arch/arm/core/swi_tables.ld
new file mode 100644
index 00000000000..c6ca94604dd
--- /dev/null
+++ b/arch/arm/core/swi_tables.ld
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#if LINKER_ZEPHYR_FINAL
+INCLUDE zephyr/isr_tables_swi.ld
+#endif
diff --git a/arch/arm/core/vector_table.ld b/arch/arm/core/vector_table.ld
index 615067dbf74..58210afdcbc 100644
--- a/arch/arm/core/vector_table.ld
+++ b/arch/arm/core/vector_table.ld
@@ -51,6 +51,10 @@ _vector_start = .;
 KEEP(*(.exc_vector_table))
 KEEP(*(".exc_vector_table.*"))
 
+#if LINKER_ZEPHYR_FINAL && CONFIG_ISR_TABLES_LOCAL_DECLARATION
+INCLUDE zephyr/isr_tables_vt.ld
+#else
 KEEP(*(.vectors))
+#endif
 
 _vector_end = .;
diff --git a/arch/arm64/core/CMakeLists.txt b/arch/arm64/core/CMakeLists.txt
index 1804556c1a7..05e4be8c0ea 100644
--- a/arch/arm64/core/CMakeLists.txt
+++ b/arch/arm64/core/CMakeLists.txt
@@ -55,3 +55,11 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 endif()
 
 add_subdirectory_ifdef(CONFIG_XEN xen)
+
+if(CONFIG_GEN_SW_ISR_TABLE)
+  if(CONFIG_DYNAMIC_INTERRUPTS)
+    zephyr_linker_sources(RWDATA swi_tables.ld)
+  else()
+    zephyr_linker_sources(RODATA swi_tables.ld)
+  endif()
+endif()
diff --git a/arch/arm64/core/swi_tables.ld b/arch/arm64/core/swi_tables.ld
new file mode 100644
index 00000000000..c6ca94604dd
--- /dev/null
+++ b/arch/arm64/core/swi_tables.ld
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#if LINKER_ZEPHYR_FINAL
+INCLUDE zephyr/isr_tables_swi.ld
+#endif
diff --git a/arch/common/CMakeLists.txt b/arch/common/CMakeLists.txt
index 1a89ba9c13a..409c378f620 100644
--- a/arch/common/CMakeLists.txt
+++ b/arch/common/CMakeLists.txt
@@ -39,6 +39,11 @@ zephyr_linker_sources_ifdef(CONFIG_GEN_ISR_TABLES
   ${ZEPHYR_BASE}/include/zephyr/linker/intlist.ld
 )
 
+zephyr_linker_sources_ifdef(CONFIG_ISR_TABLES_LOCAL_DECLARATION
+  SECTIONS
+  ${ZEPHYR_BASE}/include/zephyr/linker/isr-local-drop-unused.ld
+)
+
 zephyr_linker_sources_ifdef(CONFIG_GEN_IRQ_VECTOR_TABLE
   ROM_START
   SORT_KEY 0x0vectors
diff --git a/include/zephyr/arch/arm64/scripts/linker.ld b/include/zephyr/arch/arm64/scripts/linker.ld
index 38a7bac297b..55c768f55e4 100644
--- a/include/zephyr/arch/arm64/scripts/linker.ld
+++ b/include/zephyr/arch/arm64/scripts/linker.ld
@@ -111,8 +111,11 @@ SECTIONS
         KEEP(*(.exc_vector_table))
         KEEP(*(".exc_vector_table.*"))
 
+#if LINKER_ZEPHYR_FINAL && CONFIG_ISR_TABLES_LOCAL_DECLARATION
+        INCLUDE zephyr/isr_tables_vt.ld
+#else
         KEEP(*(.vectors))
-
+#endif
         _vector_end = .;
 
         *(.text)
diff --git a/include/zephyr/linker/irq-vector-table-section.ld b/include/zephyr/linker/irq-vector-table-section.ld
index 17c483db98f..141eee4d28d 100644
--- a/include/zephyr/linker/irq-vector-table-section.ld
+++ b/include/zephyr/linker/irq-vector-table-section.ld
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 
+#if !(LINKER_ZEPHYR_FINAL && CONFIG_ISR_TABLES_LOCAL_DECLARATION)
 . = ALIGN(CONFIG_ARCH_IRQ_VECTOR_TABLE_ALIGN);
 KEEP(*(_IRQ_VECTOR_TABLE_SECTION_SYMS))
+#endif
 
 /*
  * Some ARM platforms require this symbol to be placed after the IRQ vector
diff --git a/include/zephyr/linker/isr-local-drop-unused.ld b/include/zephyr/linker/isr-local-drop-unused.ld
new file mode 100644
index 00000000000..9b6e1272413
--- /dev/null
+++ b/include/zephyr/linker/isr-local-drop-unused.ld
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#if LINKER_ZEPHYR_FINAL && CONFIG_ISR_TABLES_LOCAL_DECLARATION
+/DISCARD/ :
+{
+    KEEP(*(.vectors))
+    KEEP(*(_IRQ_VECTOR_TABLE_SECTION_SYMS))
+}
+#endif