commit 341a0dfea1fe2a186a1c9130425a20e28e811568
author Jonny Svärd <jonny.svaerd@arm.com> Wed May 20 17:56:37 2020 +0200
committer Jonny Svärd <jonny.svaerd@arm.com> Tue May 26 22:27:05 2020 +0200
tree d5f1b1140cc4c06b16d8982bc6921c24edd2cc42
parent 2e7e3b70bf7d0c783b692b9062abca509f0a43b8

MLBEDSW-2288: Set default/configurable AXI values

Change-Id: I2e72d26699e07b12b42832b59e23b3083c59d1d8

src/ethosu_config.h.in

diff --git a/src/ethosu_config.h.in b/src/ethosu_config.h.in
new file mode 100644
index 0000000..61cd591
--- /dev/null
+++ b/src/ethosu_config.h.in
@@ -0,0 +1,44 @@
+#ifndef ethosu_config_h
+#define ethosu_config_h
+#include <stdint.h>
+
+#define NPU_QCONFIG     (@NPU_QCONFIG@)
+#define NPU_REGIONCFG_0 (@NPU_REGIONCFG_0@)
+#define NPU_REGIONCFG_1 (@NPU_REGIONCFG_1@)
+#define NPU_REGIONCFG_2 (@NPU_REGIONCFG_2@)
+#define NPU_REGIONCFG_3 (@NPU_REGIONCFG_3@)
+#define NPU_REGIONCFG_4 (@NPU_REGIONCFG_4@)
+#define NPU_REGIONCFG_5 (@NPU_REGIONCFG_5@)
+#define NPU_REGIONCFG_6 (@NPU_REGIONCFG_6@)
+#define NPU_REGIONCFG_7 (@NPU_REGIONCFG_7@)
+
+#define AXI_LIMIT0_MAX_BEATS_BYTES          (@AXI_LIMIT0_MAX_BEATS_BYTES@)
+#define AXI_LIMIT0_MEM_TYPE                 (@AXI_LIMIT0_MEM_TYPE@)
+#define AXI_LIMIT0_MAX_OUTSTANDING_READS    ((uint8_t)@AXI_LIMIT0_MAX_OUTSTANDING_READS@)
+#define AXI_LIMIT0_MAX_OUTSTANDING_WRITES   ((uint8_t)@AXI_LIMIT0_MAX_OUTSTANDING_WRITES@)
+#define AXI_LIMIT1_MAX_BEATS_BYTES          (@AXI_LIMIT1_MAX_BEATS_BYTES@)
+#define AXI_LIMIT1_MEM_TYPE                 (@AXI_LIMIT1_MEM_TYPE@)
+#define AXI_LIMIT1_MAX_OUTSTANDING_READS    ((uint8_t)@AXI_LIMIT1_MAX_OUTSTANDING_READS@)
+#define AXI_LIMIT1_MAX_OUTSTANDING_WRITES   ((uint8_t)@AXI_LIMIT1_MAX_OUTSTANDING_WRITES@)
+#define AXI_LIMIT2_MAX_BEATS_BYTES          (@AXI_LIMIT2_MAX_BEATS_BYTES@)
+#define AXI_LIMIT2_MEM_TYPE                 (@AXI_LIMIT2_MEM_TYPE@)
+#define AXI_LIMIT2_MAX_OUTSTANDING_READS    ((uint8_t)@AXI_LIMIT2_MAX_OUTSTANDING_READS@)
+#define AXI_LIMIT2_MAX_OUTSTANDING_WRITES   ((uint8_t)@AXI_LIMIT2_MAX_OUTSTANDING_WRITES@)
+#define AXI_LIMIT3_MAX_BEATS_BYTES          (@AXI_LIMIT3_MAX_BEATS_BYTES@)
+#define AXI_LIMIT3_MEM_TYPE                 (@AXI_LIMIT3_MEM_TYPE@)
+#define AXI_LIMIT3_MAX_OUTSTANDING_READS    ((uint8_t)@AXI_LIMIT3_MAX_OUTSTANDING_READS@)
+#define AXI_LIMIT3_MAX_OUTSTANDING_WRITES   ((uint8_t)@AXI_LIMIT3_MAX_OUTSTANDING_WRITES@)
+
+
+#cmakedefine PMU_AUTOINIT
+#cmakedefine INIT_PMCR        (@INIT_PMCR@)
+#cmakedefine INIT_PMCNTENSET  (@INIT_PMCNTENSET@)
+#cmakedefine INIT_PMCNTENCLR  (@INIT_PMCNTENCLR@)
+#cmakedefine INIT_PMOVSSET    (@INIT_PMOVSSET@)
+#cmakedefine INIT_PMOVSCLR    (@INIT_PMOVSCLR@)
+#cmakedefine INIT_PMINTSET    (@INIT_PMINTSET@)
+#cmakedefine INIT_PMINTCLR    (@INIT_PMINTCLR@)
+#cmakedefine INIT_PMCCNTR     (@INIT_PMCCNTR@)
+#cmakedefine INIT_PMCCNTR_CFG (@INIT_PMCCNTR_CFG@)
+
+#endif

