[dv/keymgr] Modify keymgr tests to use post_start alert checking. Signed-off-by: Cindy Chen <chencindy@opentitan.org>
diff --git a/hw/dv/sv/cip_lib/seq_lib/cip_base_vseq.sv b/hw/dv/sv/cip_lib/seq_lib/cip_base_vseq.sv index 1c5c361..79b7daa 100644 --- a/hw/dv/sv/cip_lib/seq_lib/cip_base_vseq.sv +++ b/hw/dv/sv/cip_lib/seq_lib/cip_base_vseq.sv
@@ -137,11 +137,11 @@ if (do_clear_all_interrupts) clear_all_interrupts(); if (expect_fatal_alerts) begin - // Fatal alert is triggered in this seq. Wait 10_000ns to entire background check + // Fatal alert is triggered in this seq. Wait 10_000ns so the background check // `check_fatal_alert_nonblocking` has enough time to execute before dut_init. // Issue reset if reset is allowed, otherwise, reset will be called in upper vseq. #10_000ns; - if (do_apply_reset) dut_init(); + dut_init(); end else begin check_no_fatal_alerts(); end
diff --git a/hw/ip/keymgr/dv/env/seq_lib/keymgr_base_vseq.sv b/hw/ip/keymgr/dv/env/seq_lib/keymgr_base_vseq.sv index 3b231b3..a44d1fe 100644 --- a/hw/ip/keymgr/dv/env/seq_lib/keymgr_base_vseq.sv +++ b/hw/ip/keymgr/dv/env/seq_lib/keymgr_base_vseq.sv
@@ -13,7 +13,6 @@ // various knobs to enable certain routines bit do_keymgr_init = 1'b1; bit do_wait_for_init_done = 1'b1; - bit do_reset_at_end_of_seq = 1'b0; bit seq_check_en = 1'b1; // do operations at StReset @@ -291,16 +290,4 @@ csr_rd_check(.ptr(ral.working_state), .compare_value(keymgr_pkg::StInvalid)); end endtask - - task post_start(); - super.post_start(); - - // If fatal alert will be triggered in this seq, issue reset if reset is allowed, otherwise, - // reset will be called in upper vseq - if (do_reset_at_end_of_seq) begin - #10_000ns; - if (do_apply_reset) apply_reset(); - end - endtask - endclass : keymgr_base_vseq
diff --git a/hw/ip/keymgr/dv/env/seq_lib/keymgr_cmd_invalid_vseq.sv b/hw/ip/keymgr/dv/env/seq_lib/keymgr_cmd_invalid_vseq.sv index cb04d61..a31eefb 100644 --- a/hw/ip/keymgr/dv/env/seq_lib/keymgr_cmd_invalid_vseq.sv +++ b/hw/ip/keymgr/dv/env/seq_lib/keymgr_cmd_invalid_vseq.sv
@@ -66,7 +66,7 @@ task post_start(); // fatal alert will be triggered, need reset to clear it - do_reset_at_end_of_seq = 1; + expect_fatal_alerts = 1; super.post_start(); cfg.en_scb = 1; cfg.keymgr_vif.en_chk = 1;
diff --git a/hw/ip/keymgr/dv/env/seq_lib/keymgr_hwsw_invalid_input_vseq.sv b/hw/ip/keymgr/dv/env/seq_lib/keymgr_hwsw_invalid_input_vseq.sv index 466b4e0..c6a2346 100644 --- a/hw/ip/keymgr/dv/env/seq_lib/keymgr_hwsw_invalid_input_vseq.sv +++ b/hw/ip/keymgr/dv/env/seq_lib/keymgr_hwsw_invalid_input_vseq.sv
@@ -28,12 +28,8 @@ endfunction task post_start(); + expect_fatal_alerts = 1; super.post_start(); - - // fatal alert will be triggered in this seq. Issue reset if reset is allowed, otherwise, reset - // will be called in upper vseq - #10_000ns; - if (do_apply_reset) apply_reset(); endtask endclass : keymgr_hwsw_invalid_input_vseq
diff --git a/hw/ip/keymgr/dv/env/seq_lib/keymgr_kmac_rsp_err_vseq.sv b/hw/ip/keymgr/dv/env/seq_lib/keymgr_kmac_rsp_err_vseq.sv index bfda181..542efda 100644 --- a/hw/ip/keymgr/dv/env/seq_lib/keymgr_kmac_rsp_err_vseq.sv +++ b/hw/ip/keymgr/dv/env/seq_lib/keymgr_kmac_rsp_err_vseq.sv
@@ -25,7 +25,7 @@ cfg.m_keymgr_kmac_agent_cfg.error_rsp_pct = 20; // fatal alert will be triggered, need reset to clear it - do_reset_at_end_of_seq = 1; + expect_fatal_alerts = 1; super.pre_start(); endtask
diff --git a/hw/ip/keymgr/dv/env/seq_lib/keymgr_sync_async_fault_cross_vseq.sv b/hw/ip/keymgr/dv/env/seq_lib/keymgr_sync_async_fault_cross_vseq.sv index c57733e..a990ed3 100644 --- a/hw/ip/keymgr/dv/env/seq_lib/keymgr_sync_async_fault_cross_vseq.sv +++ b/hw/ip/keymgr/dv/env/seq_lib/keymgr_sync_async_fault_cross_vseq.sv
@@ -68,7 +68,7 @@ endfunction task post_start(); - do_reset_at_end_of_seq = 1; + expect_fatal_alerts = 1; super.post_start(); cfg.en_scb = 1; cfg.keymgr_vif.en_chk = 1;