Merge pull request #403 from niklas-arm/feature/nvic_ownership

First box to call NVIC owns the interrupt

Author: AlessandroA

api/inc/vmpu_exports.h

@@ -27,6 +27,9 @@
  * terminating NULL. */
 #define UVISOR_MAX_BOX_NAMESPACE_LENGTH 37
 
+/** Invalid box id for use in marking objects with invalid ownership. */
+#define UVISOR_BOX_ID_INVALID ((uint8_t) -1)
+
 /* supervisor user access modes */
 #define UVISOR_TACL_UEXECUTE        0x0001UL
 #define UVISOR_TACL_UWRITE          0x0002UL

core/system/inc/page_allocator_config.h

@@ -44,8 +44,6 @@
 
 /* The page box_id is the box id which is 8-bit large. */
 typedef uint8_t page_owner_t;
-/* Define a unused value for the page table. */
-#define UVISOR_PAGE_UNUSED ((page_owner_t) (-1))
 /* Contains the total number of available pages. */
 extern uint8_t g_page_count_total;
 /* Contains the shift of the page owner mask. */

core/system/inc/unvic.h

@@ -52,7 +52,7 @@ extern uint32_t unvic_irq_priority_get(uint32_t irqn);
 extern int      unvic_irq_level_get(void);
 extern int      unvic_default(uint32_t isr_id);
 
-extern void unvic_init(void);
+extern void unvic_init(uint32_t const * const user_vtor);
 
 /** Perform a context switch-in as a result of an interrupt request.
  *

core/system/src/main.c

@@ -21,7 +21,7 @@
 #include "unvic.h"
 #include "vmpu.h"
 
-UVISOR_NOINLINE void uvisor_init_pre(void)
+UVISOR_NOINLINE void uvisor_init_pre(uint32_t const * const user_vtor)
 {
     /* Reset the uVisor own BSS section. */
     memset(&__bss_start__, 0, VMPU_REGION_SIZE(&__bss_start__, &__bss_end__));
@@ -30,7 +30,7 @@ UVISOR_NOINLINE void uvisor_init_pre(void)
     memcpy(&__data_start__, &__data_start_src__, VMPU_REGION_SIZE(&__data_start__, &__data_end__));
 
     /* Initialize the unprivileged NVIC module. */
-    unvic_init();
+    unvic_init(user_vtor);
 
     /* Initialize the debugging features. */
     DEBUG_INIT();
@@ -135,7 +135,7 @@ void main_entry(void)
     }
 
     /* Early uVisor initialization. */
-    uvisor_init_pre();
+    uvisor_init_pre((uint32_t *) SCB->VTOR);
 
     /* Run basic sanity checks. */
     if (vmpu_init_pre() == 0) {

core/system/src/page_allocator.c

@@ -36,6 +36,7 @@
  * SVC call, which automagically serializes access to it. */
 #define UVISOR_PAGE_ALLOCATOR_MUTEX_AQUIRE  {}
 #define UVISOR_PAGE_ALLOCATOR_MUTEX_RELEASE {}
+#define UVISOR_PAGE_UNUSED UVISOR_BOX_ID_INVALID
 
 #endif /* defined(UVISOR_PRESENT) && (UVISOR_PRESENT == 1) */
 
@@ -73,12 +74,6 @@ uint8_t page_allocator_get_page_from_address(uint32_t address)
 
 void page_allocator_init(void * const heap_start, void * const heap_end, const uint32_t * const page_size)
 {
-    /* Make sure the UVISOR_PAGE_UNUSED is definitely NOT a valid box id. */
-    if (vmpu_is_box_id_valid(UVISOR_PAGE_UNUSED)) {
-        HALT_ERROR(SANITY_CHECK_FAILED,
-            "UVISOR_PAGE_UNUSED (%u) must not be a valid box id!\n",
-            UVISOR_PAGE_UNUSED);
-    }
     if (!page_size || !vmpu_public_flash_addr((uint32_t) page_size)) {
         HALT_ERROR(SANITY_CHECK_FAILED,
             "Page size pointer (0x%08x) is not in flash memory.\n",

core/system/src/page_allocator_faults.c

@@ -16,13 +16,15 @@
  */
 
 #include <uvisor.h>
+#include "api/inc/vmpu_exports.h"
 #include "page_allocator.h"
 #include "page_allocator_faults.h"
 #include "page_allocator_config.h"
 #include "context.h"
 
 /* Maps the number of faults to a page. */
 uint32_t g_page_fault_table[UVISOR_PAGE_MAX_COUNT];
+#define UVISOR_PAGE_UNUSED UVISOR_BOX_ID_INVALID
 
 void page_allocator_reset_faults(uint8_t page)
 {