src/ethosu_driver.c

diff --git a/src/ethosu_driver.c b/src/ethosu_driver.c
index 01ec389..8384ebe 100644
--- a/src/ethosu_driver.c
+++ b/src/ethosu_driver.c
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+#include "ethosu_config.h"
 #include "ethosu_driver.h"
 
 #include "ethosu_common.h"
@@ -397,22 +398,39 @@
     return return_code;
 }
 
-void __attribute__((weak)) npu_axi_init()
+void npu_axi_init()
 {
-    // TODO Power on
+    ethosu_set_qconfig(NPU_QCONFIG);
 
-    // TODO Set qconfig
-    ethosu_set_qconfig(0);
+    ethosu_set_regioncfg(0, NPU_REGIONCFG_0);
+    ethosu_set_regioncfg(1, NPU_REGIONCFG_1);
+    ethosu_set_regioncfg(2, NPU_REGIONCFG_2);
+    ethosu_set_regioncfg(3, NPU_REGIONCFG_3);
+    ethosu_set_regioncfg(4, NPU_REGIONCFG_4);
+    ethosu_set_regioncfg(5, NPU_REGIONCFG_5);
+    ethosu_set_regioncfg(6, NPU_REGIONCFG_6);
+    ethosu_set_regioncfg(7, NPU_REGIONCFG_7);
 
-    // TODO Set region config
-    ethosu_set_regioncfg(0, 0);
-    ethosu_set_regioncfg(1, 0);
-    ethosu_set_regioncfg(2, 0);
-    ethosu_set_regioncfg(3, 0);
-    ethosu_set_regioncfg(4, 0);
-    ethosu_set_regioncfg(5, 0);
-    ethosu_set_regioncfg(6, 0);
-    ethosu_set_regioncfg(7, 0);
+    (void)ethosu_set_axi_limit0(
+        AXI_LIMIT0_MAX_BEATS_BYTES,
+        AXI_LIMIT0_MEM_TYPE,
+        AXI_LIMIT0_MAX_OUTSTANDING_READS,
+        AXI_LIMIT0_MAX_OUTSTANDING_WRITES);
+    (void)ethosu_set_axi_limit1(
+        AXI_LIMIT1_MAX_BEATS_BYTES,
+        AXI_LIMIT1_MEM_TYPE,
+        AXI_LIMIT1_MAX_OUTSTANDING_READS,
+        AXI_LIMIT1_MAX_OUTSTANDING_WRITES);
+    (void)ethosu_set_axi_limit2(
+        AXI_LIMIT2_MAX_BEATS_BYTES,
+        AXI_LIMIT2_MEM_TYPE,
+        AXI_LIMIT2_MAX_OUTSTANDING_READS,
+        AXI_LIMIT2_MAX_OUTSTANDING_WRITES);
+    (void)ethosu_set_axi_limit3(
+        AXI_LIMIT3_MAX_BEATS_BYTES,
+        AXI_LIMIT3_MEM_TYPE,
+        AXI_LIMIT3_MAX_OUTSTANDING_READS,
+        AXI_LIMIT3_MAX_OUTSTANDING_WRITES);
 }
 
 static int handle_command_stream(const uint8_t *cmd_stream,