[csrng/rtl] Use enum data type for cmd field in core data types

This is a pure refactor commmit that uses the acmd_e type for all `cmd`
fields in the core data types instead of the equivalent pure-logic
representation. This should substanitally aid during wave debugging.

Signed-off-by: Florian Glaser <[email protected]>

Author: glaserf

hw/ip/csrng/rtl/csrng_block_encrypt.sv

@@ -145,7 +145,7 @@ module csrng_block_encrypt import csrng_pkg::*; #(
 
   assign rsp_data_o = '{
     inst_id: sfifo_cmdid_rdata[CmdWidth +: InstIdWidth],
-    cmd:     sfifo_cmdid_rdata[0 +: CmdWidth],
+    cmd:     acmd_e'(sfifo_cmdid_rdata[CmdWidth-1:0]),
     key:     '0, // unused in rsp path
     v:       cipher_data_out
   };

hw/ip/csrng/rtl/csrng_core.sv

@@ -286,7 +286,7 @@ module csrng_core import csrng_pkg::*; #(
   mubi4_t               flag0_q, flag0_d;
   logic [NumAppsLg-1:0] cmd_arb_idx_q, cmd_arb_idx_d;
   logic                 genbits_stage_fips_sw_q, genbits_stage_fips_sw_d;
-  logic [CmdWidth-1:0]  cmd_req_ccmd_dly_q, cmd_req_ccmd_dly_d;
+  acmd_e                cmd_req_ccmd_dly_q, cmd_req_ccmd_dly_d;
   logic                 cs_aes_halt_q, cs_aes_halt_d;
   logic [SeedLen-1:0]   entropy_src_seed_q, entropy_src_seed_d;
   logic                 entropy_src_fips_q, entropy_src_fips_d;
@@ -304,7 +304,7 @@ module csrng_core import csrng_pkg::*; #(
       flag0_q                 <= prim_mubi_pkg::MuBi4False;
       cmd_arb_idx_q           <= '0;
       genbits_stage_fips_sw_q <= '0;
-      cmd_req_ccmd_dly_q      <= '0;
+      cmd_req_ccmd_dly_q      <= INV;
       cs_aes_halt_q           <= '0;
       entropy_src_seed_q      <= '0;
       entropy_src_fips_q      <= '0;
@@ -1144,7 +1144,7 @@ module csrng_core import csrng_pkg::*; #(
   //  outputs: 416b K,V,RC
 
   assign ctr_drbg_cmd_req_vld = !cs_enable_fo[45] ? 1'b0 : main_sm_cmd_vld;
-  assign cmd_req_ccmd_dly_d   = !cs_enable_fo[44] ?   '0 : acmd_hold;
+  assign cmd_req_ccmd_dly_d   = !cs_enable_fo[44] ?  INV : acmd_hold;
 
   assign ctr_drbg_cmd_req_data = '{
     inst_id: shid_q,

hw/ip/csrng/rtl/csrng_ctr_drbg_cmd.sv

@@ -202,7 +202,7 @@ module csrng_ctr_drbg_cmd import csrng_pkg::*; (
     rsp_glast_o = req_glast_i;
     if (req_data_i.cmd == UNI) begin
       // Zeroize everything but inst_id and cmd (?)
-      rsp_data_o = '{default: '0};
+      rsp_data_o = '{cmd: INV, default: '0};
       rsp_data_o.inst_id = req_data_i.inst_id;
       rsp_data_o.cmd     = req_data_i.cmd;
     end else if (!bypass_upd) begin

hw/ip/csrng/rtl/csrng_pkg.sv

@@ -81,8 +81,8 @@ package csrng_pkg;
     GEN  = 3'h3,
     UPD  = 3'h4,
     UNI  = 3'h5,
-    GENB = 3'h6,
-    GENU = 3'h7
+    GENB = 3'h6, // Rsp routing for block encrypt
+    GENU = 3'h7  // Rsp routing for update unit
   } acmd_e;
 
   typedef struct packed {
@@ -105,22 +105,22 @@ package csrng_pkg;
     logic  [RsCtrWidth-1:0] rs_ctr;
     logic     [SeedLen-1:0] pdata;
     logic [InstIdWidth-1:0] inst_id;
-    logic    [CmdWidth-1:0] cmd;
+    acmd_e                  cmd;
     logic      [KeyLen-1:0] key;
     logic      [BlkLen-1:0] v;
   } csrng_core_data_t;
 
   typedef struct packed {
     logic     [SeedLen-1:0] pdata;
     logic [InstIdWidth-1:0] inst_id;
-    logic    [CmdWidth-1:0] cmd;
+    acmd_e                  cmd;
     logic      [KeyLen-1:0] key;
     logic      [BlkLen-1:0] v;
   } csrng_upd_data_t;
 
   typedef struct packed {
     logic [InstIdWidth-1:0] inst_id;
-    logic    [CmdWidth-1:0] cmd;
+    acmd_e                  cmd;
     logic      [KeyLen-1:0] key;
     logic      [BlkLen-1:0] v;
   } csrng_benc_data_t;