Index: sys/riscv/include/sbi.h
===================================================================
--- sys/riscv/include/sbi.h
+++ sys/riscv/include/sbi.h
@@ -196,13 +196,6 @@
 	(void)SBI_CALL0(SBI_SHUTDOWN, 0);
 }
 
-static __inline void
-sbi_clear_ipi(void)
-{
-
-	(void)SBI_CALL0(SBI_CLEAR_IPI, 0);
-}
-
 static __inline void
 sbi_send_ipi(const unsigned long *hart_mask)
 {
Index: sys/riscv/riscv/mp_machdep.c
===================================================================
--- sys/riscv/riscv/mp_machdep.c
+++ sys/riscv/riscv/mp_machdep.c
@@ -317,7 +317,7 @@
 	u_int cpu, ipi;
 	int bit;
 
-	sbi_clear_ipi();
+	csr_clear(sip, SIP_SSIP);
 
 	cpu = PCPU_GET(cpuid);
 
Index: sys/riscv/riscv/sbi.c
===================================================================
--- sys/riscv/riscv/sbi.c
+++ sys/riscv/riscv/sbi.c
@@ -183,8 +183,6 @@
 	    ("SBI doesn't implement sbi_console_putchar()"));
 	KASSERT(sbi_probe_extension(SBI_CONSOLE_GETCHAR) != 0,
 	    ("SBI doesn't implement sbi_console_getchar()"));
-	KASSERT(sbi_probe_extension(SBI_CLEAR_IPI) != 0,
-	    ("SBI doesn't implement sbi_clear_ipi()"));
 	KASSERT(sbi_probe_extension(SBI_SEND_IPI) != 0,
 	    ("SBI doesn't implement sbi_send_ipi()"));
 	KASSERT(sbi_probe_extension(SBI_REMOTE_FENCE_I) != 0,