aboutsummaryrefslogtreecommitdiff
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/CMakeLists.txt9
-rw-r--r--applications/message_handler_openamp/core_driver_mutex.cpp13
-rw-r--r--applications/message_handler_openamp/message_handler.hpp6
-rw-r--r--applications/trustzone_inference/secure/main_secure.cpp5
4 files changed, 23 insertions, 10 deletions
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index 1fa2b2e..a017575 100644
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -1,6 +1,5 @@
#
-# SPDX-FileCopyrightText: Copyright 2021, 2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
-#
+# SPDX-FileCopyrightText: Copyright 2021, 2023-2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the License); you may
@@ -32,3 +31,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "ARMClang")
# Only armclang supported for now
add_subdirectory(trustzone_inference)
endif()
+
+message(STATUS "*******************************************************")
+message(STATUS "PROJECT_NAME : ${PROJECT_NAME}")
+message(STATUS "TR_ARENA_SIZE : ${TR_ARENA_SIZE}")
+message(STATUS "MESSAGE_HANDLER_ARENA_SIZE : ${MESSAGE_HANDLER_ARENA_SIZE}")
+message(STATUS "*******************************************************")
diff --git a/applications/message_handler_openamp/core_driver_mutex.cpp b/applications/message_handler_openamp/core_driver_mutex.cpp
index 7948bd0..5f2e6cc 100644
--- a/applications/message_handler_openamp/core_driver_mutex.cpp
+++ b/applications/message_handler_openamp/core_driver_mutex.cpp
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * SPDX-FileCopyrightText: Copyright 2022-2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the License); you may
@@ -24,11 +24,15 @@
#include <stdio.h>
extern "C" {
-
void *ethosu_mutex_create(void) {
return xSemaphoreCreateMutex();
}
+void ethosu_mutex_destroy(void *mutex) {
+ SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(mutex);
+ vSemaphoreDelete(handle);
+}
+
int ethosu_mutex_lock(void *mutex) {
SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(mutex);
if (xSemaphoreTake(handle, portMAX_DELAY) != pdTRUE) {
@@ -51,6 +55,11 @@ void *ethosu_semaphore_create(void) {
return xSemaphoreCreateCounting(255, 0);
}
+void ethosu_semaphore_destroy(void *sem) {
+ SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(sem);
+ vSemaphoreDelete(handle);
+}
+
int ethosu_semaphore_take(void *sem, uint64_t timeout) {
SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(sem);
if (xSemaphoreTake(handle, (TickType_t)timeout) != pdTRUE) {
diff --git a/applications/message_handler_openamp/message_handler.hpp b/applications/message_handler_openamp/message_handler.hpp
index ea8bc3e..4ff9328 100644
--- a/applications/message_handler_openamp/message_handler.hpp
+++ b/applications/message_handler_openamp/message_handler.hpp
@@ -45,9 +45,9 @@ struct Message {
rpmsg.header.msg_id = msgId;
}
- uint32_t src = 0;
- uint32_t length = 0;
- EthosU::ethosu_rpmsg rpmsg;
+ uint32_t src = 0;
+ uint32_t length = 0;
+ EthosU::ethosu_rpmsg rpmsg = {};
};
/*****************************************************************************
diff --git a/applications/trustzone_inference/secure/main_secure.cpp b/applications/trustzone_inference/secure/main_secure.cpp
index 1e0ea58..c070020 100644
--- a/applications/trustzone_inference/secure/main_secure.cpp
+++ b/applications/trustzone_inference/secure/main_secure.cpp
@@ -1,6 +1,5 @@
/*
- * Copyright (c) 2021-2022 Arm Limited. All rights reserved.
- *
+ * SPDX-FileCopyrightText: Copyright 2021-2022, 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the License); you may
@@ -224,7 +223,7 @@ void setup_xtgu_ns(uint32_t xtgu_base, uint32_t xtcm_start, uint32_t xtcm_size)
uint32_t xtcm_end = xtcm_start + xtcm_size - 1;
uint32_t xtcm_address = xtcm_start;
uint32_t block_idx_start = (xtcm_address / BLKSZ) / 32;
- uint32_t block_idx_end;
+ uint32_t block_idx_end = 0;
while (xtcm_address < xtcm_end) {
uint32_t block_nbr = xtcm_address / BLKSZ;