[silicon_creator,ibex] Move code away from header

The code conditionally compiles from inline version of the code on
the RV platform, and otherwise just declares some external symbol.
This makes the code very difficult to test and mock because the
OT_PLATFORM_RV32 define is only true when compiling for RISC-V
but we do want to test some of this code on the host in a unittest.

Since the initial motivation for this was probably just to make it
inline, and we have since then enabled LTO, there is no realy reason
to do this anymore. This commit moves the device implementation to
ibex.c so that the header always just defines the prototypes.

Signed-off-by: Amaury Pouly <[email protected]>

Author: pamaury

sw/device/silicon_creator/lib/drivers/ibex.c

@@ -14,6 +14,31 @@
 
 static const dt_rv_core_ibex_t kRvCoreIbexDt = kDtRvCoreIbex;
 
+void ibex_mcycle_zero(void) {
+  CSR_WRITE(CSR_REG_MCYCLE, 0);
+  CSR_WRITE(CSR_REG_MCYCLEH, 0);
+}
+
+uint32_t ibex_mcycle32(void) {
+  uint32_t val;
+  CSR_READ(CSR_REG_MCYCLE, &val);
+  return val;
+}
+
+uint64_t ibex_mcycle(void) {
+  uint32_t lo, hi, hi2;
+  do {
+    CSR_READ(CSR_REG_MCYCLEH, &hi);
+    CSR_READ(CSR_REG_MCYCLE, &lo);
+    CSR_READ(CSR_REG_MCYCLEH, &hi2);
+  } while (hi != hi2);
+  return ((uint64_t)hi << 32) | lo;
+}
+
+uint64_t ibex_time_to_cycles(uint64_t time_us) {
+  return to_cpu_cycles(time_us);
+}
+
 /**
  * Base address of the rv_core_ibex registers.
  *
@@ -181,10 +206,3 @@ void ibex_clear_nmi(ibex_nmi_source_t nmi_src) {
   abs_mmio_write32(rv_core_ibex_base() + RV_CORE_IBEX_NMI_STATE_REG_OFFSET,
                    nmi_src);
 }
-
-// `extern` declarations to give the inline functions in the corresponding
-// header a link location.
-extern void ibex_mcycle_zero(void);
-extern uint32_t ibex_mcycle32(void);
-extern uint64_t ibex_mcycle(void);
-extern uint64_t ibex_time_to_cycles(uint64_t time_us);

sw/device/silicon_creator/lib/drivers/ibex.h

@@ -32,51 +32,27 @@ uint32_t ibex_fpga_version(void);
 OT_WARN_UNUSED_RESULT
 size_t ibex_addr_remap_slots(void);
 
-#ifdef OT_PLATFORM_RV32
 /**
  * Set the MCYCLE counter register to zero.
  */
-inline void ibex_mcycle_zero(void) {
-  CSR_WRITE(CSR_REG_MCYCLE, 0);
-  CSR_WRITE(CSR_REG_MCYCLEH, 0);
-}
+void ibex_mcycle_zero(void);
 
 /**
  * Read the low 32 bits of the MCYCLE counter.
  */
 OT_WARN_UNUSED_RESULT
-inline uint32_t ibex_mcycle32(void) {
-  uint32_t val;
-  CSR_READ(CSR_REG_MCYCLE, &val);
-  return val;
-}
+uint32_t ibex_mcycle32(void);
 
 /**
  * Read the 64-bit MCYCLE counter.
  */
 OT_WARN_UNUSED_RESULT
-inline uint64_t ibex_mcycle(void) {
-  uint32_t lo, hi, hi2;
-  do {
-    CSR_READ(CSR_REG_MCYCLEH, &hi);
-    CSR_READ(CSR_REG_MCYCLE, &lo);
-    CSR_READ(CSR_REG_MCYCLEH, &hi2);
-  } while (hi != hi2);
-  return ((uint64_t)hi << 32) | lo;
-}
+uint64_t ibex_mcycle(void);
 
 /**
  * Convert from microseconds to CPU cycles.
  */
-inline uint64_t ibex_time_to_cycles(uint64_t time_us) {
-  return to_cpu_cycles(time_us);
-}
-#else
-extern void ibex_mcycle_zero(void);
-extern uint32_t ibex_mcycle32(void);
-extern uint64_t ibex_mcycle(void);
-extern uint64_t ibex_time_to_cycles(uint64_t time_us);
-#endif
+uint64_t ibex_time_to_cycles(uint64_t time_us);
 
 /**
  * Get random data from the EDN0 interface.