linux boot stable, revert to original riscv_pkg with zicfiss added mo…

…difs

core/compressed_decoder.sv

@@ -429,7 +429,7 @@ module compressed_decoder #(
                 instr_o = {
                   12'b110011011100,
                   7'b00101,
-                  3'h100,
+                  3'b100,
                   5'b00000,
                   riscv::OpcodeSystem
                 };

core/ex_stage.sv

@@ -603,7 +603,8 @@ module ex_stage
 
   // Mux between load exception and shadow stack pop check ex
   // Check if swapping for the whole load_exception cycles is a problem
-  assign load_exception_o = ssv_loaded ? sspopchk_ex : ld_ex;
+  //assign load_exception_o = ssv_loaded ? sspopchk_ex : ld_ex;
+  assign load_exception_o = ld_ex;
 
   always_comb begin : sspopchk
     sspopchk_ex = '0;

core/include/cv64a6_imafdch_sv39_wb_alsaqr_config_pkg.sv

@@ -27,7 +27,7 @@ package cva6_config_pkg;
   localparam CVA6ConfigVExtEn = 0;
   localparam CVA6ConfigHExtEn = 1;
   localparam CVA6ConfigZiCfiSSEn = 1;
-  localparam CVA6ConfigZiCfiLPEn = 1;
+  localparam CVA6ConfigZiCfiLPEn = 0;
   localparam CVA6ConfigZiCondExtEn = 1;
   localparam CVA6ConfigSclicExtEn = 0;
 

core/include/riscv_pkg.sv

@@ -83,10 +83,12 @@ package riscv;
 
   typedef struct packed {
     logic sd;  // signal dirty state - read-only
-    logic [62:34] wpri7;  // writes preserved reads ignored
+    //logic [62:34] wpri7;  // writes preserved reads ignored
+    logic [62:34] wpri7;
     logic [62:34] wpri6;  // writes preserved reads ignored
     xlen_e uxl;  // variable user mode xlen - hardwired to zero
-    logic spelp;  // hold previous ELP in S-mode
+    //logic spelp;  // hold previous ELP in S-mode
+    logic spelp;
     logic [11:0] wpri5;  // writes preserved reads ignored
     logic mxr;  // make executable readable
     logic sum;  // permit supervisor user memory access
@@ -126,16 +128,19 @@ package riscv;
   typedef struct packed {
     logic sd;  // signal dirty state - read-only
     logic [62:40] wpri4;  // writes preserved reads ignored
-    logic [62:42] wpri5;  // writes preserved reads ignored
-    logic mpelp;  // hold previous ELP in M-mode
+    //logic [62:42] wpri5;  // writes preserved reads ignored
+    //logic mpelp;  // hold previous ELP in M-mode
+    logic [62:42] wpri5;
+    logic mpelp;
     logic mpv;  // machine previous virtualization mode
     logic gva;  // variable set when trap writes to stval
     logic mbe;  // endianness memory accesses made from M-mode
     logic sbe;  // endianness memory accesses made from S-mode
     xlen_e sxl;  // variable supervisor mode xlen - hardwired to zero
     xlen_e uxl;  // variable user mode xlen - hardwired to zero
     logic [8:0] wpri3;  // writes preserved reads ignored
-    logic spelp; // hold previous ELP in S-mode
+    //logic spelp; // hold previous ELP in S-mode
+    logic spelp; 
     logic tsr;  // trap sret
     logic tw;  // time wait
     logic tvm;  // trap virtual memory
@@ -175,9 +180,9 @@ typedef struct packed {
     logic        cbze;   // not implemented - requires Zicboz extension
     logic        cbcfe;  // not implemented - requires Zicbom extension
     logic [1:0]  cbie;   // not implemented - requires Zicbom extension
+    logic [2:0]  wpri0;  // writes preserved reads ignored
     logic        sse;    // enable Zicfiss in less priviledged modes
     logic        lpe;    // enable Zicfilp in less priviledged modes
-    logic        wpri0;  // writes preserved reads ignored
     logic        fiom;   // fence of I/O implies memory
   } envcfg_rv_t;