cmake: make MAX_NUM_IRQ calculation arch specific

- KernelMaxNumNodes is always defined, it's at lest 1 - check CONFIGURE_NUM_PPI explicitly Signed-off-by: Axel Heider <[email protected]>
axel-h · Apr 29, 2024 · 979e0ea · 979e0ea
1 parent da68196
commit 979e0ea
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/config.cmake b/config.cmake
@@ -51,15 +51,19 @@ if(DEFINED CALLED_declare_default_headers)
     # calculate the irq cnode size based on MAX_NUM_IRQ
     if(KernelArchRiscV)
         math(EXPR MAX_NUM_IRQ "${CONFIGURE_MAX_IRQ} + 2")
-    else()
-        if(DEFINED KernelMaxNumNodes AND CONFIGURE_NUM_PPI GREATER "0" AND KernelArchARM)
+    elseif(KernelArchARM)
+        set(MAX_NUM_IRQ "${CONFIGURE_MAX_IRQ}")
+        if(DEFINED CONFIGURE_NUM_PPI)
+            # The PPIs are a part of CONFIGURE_MAX_IRQ, but they are separate
+            # for each core.
             math(
                 EXPR MAX_NUM_IRQ
-                "(${KernelMaxNumNodes}-1)*${CONFIGURE_NUM_PPI} + ${CONFIGURE_MAX_IRQ}"
+                "${MAX_NUM_IRQ} + ((${KernelMaxNumNodes} - 1) * ${CONFIGURE_NUM_PPI})"
             )
-        else()
-            set(MAX_NUM_IRQ "${CONFIGURE_MAX_IRQ}")
         endif()
+    else()
+        # Don't make any assumption about other architectures.
+        message(FATAL_ERROR "unsupported architecture: '${KernelArch}'")
     endif()
     set(BITS "0")
     while(MAX_NUM_IRQ GREATER "0")

diff --git a/configs/seL4Config.cmake b/configs/seL4Config.cmake
@@ -129,6 +129,17 @@ macro(declare_default_headers)
         ""
         ${ARGN}
     )
+
+    if(KernelArchARM)
+        if(NOT DEFINED CONFIGURE_NUM_PPI)
+            set(CONFIGURE_NUM_PPI "32")
+        endif()
+    else()
+        if(DEFINED CONFIGURE_NUM_PPI)
+            message(FATAL_ERROR "NUM_PPI is currently for ARM only")
+        endif()
+    endif()
+
     set(CALLED_declare_default_headers 1)
 endmacro()