lib: Factor-out SBI replacement extensions

This patch factor-out SBI replacement extensions (such as RFENCE,
IPI, and TIME) into its own source for better modularity of SBI
implementation.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>

4 files changed, 150 insertions, 133 deletions

diff --git a/include/sbi/sbi_ecall.h b/include/sbi/sbi_ecall.h
index a7360b3..2357f79 100644
--- a/include/sbi/sbi_ecall.h
+++ b/include/sbi/sbi_ecall.h
@@ -30,6 +30,9 @@ struct sbi_ecall_extension {
 };
 
 extern struct sbi_ecall_extension ecall_legacy;
+extern struct sbi_ecall_extension ecall_time;
+extern struct sbi_ecall_extension ecall_rfence;
+extern struct sbi_ecall_extension ecall_ipi;
 
 u16 sbi_ecall_version_major(void);
 
diff --git a/lib/sbi/objects.mk b/lib/sbi/objects.mk
index 6a610b5..1c343be 100644
--- a/lib/sbi/objects.mk
+++ b/lib/sbi/objects.mk
@@ -15,6 +15,7 @@ libsbi-objs-y += riscv_locks.o
 libsbi-objs-y += sbi_console.o
 libsbi-objs-y += sbi_ecall.o
 libsbi-objs-y += sbi_ecall_legacy.o
+libsbi-objs-y += sbi_ecall_replace.o
 libsbi-objs-y += sbi_emulate_csr.o
 libsbi-objs-y += sbi_fifo.o
 libsbi-objs-y += sbi_hfence.o
diff --git a/lib/sbi/sbi_ecall.c b/lib/sbi/sbi_ecall.c
index 23a6c82..d817fef 100644
--- a/lib/sbi/sbi_ecall.c
+++ b/lib/sbi/sbi_ecall.c
@@ -10,12 +10,7 @@
 #include <sbi/sbi_ecall.h>
 #include <sbi/sbi_ecall_interface.h>
 #include <sbi/sbi_error.h>
-#include <sbi/sbi_ipi.h>
 #include <sbi/sbi_platform.h>
-#include <sbi/sbi_timer.h>
-#include <sbi/sbi_tlb.h>
-#include <sbi/sbi_trap.h>
-#include <sbi/sbi_hart.h>
 #include <sbi/sbi_version.h>
 
 #define SBI_ECALL_VERSION_MAJOR 0
@@ -97,134 +92,6 @@ static struct sbi_ecall_extension ecall_base = {
 	.handle = sbi_ecall_base_handler,
 };
 
