commit a8cabbb13a6881ce4b657e8a2ddf5973d58e29fe
author Cindy Chen <chencindy@google.com> Wed Jan 20 16:24:24 2021 -0800
committer Michael Schaffner <msf@google.com> Wed Jan 20 19:12:27 2021 -0800
tree 873c50d8536702272081316500e05dec7e35ca2a
parent f81d7d43bc08cfb87117de16add92d85d4912f11

[dv/lc_ctrl] Fix when RndCnstRawUnlockTokenHashed is not 0

In current lc_ctrl smoke test, we assume all the tokens to be 0, but
with otp_ctrl update, we are randomize the `RndCnstRawUnlockTokenHashed`
constant. This commit fix it by driving correct hashed token from OTP
when `*TestUnlock*` states are requested.

Signed-off-by: Cindy Chen <chencindy@google.com>

hw/ip/lc_ctrl/dv/env/lc_ctrl_if.sv

diff --git a/hw/ip/lc_ctrl/dv/env/lc_ctrl_if.sv b/hw/ip/lc_ctrl/dv/env/lc_ctrl_if.sv
index 770fd9c..6b91916 100644
--- a/hw/ip/lc_ctrl/dv/env/lc_ctrl_if.sv
+++ b/hw/ip/lc_ctrl/dv/env/lc_ctrl_if.sv
@@ -13,6 +13,7 @@
   logic prog_err; // TODO: remove once push-pull can constrain data
   otp_ctrl_pkg::otp_lc_data_t     otp_i;
   otp_ctrl_part_pkg::otp_hw_cfg_t otp_hw_cfg_i;
+  lc_ctrl_pkg::lc_token_t hashed_token;
 
   lc_ctrl_pkg::lc_tx_t lc_dft_en_o;
   lc_ctrl_pkg::lc_tx_t lc_nvm_debug_en_o;
@@ -54,6 +55,7 @@
     clk_byp_ack_i = clk_byp_ack;
     flash_rma_ack_i = flash_rma_ack;
     prog_err = 0;
+    hashed_token = '0;
   endtask
 
   task automatic set_clk_byp_ack(lc_ctrl_pkg::lc_tx_t val);
@@ -64,4 +66,7 @@
     flash_rma_ack_i = val;
   endtask
 
+  task automatic set_hashed_token(lc_ctrl_pkg::lc_token_t val);
+    hashed_token = val;
+  endtask
 endinterface

hw/ip/lc_ctrl/dv/env/seq_lib/lc_ctrl_smoke_vseq.sv

diff --git a/hw/ip/lc_ctrl/dv/env/seq_lib/lc_ctrl_smoke_vseq.sv b/hw/ip/lc_ctrl/dv/env/seq_lib/lc_ctrl_smoke_vseq.sv
index aea9243..91812b9 100644
--- a/hw/ip/lc_ctrl/dv/env/seq_lib/lc_ctrl_smoke_vseq.sv
+++ b/hw/ip/lc_ctrl/dv/env/seq_lib/lc_ctrl_smoke_vseq.sv
@@ -42,6 +42,10 @@
         randomize_next_lc_state(dec_lc_state(lc_state));
         `uvm_info(`gfn, $sformatf("next_LC_state is %0s, input token is %0h", next_lc_state.name,
                                   token_val), UVM_DEBUG)
+        if (lc_state == LcStRaw && next_lc_state inside {DecLcStTestUnlocked0,
+            DecLcStTestUnlocked1, DecLcStTestUnlocked2, DecLcStTestUnlocked3}) begin
+          cfg.lc_ctrl_vif.set_hashed_token(lc_ctrl_state_pkg::RndCnstRawUnlockTokenHashed);
+        end
         sw_transition_req(next_lc_state, token_val, trans_success);
       end else begin
         // wait at least two clks for scb to finish checking lc outputs

hw/ip/lc_ctrl/dv/tb.sv

diff --git a/hw/ip/lc_ctrl/dv/tb.sv b/hw/ip/lc_ctrl/dv/tb.sv
index b8a7c87..f2ef68f 100644
--- a/hw/ip/lc_ctrl/dv/tb.sv
+++ b/hw/ip/lc_ctrl/dv/tb.sv
@@ -43,7 +43,7 @@
   assign otp_prog_rsp.ack = otp_prog_if.ack;
   assign otp_token_rsp.ack = otp_token_if.ack;
   // TODO: temp constraint to 0 because it has to equal to otp_lc_data_i tokens
-  assign otp_token_rsp.hashed_token = 0;
+  assign otp_token_rsp.hashed_token = lc_ctrl_if.hashed_token;
 
   // dut
   lc_ctrl dut (