Merge pull request #3270 from AlessandroA/update_uvisor

uVisor: Update to v0.26.1

Author: adbridge

features/FEATURE_UVISOR/AUTHORS.txt

@@ -1,13 +1,13 @@
-   569	Milosch Meriac
-   478	Alessandro Angelino
-    73	Jaeden Amero
-    54	Niklas Hauser
-     3	Hugo Vincent
+   584	Milosch Meriac
+   501	Alessandro Angelino
+    95	Jaeden Amero
+    61	Niklas Hauser
+     4	Irit Arkin
      3	JaredCJR
      3	Jim Huang
-     2	Vincenzo Frascino
+     3	Hugo Vincent
      2	tonyyanxuan
+     2	Vincenzo Frascino
      1	Aksel Skauge Mellbye
-     1	Irit Arkin
-     1	Nathan Chong
      1	ccli8
+     1	Nathan Chong

features/FEATURE_UVISOR/VERSION.txt

@@ -1 +1 @@
-v0.25.1
+v0.26.1

features/FEATURE_UVISOR/importer/Makefile

@@ -96,6 +96,12 @@ publish: rsync TARGET_M3 TARGET_M4
 	#
 	# Rename target directorires to TARGET_* filters...
 	$(foreach target, $(TARGET_TRANSLATION),mv $(TARGET_SUPPORTED)/$(subst .,,$(suffix $(target))) $(TARGET_SUPPORTED)/TARGET_$(basename $(target));)
+	#
+	# Updating checked out version tag
+	git -C $(UVISOR_DIR) describe --tags --abbrev=40 --dirty > $(TARGET_PREFIX)VERSION.txt
+	#
+	# Updated list of authors, sorted by contributions
+	git -C $(UVISOR_DIR) shortlog -s -n > $(TARGET_PREFIX)AUTHORS.txt
 
 uvisor-compile: $(UVISOR_GIT_CFG)
 	make -C $(UVISOR_DIR)
@@ -104,12 +110,6 @@ update: $(UVISOR_GIT_CFG)
 	#
 	# Updating to latest uVisor library version
 	git -C $(UVISOR_DIR) pull --rebase
-	#
-	# Updating checked out version tag
-	git -C $(UVISOR_DIR) describe --tags --abbrev=40 --dirty > $(TARGET_PREFIX)VERSION.txt
-	#
-	# Updated list of authors, sorted by contributions
-	git -C $(UVISOR_DIR) shortlog -s -n > $(TARGET_PREFIX)AUTHORS.txt
 
 $(UVISOR_GIT_CFG):
 	rm -rf $(UVISOR_DIR)