-static int sbi_ecall_time_handler(struct sbi_scratch *scratch,
-				  unsigned long extid, unsigned long funcid,
-				  unsigned long *args, unsigned long *out_val,
-				  struct sbi_trap_info *out_trap)
-{
-	int ret = 0;
-
-	if (funcid == SBI_EXT_TIME_SET_TIMER) {
-#if __riscv_xlen == 32
-		sbi_timer_event_start(scratch,
-				      (((u64)args[1] << 32) | (u64)args[0]));
-#else
-		sbi_timer_event_start(scratch, (u64)args[0]);
-#endif
-	} else
-		ret = SBI_ENOTSUPP;
-
-	return ret;
-}
-
-static struct sbi_ecall_extension ecall_time = {
-	.extid_start = SBI_EXT_TIME,
-	.extid_end = SBI_EXT_TIME,
-	.handle = sbi_ecall_time_handler,
-};
-
-static int sbi_ecall_ipi_handler(struct sbi_scratch *scratch,
-				 unsigned long extid, unsigned long funcid,
-				 unsigned long *args, unsigned long *out_val,
-				 struct sbi_trap_info *out_trap)
-{
-	int ret = 0;
-
-	if (funcid == SBI_EXT_IPI_SEND_IPI)
-		ret = sbi_ipi_send_smode(scratch, args[0], args[1]);
-	else
-		ret = SBI_ENOTSUPP;
-
-	return ret;
-}
-
-static struct sbi_ecall_extension ecall_ipi = {
-	.extid_start = SBI_EXT_IPI,
-	.extid_end = SBI_EXT_IPI,
-	.handle = sbi_ecall_ipi_handler,
-};
-
-static int sbi_ecall_rfence_handler(struct sbi_scratch *scratch,
-				    unsigned long extid, unsigned long funcid,
-				    unsigned long *args, unsigned long *out_val,
-				    struct sbi_trap_info *out_trap)
-{
-	int ret = 0;
-	struct sbi_tlb_info tlb_info;
-	u32 source_hart = sbi_current_hartid();
-
-	if (funcid >= SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA &&
-	    funcid <= SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID)
-		if (!misa_extension('H'))
-			return SBI_ENOTSUPP;
-
-	switch (funcid) {
-	case SBI_EXT_RFENCE_REMOTE_FENCE_I:
-		tlb_info.start  = 0;
-		tlb_info.size  = 0;
-		tlb_info.type  = SBI_ITLB_FLUSH;
-		tlb_info.shart_mask = 1UL << source_hart;
-		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
-		break;
-	case SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA:
-		tlb_info.start = (unsigned long)args[2];
-		tlb_info.size  = (unsigned long)args[3];
-		tlb_info.type  = SBI_TLB_FLUSH_GVMA;
-		tlb_info.shart_mask = 1UL << source_hart;
-		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
-		break;
-	case SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID:
-		tlb_info.start = (unsigned long)args[2];
-		tlb_info.size  = (unsigned long)args[3];
-		tlb_info.asid  = (unsigned long)args[4];
-		tlb_info.type  = SBI_TLB_FLUSH_GVMA_VMID;
-		tlb_info.shart_mask = 1UL << source_hart;
-		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
-		break;
-	case SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA:
-		tlb_info.start = (unsigned long)args[2];
-		tlb_info.size  = (unsigned long)args[3];
-		tlb_info.type  = SBI_TLB_FLUSH_VVMA;
-		tlb_info.shart_mask = 1UL << source_hart;
-		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
-		break;
-	case SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID:
-		tlb_info.start = (unsigned long)args[2];
-		tlb_info.size  = (unsigned long)args[3];
-		tlb_info.asid  = (unsigned long)args[4];
-		tlb_info.type  = SBI_TLB_FLUSH_VVMA_ASID;
-		tlb_info.shart_mask = 1UL << source_hart;
-		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
-		break;
-	case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA:
-		tlb_info.start = (unsigned long)args[2];
-		tlb_info.size  = (unsigned long)args[3];
-		tlb_info.type  = SBI_TLB_FLUSH_VMA;
-		tlb_info.shart_mask = 1UL << source_hart;
-		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
-		break;
-	case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID:
-		tlb_info.start = (unsigned long)args[2];
-		tlb_info.size  = (unsigned long)args[3];
-		tlb_info.asid  = (unsigned long)args[4];
-		tlb_info.type  = SBI_TLB_FLUSH_VMA_ASID;
-		tlb_info.shart_mask = 1UL << source_hart;
-		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
-		break;
-
-	default:
-		ret = SBI_ENOTSUPP;
-	};
-
-	return ret;
-}
-
-static struct sbi_ecall_extension ecall_rfence = {
-	.extid_start = SBI_EXT_RFENCE,
-	.extid_end = SBI_EXT_RFENCE,
-	.handle = sbi_ecall_rfence_handler,
-};
-
 static int sbi_ecall_vendor_probe(struct sbi_scratch *scratch,
 				  unsigned long extid,
 				  unsigned long *out_val)
