diff --git a/sys/riscv/include/cpu.h b/sys/riscv/include/cpu.h
index b33e34d350fb..64e93e984a9b 100644
--- a/sys/riscv/include/cpu.h
+++ b/sys/riscv/include/cpu.h
@@ -90,6 +90,7 @@ void	cpu_halt(void) __dead2;
 void	cpu_reset(void) __dead2;
 void	fork_trampoline(void);
 void	identify_cpu(void);
+void	printcpuinfo(void);
 
 static __inline uint64_t
 get_cyclecount(void)
diff --git a/sys/riscv/riscv/identcpu.c b/sys/riscv/riscv/identcpu.c
index 9b2330ee7051..c6e93d02cd36 100644
--- a/sys/riscv/riscv/identcpu.c
+++ b/sys/riscv/riscv/identcpu.c
@@ -365,6 +365,14 @@ identify_cpu_ids(struct cpu_desc *desc)
 
 void
 identify_cpu(void)
+{
+	struct cpu_desc *desc = &cpu_desc[PCPU_GET(cpuid)];
+
+	identify_cpu_ids(desc);
+}
+
+void
+printcpuinfo(void)
 {
 	struct cpu_desc *desc;
 	u_int cpu, hart;
@@ -373,8 +381,6 @@ identify_cpu(void)
 	hart = PCPU_GET(hart);
 	desc = &cpu_desc[cpu];
 
-	identify_cpu_ids(desc);
-
 	/* Print details for boot CPU or if we want verbose output */
 	if (cpu == 0 || bootverbose) {
 		/* Summary line. */
diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c
index 6b8dcb647162..805cbe2d887b 100644
--- a/sys/riscv/riscv/machdep.c
+++ b/sys/riscv/riscv/machdep.c
@@ -128,7 +128,7 @@ cpu_startup(void *dummy)
 {
 
 	sbi_print_version();
-	identify_cpu();
+	printcpuinfo();
 
 	printf("real memory  = %ju (%ju MB)\n", ptoa((uintmax_t)realmem),
 	    ptoa((uintmax_t)realmem) / (1024 * 1024));
@@ -536,6 +536,11 @@ initriscv(struct riscv_bootparams *rvbp)
 	physmem_hardware_regions(mem_regions, mem_regions_sz);
 #endif
 
+	/*
+	 * Identify CPU/ISA features.
+	 */
+	identify_cpu();
+
 	/* Do basic tuning, hz etc */
 	init_param1();
 
diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c
index 799f07036c00..291e94df1f21 100644
--- a/sys/riscv/riscv/mp_machdep.c
+++ b/sys/riscv/riscv/mp_machdep.c
@@ -255,6 +255,7 @@ init_secondary(uint64_t hart)
 	 * runtime chip identification.
 	 */
 	identify_cpu();
+	printcpuinfo();
 
 	/* Enable software interrupts */
 	riscv_unmask_ipi();