features/FEATURE_UVISOR/includes/uvisor/api/inc/api.h

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2016, ARM Limited, All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __UVISOR_API_H__
+#define __UVISOR_API_H__
+
+#include "rt_OsEventObserver.h"
+#include "api/inc/uvisor_exports.h"
+#include "api/inc/unvic_exports.h"
+#include "api/inc/debug_exports.h"
+#include "api/inc/halt_exports.h"
+#include "api/inc/pool_queue_exports.h"
+#include "api/inc/page_allocator_exports.h"
+#include <stdint.h>
+
+#define UVISOR_API_MAGIC 0x5C9411B4
+#define UVISOR_API_VERSION (10)
+
+UVISOR_EXTERN_C_BEGIN
+
+extern void uvisor_init(void);
+
+typedef struct {
+    uint32_t magic;
+    uint32_t (*get_version)(uint32_t);
+
+    void (*init)(void);
+
+    void     (*irq_enable)(uint32_t irqn);
+    void     (*irq_disable)(uint32_t irqn);
+    void     (*irq_disable_all)(void);
+    void     (*irq_enable_all)(void);
+    void     (*irq_set_vector)(uint32_t irqn, uint32_t vector);
+    uint32_t (*irq_get_vector)(uint32_t irqn);
+    void     (*irq_set_priority)(uint32_t irqn, uint32_t priority);
+    uint32_t (*irq_get_priority)(uint32_t irqn);
+    void     (*irq_set_pending)(uint32_t irqn);
+    uint32_t (*irq_get_pending)(uint32_t irqn);
+    void     (*irq_clear_pending)(uint32_t irqn);
+    int      (*irq_get_level)(void);
+    void     (*irq_system_reset)(TResetReason reason);
+
+    int (*page_malloc)(UvisorPageTable * const table);
+    int (*page_free)(const UvisorPageTable * const table);
+
+    int (*box_namespace)(int box_id, char *box_namespace, size_t length);
+
+    void (*debug_init)(const TUvisorDebugDriver * const driver);
+    void (*error)(THaltUserError reason);
+    void (*vmpu_mem_invalidate)(void);
+
+    int                (*pool_init)(uvisor_pool_t *, void *, size_t, size_t, int);
+    int                (*pool_queue_init)(uvisor_pool_queue_t *, uvisor_pool_t *, void *, size_t, size_t, int);
+    uvisor_pool_slot_t (*pool_allocate)(uvisor_pool_t *, uint32_t);
+    void               (*pool_queue_enqueue)(uvisor_pool_queue_t *, uvisor_pool_slot_t);
+    uvisor_pool_slot_t (*pool_free)(uvisor_pool_t *, uvisor_pool_slot_t);
+    uvisor_pool_slot_t (*pool_queue_dequeue)(uvisor_pool_queue_t *, uvisor_pool_slot_t);
+    uvisor_pool_slot_t (*pool_queue_dequeue_first)(uvisor_pool_queue_t *);
+    uvisor_pool_slot_t (*pool_queue_find_first)(uvisor_pool_queue_t *, TQueryFN_Ptr, void *);
+
+    OsEventObserver os_event_observer;
+} UVISOR_PACKED UvisorApi;
+
+extern UvisorApi uvisor_api;
+
+static UVISOR_FORCEINLINE uint32_t uvisor_get_version(void)
+{
+    return uvisor_api.get_version(UVISOR_API_VERSION);
+}
+
+UVISOR_EXTERN_C_END
+
+#endif /* __UVISOR_API_H__ */

features/FEATURE_UVISOR/includes/uvisor/api/inc/box_config.h

@@ -24,6 +24,7 @@
 #include <stdint.h>
 
 UVISOR_EXTERN const uint32_t __uvisor_mode;
+UVISOR_EXTERN void const * const main_cfg_ptr;
 
 #define UVISOR_DISABLED   0
 #define UVISOR_PERMISSIVE 1
@@ -58,7 +59,7 @@ UVISOR_EXTERN const uint32_t __uvisor_mode;
         acl_list_count \
     }; \
     \
-    extern const __attribute__((section(".keep.uvisor.cfgtbl_ptr_first"), aligned(4))) void * const main_cfg_ptr = &main_cfg;
+    UVISOR_EXTERN const __attribute__((section(".keep.uvisor.cfgtbl_ptr_first"), aligned(4))) void * const main_cfg_ptr = &main_cfg;
 
 /* Creates a global page heap with at least `minimum_number_of_pages` each of size `page_size` in bytes.
  * The total page heap size is at least `minimum_number_of_pages * page_size`. */
@@ -106,7 +107,10 @@ UVISOR_EXTERN const uint32_t __uvisor_mode;
         acl_list_count \
     }; \
     \
-    extern const __attribute__((section(".keep.uvisor.cfgtbl_ptr"), aligned(4))) void * const box_name ## _cfg_ptr = &box_name ## _cfg;
+    UVISOR_EXTERN const __attribute__((section(".keep.uvisor.cfgtbl_ptr"), aligned(4))) void * const box_name ## _cfg_ptr = &box_name ## _cfg;
+
+#define UVISOR_BOX_EXTERN(box_name) \
+    UVISOR_EXTERN const __attribute__((section(".keep.uvisor.cfgtbl_ptr"), aligned(4))) void * const box_name ## _cfg_ptr;
 
 #define __UVISOR_BOX_CONFIG_NOCONTEXT(box_name, acl_list, stack_size) \
     __UVISOR_BOX_CONFIG(box_name, acl_list, UVISOR_ARRAY_COUNT(acl_list), stack_size, 0) \
@@ -153,13 +157,4 @@ UVISOR_EXTERN const uint32_t __uvisor_mode;
 
 #define uvisor_ctx (*__uvisor_ps)
 