diff --git a/lib/sbi/sbi_ecall_replace.c b/lib/sbi/sbi_ecall_replace.c
new file mode 100644
index 0000000..7728d60
--- /dev/null
+++ b/lib/sbi/sbi_ecall_replace.c
@@ -0,0 +1,146 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2020 Western Digital Corporation or its affiliates.
+ *
+ * Authors:
+ *   Anup Patel <anup.patel@wdc.com>
+ *   Atish Patra <atish.patra@wdc.com>
+ */
+
+#include <sbi/sbi_ecall.h>
+#include <sbi/sbi_ecall_interface.h>
+#include <sbi/sbi_error.h>
+#include <sbi/sbi_hart.h>
+#include <sbi/sbi_ipi.h>
+#include <sbi/sbi_timer.h>
+#include <sbi/sbi_tlb.h>
+#include <sbi/riscv_asm.h>
+
+static int sbi_ecall_time_handler(struct sbi_scratch *scratch,
+				  unsigned long extid, unsigned long funcid,
+				  unsigned long *args, unsigned long *out_val,
+				  struct sbi_trap_info *out_trap)
+{
+	int ret = 0;
+
+	if (funcid == SBI_EXT_TIME_SET_TIMER) {
+#if __riscv_xlen == 32
+		sbi_timer_event_start(scratch,
+				      (((u64)args[1] << 32) | (u64)args[0]));
+#else
+		sbi_timer_event_start(scratch, (u64)args[0]);
+#endif
+	} else
+		ret = SBI_ENOTSUPP;
+
+	return ret;
+}
+
+struct sbi_ecall_extension ecall_time = {
+	.extid_start = SBI_EXT_TIME,
+	.extid_end = SBI_EXT_TIME,
+	.handle = sbi_ecall_time_handler,
+};
+
+static int sbi_ecall_rfence_handler(struct sbi_scratch *scratch,
+				    unsigned long extid, unsigned long funcid,
+				    unsigned long *args, unsigned long *out_val,
+				    struct sbi_trap_info *out_trap)
+{
+	int ret = 0;
+	struct sbi_tlb_info tlb_info;
+	u32 source_hart = sbi_current_hartid();
+
+	if (funcid >= SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA &&
+	    funcid <= SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID)
+		if (!misa_extension('H'))
+			return SBI_ENOTSUPP;
+
+	switch (funcid) {
+	case SBI_EXT_RFENCE_REMOTE_FENCE_I:
+		tlb_info.start  = 0;
+		tlb_info.size  = 0;
+		tlb_info.type  = SBI_ITLB_FLUSH;
+		tlb_info.shart_mask = 1UL << source_hart;
+		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
+		break;
+	case SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA:
+		tlb_info.start = (unsigned long)args[2];
+		tlb_info.size  = (unsigned long)args[3];
+		tlb_info.type  = SBI_TLB_FLUSH_GVMA;
+		tlb_info.shart_mask = 1UL << source_hart;
+		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
+		break;
+	case SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID:
+		tlb_info.start = (unsigned long)args[2];
+		tlb_info.size  = (unsigned long)args[3];
+		tlb_info.asid  = (unsigned long)args[4];
+		tlb_info.type  = SBI_TLB_FLUSH_GVMA_VMID;
+		tlb_info.shart_mask = 1UL << source_hart;
+		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
+		break;
+	case SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA:
+		tlb_info.start = (unsigned long)args[2];
+		tlb_info.size  = (unsigned long)args[3];
+		tlb_info.type  = SBI_TLB_FLUSH_VVMA;
+		tlb_info.shart_mask = 1UL << source_hart;
+		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
+		break;
+	case SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID:
+		tlb_info.start = (unsigned long)args[2];
+		tlb_info.size  = (unsigned long)args[3];
+		tlb_info.asid  = (unsigned long)args[4];
+		tlb_info.type  = SBI_TLB_FLUSH_VVMA_ASID;
+		tlb_info.shart_mask = 1UL << source_hart;
+		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
+		break;
+	case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA:
+		tlb_info.start = (unsigned long)args[2];
+		tlb_info.size  = (unsigned long)args[3];
+		tlb_info.type  = SBI_TLB_FLUSH_VMA;
+		tlb_info.shart_mask = 1UL << source_hart;
+		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
+		break;
+	case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID:
+		tlb_info.start = (unsigned long)args[2];
+		tlb_info.size  = (unsigned long)args[3];
+		tlb_info.asid  = (unsigned long)args[4];
+		tlb_info.type  = SBI_TLB_FLUSH_VMA_ASID;
+		tlb_info.shart_mask = 1UL << source_hart;
+		ret = sbi_tlb_request(scratch, args[0], args[1], &tlb_info);
+		break;
+
+	default:
+		ret = SBI_ENOTSUPP;
+	};
+
+	return ret;
+}
+
+struct sbi_ecall_extension ecall_rfence = {
+	.extid_start = SBI_EXT_RFENCE,
+	.extid_end = SBI_EXT_RFENCE,
+	.handle = sbi_ecall_rfence_handler,
+};
+
+static int sbi_ecall_ipi_handler(struct sbi_scratch *scratch,
+				 unsigned long extid, unsigned long funcid,
+				 unsigned long *args, unsigned long *out_val,
+				 struct sbi_trap_info *out_trap)
+{
+	int ret = 0;
+
+	if (funcid == SBI_EXT_IPI_SEND_IPI)
+		ret = sbi_ipi_send_smode(scratch, args[0], args[1]);
+	else
+		ret = SBI_ENOTSUPP;
+
+	return ret;
+}
+
+struct sbi_ecall_extension ecall_ipi = {
+	.extid_start = SBI_EXT_IPI,
+	.extid_end = SBI_EXT_IPI,
+	.handle = sbi_ecall_ipi_handler,
+};