commit 91c2fe4a577d91ac9d81a68bb9144f9484a5e564
author Timothy Chen <timothytim@google.com> Tue Dec 15 15:45:44 2020 -0800
committer tjaychen <timothytim@google.com> Tue Dec 15 23:23:31 2020 -0800
tree c89166bedf2cc8967978f9b0bda7c8dbce688026
parent 0a12094f6d5acbd3fb354a8d712485d8ba6ddc50

[keymgr] DV updates

Signed-off-by: Timothy Chen <timothytim@google.com>

[keymgr] DV connections update

Signed-off-by: Timothy Chen <timothytim@google.com>

hw/ip/keymgr/dv/env/keymgr_if.sv

diff --git a/hw/ip/keymgr/dv/env/keymgr_if.sv b/hw/ip/keymgr/dv/env/keymgr_if.sv
index 58e4a39..5b3d8fd 100644
--- a/hw/ip/keymgr/dv/env/keymgr_if.sv
+++ b/hw/ip/keymgr/dv/env/keymgr_if.sv
@@ -8,7 +8,7 @@
   import uvm_pkg::*;
 
   lc_ctrl_pkg::lc_keymgr_div_t keymgr_div;
-  keymgr_pkg::otp_data_t otp;
+  otp_ctrl_part_pkg::otp_hw_cfg_t otp_hw_cfg;
   otp_ctrl_pkg::otp_keymgr_key_t otp_key;
   flash_ctrl_pkg::keymgr_flash_t flash;
 
@@ -25,7 +25,7 @@
 
   task automatic init();
     keymgr_div = 64'h5CFBD765CE33F34E;
-    otp     = keymgr_pkg::OTP_DATA_DEFAULT;
+    otp_hw_cfg = '0;
     otp_key = otp_ctrl_pkg::OTP_KEYMGR_KEY_DEFAULT;
     flash   = flash_ctrl_pkg::KEYMGR_FLASH_DEFAULT;
     direct_to_disabled = 0;

hw/ip/keymgr/dv/env/keymgr_scoreboard.sv

diff --git a/hw/ip/keymgr/dv/env/keymgr_scoreboard.sv b/hw/ip/keymgr/dv/env/keymgr_scoreboard.sv
index 052a8cb..8eb43c5 100644
--- a/hw/ip/keymgr/dv/env/keymgr_scoreboard.sv
+++ b/hw/ip/keymgr/dv/env/keymgr_scoreboard.sv
@@ -349,8 +349,8 @@
     act = {<<8{byte_data_q}};
 
     exp.DiversificationKey = cfg.keymgr_vif.flash.seeds[flash_ctrl_pkg::CreatorSeedIdx];
-    exp.HealthMeasurement  = cfg.keymgr_vif.lc.health_state;
-    exp.DeviceIdentifier   = cfg.keymgr_vif.otp.devid;
+    exp.HealthMeasurement  = cfg.keymgr_vif.keymgr_div;
+    exp.DeviceIdentifier   = cfg.keymgr_vif.otp_hw_cfg.data.device_id;
     exp.HardwareRevisionSecret = keymgr_pkg::RndCnstRevisionSeedDefault;
     exp.RomExtSecurityDescriptor = {`gmv(ral.sw_binding_3), `gmv(ral.sw_binding_2),
                                     `gmv(ral.sw_binding_1), `gmv(ral.sw_binding_0)};

hw/ip/keymgr/dv/tb.sv

diff --git a/hw/ip/keymgr/dv/tb.sv b/hw/ip/keymgr/dv/tb.sv
index 7d12d2f..587ddb9 100644
--- a/hw/ip/keymgr/dv/tb.sv
+++ b/hw/ip/keymgr/dv/tb.sv
@@ -42,7 +42,7 @@
     .lc_keymgr_en_i       (lc_ctrl_pkg::On),
     .lc_keymgr_div_i      (keymgr_if.keymgr_div),
     .otp_key_i            (keymgr_if.otp_key),
-    .otp_i                (keymgr_if.otp),
+    .otp_hw_cfg_i         (keymgr_if.otp_hw_cfg),
     .edn_o                (edn_if.req),
     .edn_i                ({edn_if.ack, edn_if.d_data}),
     .flash_i              (keymgr_if.flash),