-/* Copy the box namespace of the specified box ID to the memory provided by
- * box_namespace. The box_namespace's length must be at least
- * MAX_BOX_NAMESPACE_LENGTH bytes. Return how many bytes were copied into
- * box_namespace. Return UVISOR_ERROR_INVALID_BOX_ID if the provided box ID is
- * invalid. Return UVISOR_ERROR_BUFFER_TOO_SMALL if the provided box_namespace
- * is too small to hold MAX_BOX_NAMESPACE_LENGTH bytes. Return
- * UVISOR_ERROR_BOX_NAMESPACE_ANONYMOUS if the box is anonymous. */
-UVISOR_EXTERN int uvisor_box_namespace(int box_id, char *box_namespace, size_t length);
-
 #endif /* __UVISOR_API_BOX_CONFIG_H__ */

features/FEATURE_UVISOR/includes/uvisor/api/inc/box_id.h

@@ -17,13 +17,29 @@
 #ifndef __UVISOR_API_BOX_ID_H__
 #define __UVISOR_API_BOX_ID_H__
 
-#include "api/inc/uvisor_exports.h"
+#include "api/inc/api.h"
+
+UVISOR_EXTERN_C_BEGIN
 
 /* Return the numeric box ID of the current box. */
-UVISOR_EXTERN int uvisor_box_id_self(void);
+int uvisor_box_id_self(void);
 
 /* Return the numeric box ID of the box that is calling through the most recent
  * secure gateway. Return -1 if there is no secure gateway calling box. */
-UVISOR_EXTERN int uvisor_box_id_caller(void) UVISOR_DEPRECATED;
+int uvisor_box_id_caller(void) UVISOR_DEPRECATED;
+
+/* Copy the box namespace of the specified box ID to the memory provided by
+ * box_namespace. The box_namespace's length must be at least
+ * MAX_BOX_NAMESPACE_LENGTH bytes. Return how many bytes were copied into
+ * box_namespace. Return UVISOR_ERROR_INVALID_BOX_ID if the provided box ID is
+ * invalid. Return UVISOR_ERROR_BUFFER_TOO_SMALL if the provided box_namespace
+ * is too small to hold MAX_BOX_NAMESPACE_LENGTH bytes. Return
+ * UVISOR_ERROR_BOX_NAMESPACE_ANONYMOUS if the box is anonymous. */
+static UVISOR_FORCEINLINE int uvisor_box_namespace(int box_id, char *box_namespace, size_t length)
+{
+    return uvisor_api.box_namespace(box_id, box_namespace, length);
+}
+
+UVISOR_EXTERN_C_END
 
 #endif /* __UVISOR_API_BOX_ID_H__ */

features/FEATURE_UVISOR/includes/uvisor/api/inc/debug.h

@@ -20,6 +20,13 @@
 #include "api/inc/debug_exports.h"
 #include "api/inc/uvisor_exports.h"
 
-UVISOR_EXTERN void uvisor_debug_init(const TUvisorDebugDriver * const driver);
+UVISOR_EXTERN_C_BEGIN
+
+static UVISOR_FORCEINLINE void uvisor_debug_init(const TUvisorDebugDriver * const driver)
+{
+    uvisor_api.debug_init(driver);
+}
+
+UVISOR_EXTERN_C_END
 
 #endif /* __UVISOR_API_DEBUG_H__ */

features/FEATURE_UVISOR/includes/uvisor/api/inc/error.h

@@ -19,7 +19,15 @@
 
 #include "api/inc/halt_exports.h"
 #include "api/inc/uvisor_exports.h"
+#include "api/inc/api.h"
 
-UVISOR_EXTERN void uvisor_error(THaltUserError reason);
+UVISOR_EXTERN_C_BEGIN
+
+static UVISOR_FORCEINLINE void uvisor_error(THaltUserError reason)
+{
+    uvisor_api.error(reason);
+}
+
+UVISOR_EXTERN_C_END
 
 #endif /* __UVISOR_API_ERROR_H__ */

features/FEATURE_UVISOR/includes/uvisor/api/inc/export_table_exports.h

@@ -25,6 +25,7 @@
 #define UVISOR_ERROR_OUT_OF_STRUCTURES          (-7)
 #define UVISOR_ERROR_INVALID_PARAMETERS         (-8)
 #define UVISOR_ERROR_NOT_IMPLEMENTED            (-9)
+#define UVISOR_ERROR_TIMEOUT                    (-10)
 
 
 #define UVISOR_ERROR_CLASS_MASK     (0xFFFF0000UL)