[keymgr_dpe, dv] Remove otp_ctrl dependency

This commit removes all otp_ctrl dependency in the keymgr_dpe dv.
This change ensures that the dv architecture accurately reflects
the dependency in the RTL implementation.

Signed-off-by: Raphael Roth <rroth@lowrisc.org>

Author: rroth-lowrisc

hw/ip/keymgr_dpe/dv/env/keymgr_dpe_if.sv

@@ -108,33 +108,35 @@ interface keymgr_dpe_if(input clk, input rst_n);
   task automatic init(bit rand_otp_key, bit invalid_otp_key);
     // Keymgr_dpe only latches OTP key once, so this scb does not support change OTP key on the
     // fly. Will write a direct sequence to cover otp key change on the fly.
-    otp_ctrl_pkg::otp_keymgr_key_t local_otp_key;
+    keymgr_dpe_pkg::keymgr_dpe_creator_root_key_t local_creator_root_key;
 
     // async delay as these signals are from different clock domain
     #($urandom_range(1000, 0) * 1ns);
     keymgr_dpe_en = lc_ctrl_pkg::On;
     keymgr_dpe_div = 64'h5CFBD765CE33F34E;
     otp_device_id = 'hF0F0;
-    otp_key = otp_ctrl_pkg::OTP_KEYMGR_KEY_DEFAULT;
     for (int i = 0; i < NumRomDigestInputs; ++i) begin
       rom_digests[i].data = 256'hA20A046CF42E6EAC560A3F82BFA76285B5C1D4AEA7C915E49A32D1C89BE0F507;
       rom_digests[i].valid = '1;
     end
+    // Load the default value for all seed's
+    local_creator_root_key = keymgr_dpe_pkg::KEYMGR_DPE_CREATOR_ROOT_KEY_DEFAULT;
+    creator_seed = keymgr_dpe_pkg::KEYMGR_DPE_CREATOR_SEED_DEFAULT;
+    owner_seed = keymgr_dpe_pkg::KEYMGR_DPE_OWNER_SEED_DEFAULT;
+    // If requested randomize the creator_root_key
     if (rand_otp_key) begin
