commit ebe33a412a845526fac2fb52fb32426ffffa3c04
author Henrik Hoglind <henrik.hoglind@arm.com> Fri Jun 17 11:32:17 2022 +0200
committer Henrik Hoglind <henrik.hoglind@arm.com> Mon Jun 20 09:58:29 2022 +0200
tree 77e5f08ebe7a6f4c8d3a5b2a014f7c8644b0ddf6
parent caf6e6ddb0816b009b8bf19b9ea716b48bc33412

Disable Timing Adapters for Corstone-310

The Timing Adapters are disabled until a proper configuration
exists.

Change-Id: I3f44c74f9b11e1c032522c0fda448b9779ddc43f

targets/corstone-310/CMakeLists.txt

diff --git a/targets/corstone-310/CMakeLists.txt b/targets/corstone-310/CMakeLists.txt
index d9da888..ec0a57a 100644
--- a/targets/corstone-310/CMakeLists.txt
+++ b/targets/corstone-310/CMakeLists.txt
@@ -28,7 +28,7 @@
 
 set(ETHOSU_TARGET_NPU_CONFIG "ethos-u55-256" CACHE STRING "NPU configuration")
 set(ETHOSU_TARGET_NPU_COUNT 1 CACHE INTERNAL "Number of NPUs")
-set(ETHOSU_TARGET_NPU_TA_COUNT 2 CACHE INTERNAL "Number of timing adapters per NPU")
+set(ETHOSU_TARGET_NPU_TA_COUNT 0 CACHE INTERNAL "Number of timing adapters per NPU")
 
 set(ETHOSU_PMU_EVENT_0 -1 CACHE STRING "PMU Event #0")
 set(ETHOSU_PMU_EVENT_1 -1 CACHE STRING "PMU Event #1")

targets/corstone-310/target.cpp

diff --git a/targets/corstone-310/target.cpp b/targets/corstone-310/target.cpp
index c979dbb..3b2820f 100644
--- a/targets/corstone-310/target.cpp
+++ b/targets/corstone-310/target.cpp
@@ -172,6 +172,7 @@
 #define ETHOSU_TA_HISTCNT_1 0
 #endif
 
+#if defined(ETHOSU_TARGET_NPU_TA_COUNT) && ETHOSU_TARGET_NPU_TA_COUNT >= 2
 static uintptr_t ethosu_ta_base_addrs[ETHOSU_NPU_COUNT][ETHOSU_NPU_TA_COUNT] = {
     {ETHOSU0_TA0_BASE_ADDRESS, ETHOSU0_TA1_BASE_ADDRESS}};
 struct timing_adapter ethosu_ta[ETHOSU_NPU_COUNT][ETHOSU_NPU_TA_COUNT];
@@ -203,6 +204,7 @@
                                                                            0, // Read only register
                                                                            ETHOSU_TA_HISTBIN_1,
                                                                            ETHOSU_TA_HISTCNT_1}};
+#endif
 
 #endif
 
@@ -289,6 +291,7 @@
 #ifdef ETHOSU
     // Initialize timing adapter(s)
     for (int i = 0; i < ETHOSU_NPU_COUNT; i++) {
+#if defined(ETHOSU_TARGET_NPU_TA_COUNT) && ETHOSU_TARGET_NPU_TA_COUNT >= 2
         for (int j = 0; j < ETHOSU_NPU_TA_COUNT; j++) {
             if (ta_init(&ethosu_ta[i][j], ethosu_ta_base_addrs[i][j])) {
                 printf("Failed to initialize timing-adapter %d for NPU %d\n", j, i);
@@ -297,6 +300,7 @@
                 ta_set_all(&ethosu_ta[i][j], &ethosu_ta_settings[j]);
             }
         }
+#endif
     }
 
     // Initialize Ethos-U NPU driver