From d3d746f016ccc2218525f950fc00b96dedd00f54 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Thu, 30 Apr 2015 23:58:49 -0700
Subject: Assume even less about mstatus reset value

---
 pk/minit.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pk/minit.c')

diff --git a/pk/minit.c b/pk/minit.c
index 09b89aa..b22fd53 100644
--- a/pk/minit.c
+++ b/pk/minit.c
@@ -6,11 +6,12 @@ uint32_t num_harts;
 
 static void mstatus_init()
 {
-  uintptr_t ms = read_csr(mstatus);
+  uintptr_t ms = 0;
 #ifdef __riscv64
   ms = INSERT_FIELD(ms, MSTATUS_SA, UA_RV64);
-  ms = INSERT_FIELD(ms, MSTATUS_UA, UA_RV64);
 #endif
+  ms = INSERT_FIELD(ms, MSTATUS_PRV, PRV_M);
+  ms = INSERT_FIELD(ms, MSTATUS_IE, 0);
   ms = INSERT_FIELD(ms, MSTATUS_PRV1, PRV_S);
   ms = INSERT_FIELD(ms, MSTATUS_IE1, 0);
   ms = INSERT_FIELD(ms, MSTATUS_PRV2, PRV_U);
-- 
cgit v1.1