From d89c5b6ba6a560409260f5c5421a7bb9e0555e56 Mon Sep 17 00:00:00 2001
From: MarioOpenHWGroup <126794505+MarioOpenHWGroup@users.noreply.github.com>
Date: Mon, 3 Jun 2024 10:58:22 +0200
Subject: [PATCH] Disable misa we in rm (#2181)

---
 verif/sim/Makefile                  | 5 +----
 verif/tb/core/uvma_cva6pkg_utils.sv | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/verif/sim/Makefile b/verif/sim/Makefile
index b1a44066dc..c2e8615272 100644
--- a/verif/sim/Makefile
+++ b/verif/sim/Makefile
@@ -194,15 +194,12 @@ COMMON_PLUS_ARGS = \
 	+tohost_addr=$(shell $$RISCV/bin/$(CV_SW_PREFIX)nm -B $(elf) | grep -w tohost | cut -d' ' -f1) \
 	+signature=$(elf).signature_output +UVM_TESTNAME=uvmt_cva6_firmware_test_c \
 	$(spike-yaml-plusarg) \
+	+report_file=$(log).yaml +core_name=$(target)
 
 ifneq ($(UVM_VERBOSITY),)
 COMMON_PLUS_ARGS += +UVM_VERBOSITY=$(UVM_VERBOSITY)
 endif
 
-COMMON_RUN_UVM_FLAGS = \
-	 +UVM_TESTNAME=uvmt_cva6_firmware_test_c \
-	+report_file=$(log).yaml +core_name=$(target)
-
 COMMON_RUN_ARGS = \
 	$(COMMON_PLUS_ARGS) $(issrun_opts) \
 	-sv_lib $(SPIKE_INSTALL_DIR)/lib/libcustomext \
diff --git a/verif/tb/core/uvma_cva6pkg_utils.sv b/verif/tb/core/uvma_cva6pkg_utils.sv
index fbb4346f51..c4d61133cc 100644
--- a/verif/tb/core/uvma_cva6pkg_utils.sv
+++ b/verif/tb/core/uvma_cva6pkg_utils.sv
@@ -75,6 +75,8 @@ function st_core_cntrl_cfg cva6pkg_to_core_cntrl_cfg(st_core_cntrl_cfg cfg);
     void'(spike_set_param_bool(base, "status_xs_field_we", 1'b0));
     void'(spike_set_param_uint64_t(base, "misa_override_value", get_misa(cfg)));
     void'(spike_set_param_uint64_t(base, "misa_override_mask", 64'h0FFF_FFFF));
+    void'(spike_set_param_bool    (base, "misa_we_enable", 1'b1));
+    void'(spike_set_param_bool    (base, "misa_we", 1'b0));
 
     return cfg;