simple: Update cap skipping for SMC

Need to update skipping caps since the SMC cap is only included conditionally. Signed-off-by: Robbie VanVossen <[email protected]>
seL4 · Sep 13, 2023 · f8aabb6 · f8aabb6
1 parent b154d15
commit f8aabb6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/libsel4simple-default/src/libsel4simple-default.c b/libsel4simple-default/src/libsel4simple-default.c
@@ -113,6 +113,12 @@ seL4_CPtr simple_default_nth_cap(void *data, int n)
         if (true_return >= seL4_CapInitThreadSC) {
             true_return++;
         }
+#endif
+#ifndef CONFIG_ALLOW_SMC_CALLS
+        /* skip seL4_CapSMC if SMC Calls are not enabled */
+        if (true_return >= seL4_CapSMC) {
+            true_return++;
+        }
 #endif
     } else if (n < shared_frame_range) {
         return bi->sharedFrames.start + (n - SIMPLE_NUM_INIT_CAPS);

diff --git a/libsel4simple/arch_include/arm/simple/arch/simple.h b/libsel4simple/arch_include/arm/simple/arch/simple.h
@@ -28,7 +28,13 @@
 #define SIMPLE_SKIP_SMMU_CAPS 2
 #endif
 
-#define SIMPLE_SKIPPED_INIT_CAPS (3 + SIMPLE_SKIP_THREADSC + SIMPLE_SKIP_SMMU_CAPS)
+#ifdef CONFIG_ALLOW_SMC_CALLS
+#define SIMPLE_SKIP_SMC 0
+#else
+#define SIMPLE_SKIP_SMC 1
+#endif
+
+#define SIMPLE_SKIPPED_INIT_CAPS (3 + SIMPLE_SKIP_THREADSC + SIMPLE_SKIP_SMMU_CAPS + SIMPLE_SKIP_SMC)
 
 /* Request a cap to a specific IRQ number on the system
  *

diff --git a/libsel4simple/arch_include/x86/simple/arch/simple.h b/libsel4simple/arch_include/x86/simple/arch/simple.h
@@ -15,7 +15,7 @@
 #include <vka/cspacepath_t.h>
 
 /* Simple does not address initial null caps, including seL4_CapNull
- * seL4_CapSMMUSIDControl, seL4_CapSMMUCBControl are null on x86 */
+ * seL4_CapSMMUSIDControl, seL4_CapSMMUCBControl, seL4_CapSMC are null on x86 */
 #ifdef CONFIG_IOMMU
 #define SIMPLE_SKIP_IOSPACE 0
 #else
@@ -29,7 +29,7 @@
 #define SIMPLE_SKIP_THREADSC 1
 #endif
 
-#define SIMPLE_SKIPPED_INIT_CAPS (3 + SIMPLE_SKIP_IOSPACE + SIMPLE_SKIP_THREADSC)
+#define SIMPLE_SKIPPED_INIT_CAPS (4 + SIMPLE_SKIP_IOSPACE + SIMPLE_SKIP_THREADSC)
 
 /**
  * Request a cap to the IOPorts