-      `DV_CHECK_STD_RANDOMIZE_WITH_FATAL(local_otp_key,
-                                         local_otp_key.creator_root_key_share0_valid == 1;
-                                         local_otp_key.creator_root_key_share1_valid == 1;
-                                         !(local_otp_key.creator_root_key_share0 inside {0, '1});
-                                         !(local_otp_key.creator_root_key_share1 inside {0, '1});
+      `DV_CHECK_STD_RANDOMIZE_WITH_FATAL(local_creator_root_key,
+                                         local_creator_root_key.share0_valid == 1;
+                                         local_creator_root_key.share1_valid == 1;
+                                         !(local_creator_root_key.share0 inside {0, '1});
+                                         !(local_creator_root_key.share1 inside {0, '1});
                                          , , msg_id)
-    end else begin
-      local_otp_key = otp_ctrl_pkg::OTP_KEYMGR_KEY_DEFAULT;
     end
     if (invalid_otp_key) begin
-      local_otp_key.creator_root_key_share0_valid = 0;
-      local_otp_key.creator_root_key_share1_valid = 0;
+      local_creator_root_key.share0_valid = 0;
+      local_creator_root_key.share1_valid = 0;
     end
-    otp_key = local_otp_key;
+    creator_root_key = local_creator_root_key;
   endtask
 
   // reset local exp variables when reset is issued

hw/ip/keymgr_dpe/dv/env/keymgr_dpe_scoreboard.sv

@@ -973,10 +973,10 @@ class keymgr_dpe_scoreboard extends cip_base_scoreboard #(
 
   virtual function void latch_otp_key();
     key_shares_t otp_key;
-    if (cfg.keymgr_dpe_vif.otp_key.creator_root_key_share0_valid &&
-        cfg.keymgr_dpe_vif.otp_key.creator_root_key_share1_valid) begin
-      otp_key = {cfg.keymgr_dpe_vif.otp_key.creator_root_key_share1,
-                 cfg.keymgr_dpe_vif.otp_key.creator_root_key_share0};
+    if (cfg.keymgr_dpe_vif.creator_root_key.share0_valid &&
+        cfg.keymgr_dpe_vif.creator_root_key.share1_valid) begin
+      otp_key = {cfg.keymgr_dpe_vif.creator_root_key.share1,
+                 cfg.keymgr_dpe_vif.creator_root_key.share0};
     end else begin
       if (cfg.en_cov) cov.invalid_hw_input_cg.sample(OtpRootKeyValidLow);
       `uvm_info(`gfn, "otp_key valid is low", UVM_LOW)
@@ -1274,7 +1274,7 @@ class keymgr_dpe_scoreboard extends cip_base_scoreboard #(
 
     if (exp_match) `DV_CHECK_EQ(byte_data_q.size, keymgr_dpe_pkg::DpeAdvDataWidth / 8)
     act = {<<8{byte_data_q}};
-    exp.DiversificationKey = cfg.keymgr_dpe_vif.otp_key.creator_seed;
+    exp.DiversificationKey = cfg.keymgr_dpe_vif.creator_seed.seed;
 
     for (int i = 0; i < keymgr_dpe_reg_pkg::NumRomDigestInputs; ++i) begin
       exp.RomDigests[i] = cfg.keymgr_dpe_vif.rom_digests[i].data;
@@ -1310,7 +1310,7 @@ class keymgr_dpe_scoreboard extends cip_base_scoreboard #(
     string str = $sformatf("src_slot: %0d\n", current_key_slot.src_slot);
 
     act = {<<8{byte_data_q}};
-    exp.OwnerRootSecret = cfg.keymgr_dpe_vif.otp_key.owner_seed;
+    exp.OwnerRootSecret = cfg.keymgr_dpe_vif.owner_seed.seed;
     get_sw_binding_mirrored_value(exp.SoftwareBinding);
 
     `CREATE_CMP_STR(unused)

hw/ip/keymgr_dpe/dv/keymgr_dpe_sim.core

@@ -7,7 +7,7 @@ description: "KEYMGR_DPE DV sim target"
 filesets:
   files_rtl:
     depend:
-      - lowrisc:ip:otp_ctrl_pkg
+      - lowrisc:ip:keymgr_dpe_pkg
       - lowrisc:ip:keymgr_dpe
 
   files_dv:

hw/ip/keymgr_dpe/dv/tb.sv

@@ -41,23 +41,6 @@ module tb;
   assign keymgr_dpe_if.edn_ack   = edn_if[0].ack;
   assign keymgr_dpe_if.lfsr_en   = dut.lfsr_en;
 
-  // Quick fix to propagate the signal from the keymgr_dpe_if to the dut
-  keymgr_dpe_pkg::keymgr_dpe_creator_root_key_t creator_root_key;
-  keymgr_dpe_pkg::keymgr_dpe_creator_seed_t creator_seed;
-  keymgr_dpe_pkg::keymgr_dpe_owner_seed_t owner_seed;
-  assign creator_root_key.share0 =
-      keymgr_dpe_if.otp_key.creator_root_key_share0;
-  assign creator_root_key.share0_valid =
-      keymgr_dpe_if.otp_key.creator_root_key_share0_valid;
-  assign creator_root_key.share1 =
-      keymgr_dpe_if.otp_key.creator_root_key_share1;
-  assign creator_root_key.share1_valid =
-      keymgr_dpe_if.otp_key.creator_root_key_share1_valid;
-  assign creator_seed.seed = keymgr_dpe_if.otp_key.creator_seed;
-  assign creator_seed.seed_valid = keymgr_dpe_if.otp_key.creator_seed_valid;
-  assign owner_seed.seed = keymgr_dpe_if.otp_key.owner_seed;
-  assign owner_seed.seed_valid = keymgr_dpe_if.otp_key.owner_seed_valid;
-
   // dut
   // TODO(opentitan-integrated/issues/332):
   // need to model the OTP seed input
@@ -75,9 +58,9 @@ module tb;
     .kmac_en_masking_i    (1'b1),
     .lc_keymgr_en_i       (keymgr_dpe_if.keymgr_dpe_en),
     .lc_keymgr_div_i      (keymgr_dpe_if.keymgr_dpe_div),
-    .creator_root_key_i   (creator_root_key),
-    .creator_seed_i       (creator_seed),
-    .owner_seed_i         (owner_seed),
+    .creator_root_key_i   (keymgr_dpe_if.creator_root_key),
+    .creator_seed_i       (keymgr_dpe_if.creator_seed),
+    .owner_seed_i         (keymgr_dpe_if.owner_seed),
     .device_id_i          (keymgr_dpe_if.otp_device_id),
     .rom_digest_i         (keymgr_dpe_if.rom_digests),
     .edn_o                (edn_if[0].req),