From 5ef7ff315716e7caa1291b727aa280f31bd67a54 Mon Sep 17 00:00:00 2001
From: Germain Haugou <germain.haugou@iis.ee.ethz.ch>
Date: Mon, 20 Jan 2020 21:24:53 +0100
Subject: [PATCH] Few fixes to be able to use runtime without FC on pulp-open

---
 include/archi/chips/pulp/properties.h |  2 ++
 include/pulp.h                        |  2 ++
 kernel/cluster.c                      | 18 ++++++++++++++++--
 kernel/crt0.S                         |  4 ++++
 kernel/init.c                         |  7 +++++++
 lib/libc/minimal/io.c                 | 14 ++++++++++++--
 rules/pulpos/default_rules.mk         |  4 ++++
 7 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/include/archi/chips/pulp/properties.h b/include/archi/chips/pulp/properties.h
index c4de13b..35bcb96 100644
--- a/include/archi/chips/pulp/properties.h
+++ b/include/archi/chips/pulp/properties.h
@@ -95,9 +95,11 @@
  * FC
  */
 
+#ifndef ARCHI_NO_FC
 #define ARCHI_FC_CID        31
 #define ARCHI_HAS_FC_ITC     1
 #define ARCHI_HAS_FC         1
+#endif
 
 
 /*
diff --git a/include/pulp.h b/include/pulp.h
index bf97959..a3b8038 100755
--- a/include/pulp.h
+++ b/include/pulp.h
@@ -36,6 +36,8 @@ typedef enum {
 
 void cluster_start(int cid, int (*entry)());
 
+void cluster_entry_stub();
+
 int cluster_wait(int cid);
 
 void _start();
diff --git a/kernel/cluster.c b/kernel/cluster.c
index ff02de2..70906a2 100644
--- a/kernel/cluster.c
+++ b/kernel/cluster.c
@@ -36,11 +36,14 @@ static void pos_wait_forever()
 
 
 
-void cluster_entry_stub()
+static void cluster_core_init()
 {
     eu_evt_maskSet((1<<PULP_DISPATCH_EVENT) | (1<<PULP_MUTEX_EVENT) | (1<<PULP_HW_BAR_EVENT));
+}
 
-    eu_bar_setup(eu_bar_addr(0), (1<<ARCHI_CLUSTER_NB_PE) - 1);
+void cluster_entry_stub()
+{
+    cluster_core_init();
 
     int retval = ((int (*)())cluster_entry)();
 
@@ -68,6 +71,13 @@ void cluster_start(int cid, int (*entry)())
     // Activate icache
     hal_icache_cluster_enable(cid);
 
+    eu_bar_setup(eu_bar_addr(0), (1<<ARCHI_CLUSTER_NB_PE) - 1);
+
+    if (!hal_is_fc())
+    {
+        cluster_core_init();
+    }
+
     cluster_running = 1;
 
     // Fetch all cores
@@ -89,6 +99,10 @@ int cluster_wait(int cid)
 
 void synch_barrier()
 {
+#ifdef ARCHI_FC_CID
     if (hal_cluster_id() != ARCHI_FC_CID)
+#endif
+    {
         eu_bar_trig_wait_clr(eu_bar_addr(0));
+    }
 }
diff --git a/kernel/crt0.S b/kernel/crt0.S
index 9f5504a..50c2e65 100644
--- a/kernel/crt0.S
+++ b/kernel/crt0.S
@@ -33,8 +33,12 @@ pos_init_entry:
     csrr    a0, 0xF14
     andi    a1, a0, 0x1f
     srli    a0, a0, 5
+#ifdef ARCHI_FC_CID
     li      a2, ARCHI_FC_CID
     bne     a0, a2, pe_start
+#else
+    bnez    a1, pe_start
+#endif
 #endif
 
 
diff --git a/kernel/init.c b/kernel/init.c
index 2d69d04..8dc22e0 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -48,6 +48,8 @@ static void pos_init_do_dtors(void)
 }
 
 
+extern int main(int argc, const char * const argv[]);
+
 
 void pos_init_start()
 {
@@ -77,6 +79,11 @@ void pos_init_start()
 
   // Now now the minimal init are done, we can activate interruptions
   hal_irq_enable();
+
+  if (!hal_is_fc())
+  {
+      cluster_start(hal_cluster_id(), main);
+  }
 }
 
 
diff --git a/lib/libc/minimal/io.c b/lib/libc/minimal/io.c
index ace77c9..0badb95 100644
--- a/lib/libc/minimal/io.c
+++ b/lib/libc/minimal/io.c
@@ -335,8 +335,18 @@ int pos_libc_prf_locked(int (*func)(), void *dest, char *format, va_list vargs)
 static void __attribute__((noreturn)) pos_wait_forever()
 {
 #if defined(ITC_VERSION)
-    hal_itc_enable_clr(0xffffffff);
-    while(1) hal_itc_wait_for_interrupt();
+    if (hal_is_fc())
+    {
+        hal_itc_enable_clr(0xffffffff);
+        while(1) hal_itc_wait_for_interrupt();
+    }
+    else
+    {
+#if defined(EU_VERSION) && EU_VERSION >=3
+        eu_evt_maskClr(0xffffffff);
+        eu_evt_wait();
+#endif
+    }   
 #elif defined(EU_VERSION) && EU_VERSION >=3
     eu_evt_maskClr(0xffffffff);
     eu_evt_wait();
diff --git a/rules/pulpos/default_rules.mk b/rules/pulpos/default_rules.mk
index 1e4c986..b3e60bc 100644
--- a/rules/pulpos/default_rules.mk
+++ b/rules/pulpos/default_rules.mk
@@ -71,6 +71,10 @@ ifdef CONFIG_NB_PE
 PULP_CFLAGS += -DARCHI_CLUSTER_NB_PE=$(CONFIG_NB_PE)
 endif
 
+ifdef CONFIG_NO_FC
+PULP_CFLAGS += -DARCHI_NO_FC=1
+endif
+
 ifdef CONFIG_IO_UART
 PULP_CFLAGS += -DCONFIG_IO_UART=$(CONFIG_IO_UART)
 endif