From c4effaeef0868631d403d9cc0a3cfffa50ea323d Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <geist@foobox.com>
Date: Sun, 2 Jun 2024 15:29:53 -0700
Subject: [PATCH] [arch][riscv] add SSTC extension support

Pretty simple extension, just directly set the supervisor timer compare
register (new) instead of calling through to SBI to set it for you.
---
 arch/riscv/include/arch/riscv.h |  3 +++
 arch/riscv/time.c               | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/arch/riscv/include/arch/riscv.h b/arch/riscv/include/arch/riscv.h
index 48875575e..21c05dec3 100644
--- a/arch/riscv/include/arch/riscv.h
+++ b/arch/riscv/include/arch/riscv.h
@@ -58,6 +58,9 @@
 
 #if RISCV_S_MODE // Supervisor-mode only CSRs
 #define RISCV_CSR_SATP      satp
+// sstc feature
+#define RISCV_CSR_STIMECMP  stimecmp
+#define RISCV_CSR_STIMECMPH stimecmph
 #endif
 
 #define RISCV_CSR_XSTATUS_IE    (1ul << (RISCV_XMODE_OFFSET + 0))
diff --git a/arch/riscv/time.c b/arch/riscv/time.c
index ed5f80670..f2352cf38 100644
--- a/arch/riscv/time.c
+++ b/arch/riscv/time.c
@@ -11,6 +11,8 @@
 #include <lk/err.h>
 #include <lk/trace.h>
 
+#include <arch/riscv/feature.h>
+
 #include <arch/riscv.h>
 #include <arch/ops.h>
 
@@ -39,7 +41,16 @@ status_t platform_set_oneshot_timer (platform_timer_callback callback, void *arg
 #if RISCV_M_MODE
     clint_set_timer(ticks);
 #elif RISCV_S_MODE
-    sbi_set_timer(ticks);
+    if (riscv_feature_test(RISCV_FEAT_SSTC)) {
+#if __riscv_xlen == 64
+        riscv_csr_write(RISCV_CSR_STIMECMP, ticks);
+#else
+        riscv_csr_write(RISCV_CSR_STIMECMPH, ticks >> 32);
+        riscv_csr_write(RISCV_CSR_STIMECMP, ticks);
+#endif
+    } else {
+        sbi_set_timer(ticks);
+    }
 #endif
 
     return NO_ERROR;