diff --git a/arch/risc-v/src/common/riscv_cpustart.c b/arch/risc-v/src/common/riscv_cpustart.c
index c0079ce4c5..068cbce8fe 100644
--- a/arch/risc-v/src/common/riscv_cpustart.c
+++ b/arch/risc-v/src/common/riscv_cpustart.c
@@ -38,6 +38,11 @@
 #include "sched/sched.h"
 #include "init/init.h"
 #include "riscv_internal.h"
+
+#ifdef CONFIG_BUILD_KERNEL
+#  include "riscv_mmu.h"
+#endif
+
 #include "chip.h"
 
 /****************************************************************************
@@ -72,6 +77,17 @@ void riscv_cpu_boot(int cpu)
 
   asm("WFI");
 
+#ifdef CONFIG_BUILD_KERNEL
+  /* Initialize the per CPU areas */
+
+  riscv_percpu_add_hart((uintptr_t)cpu);
+
+  /* Enable MMU */
+
+  binfo("mmu_enable: satp=%lx\n", g_kernel_pgt_pbase);
+  mmu_enable(g_kernel_pgt_pbase, 0);
+#endif
+
   _info("CPU%d Started\n", this_cpu());
 
 #ifdef CONFIG_STACK_COLORATION
diff --git a/arch/risc-v/src/common/riscv_mmu.h b/arch/risc-v/src/common/riscv_mmu.h
index e2b0fd3132..4242367dac 100644
--- a/arch/risc-v/src/common/riscv_mmu.h
+++ b/arch/risc-v/src/common/riscv_mmu.h
@@ -115,6 +115,12 @@
 #error "Unsupported RISC-V MMU implementation selected"
 #endif /* CONFIG_ARCH_MMU_TYPE_SV39 */
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+extern uintptr_t g_kernel_pgt_pbase;
+
 /****************************************************************************
  * Name: mmu_satp_reg
  *
diff --git a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h
index ed72b21d9d..65014cc26c 100644
--- a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h
+++ b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h
@@ -29,8 +29,15 @@
 #define QEMU_RV_CLINT_MTIMECMP  (QEMU_RV_CLINT_BASE + 0x4000)
 #define QEMU_RV_CLINT_MTIME     (QEMU_RV_CLINT_BASE + 0xbff8)
 
-#define RISCV_CLINT_MSIP        QEMU_RV_CLINT_MSIP
+#define QEMU_RV_ACLINT_SSIP     (QEMU_RV_ACLINT_BASE + 0x0000)
 
-#define RISCV_IPI               RISCV_CLINT_MSIP
+#define RISCV_CLINT_MSIP        QEMU_RV_CLINT_MSIP
+#define RISCV_ACLINT_SSIP       QEMU_RV_ACLINT_SSIP
+
+#ifdef CONFIG_ARCH_USE_S_MODE
+#  define RISCV_IPI             RISCV_ACLINT_SSIP
+#else
+#  define RISCV_IPI             RISCV_CLINT_MSIP
+#endif
 
 #endif /* __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_CLINT_H */
diff --git a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
index 592e3e5d5d..868f3d698a 100644
--- a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
+++ b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
@@ -28,6 +28,7 @@
 /* Register Base Address ****************************************************/
 
 #define QEMU_RV_CLINT_BASE   0x02000000
+#define QEMU_RV_ACLINT_BASE  0x02f00000
 #define QEMU_RV_PLIC_BASE    0x0c000000
 
 #endif /* __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_MEMORYMAP_H */
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_start.c b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
index f88ed108fa..34158c80cc 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_start.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
@@ -123,6 +123,8 @@ void qemu_rv_start(int mhartid)
   showprogress('C');
 
 #ifdef CONFIG_BUILD_KERNEL
+  /* Setup page tables for kernel and enable MMU */
+
   qemu_rv_mm_init();
 #endif
 
@@ -144,13 +146,22 @@ cpux:
 
 #ifdef CONFIG_BUILD_KERNEL
 
+/****************************************************************************
+ * Name: qemu_rv_start_s
+ ****************************************************************************/
+
 void qemu_rv_start_s(int mhartid)
 {
-  qemu_rv_clear_bss();
+  /* NOTE: still in M-mode */
 
-  /* Initialize the per CPU areas */
+  if (0 == mhartid)
+    {
+      qemu_rv_clear_bss();
 
-  riscv_percpu_add_hart(mhartid);
+      /* Initialize the per CPU areas */
+
+      riscv_percpu_add_hart(mhartid);
+    }
 
   /* Disable MMU and enable PMP */
 
@@ -180,9 +191,14 @@ void qemu_rv_start_s(int mhartid)
 
   WRITE_CSR(mtvec, (uintptr_t)__trap_vec_m);
 
-  /* Initialize mtimer before entering to S-mode */
+  if (0 == mhartid)
+    {
+      /* Only the primary CPU needs to initialize mtimer
+       * before entering to S-mode
+       */
 
-  up_mtimer_initialize();
+      up_mtimer_initialize();
+    }
 
   /* Set mepc to the entry */