commit 8ad10e7d271805271610ad54c3a48bda24afa8f1
author Michael Schaffner <msf@opentitan.org> Thu Sep 02 15:38:42 2021 -0700
committer Michael Schaffner <msf@google.com> Fri Sep 03 10:23:38 2021 -0700
tree 1f04203f99eaccd8519d5f0ef95e619811b60c47
parent 7838ef2d33447b10d743084c852a189ae3906574

[lc_ctrl] Add assertions for lc_clk_byp_req_o

Fix #7663

Signed-off-by: Michael Schaffner <msf@opentitan.org>

hw/ip/lc_ctrl/rtl/lc_ctrl_fsm.sv

diff --git a/hw/ip/lc_ctrl/rtl/lc_ctrl_fsm.sv b/hw/ip/lc_ctrl/rtl/lc_ctrl_fsm.sv
index 6d85bfc..b2a8d75 100644
--- a/hw/ip/lc_ctrl/rtl/lc_ctrl_fsm.sv
+++ b/hw/ip/lc_ctrl/rtl/lc_ctrl_fsm.sv
@@ -120,7 +120,7 @@
   ///////////////
   fsm_state_e fsm_state_d, fsm_state_q;
 
-  // Continously feed in valid signal for LC state.
+  // Continuously feed in valid signal for LC state.
   logic lc_state_valid_d, lc_state_valid_q;
   assign lc_state_valid_d = lc_state_valid_i;
 
@@ -143,6 +143,9 @@
   logic hashed_token_valid_mux;
   lc_token_t hashed_token_mux;
 
+  // Multibit state error from state decoder
+  logic [5:0] state_invalid_error;
+
   always_comb begin : p_fsm
     // FSM default state assignments.
     fsm_state_d   = fsm_state_q;
@@ -504,7 +507,6 @@
   // This decodes the state into a format that can be exposed in the CSRs,
   // and flags any errors in the state encoding. Errors will move the
   // main FSM into INVALID right away.
-  logic [5:0] state_invalid_error;
   lc_ctrl_state_decode u_lc_ctrl_state_decode (
     .lc_state_valid_i      ( lc_state_valid_q  ),
     .lc_state_i            ( lc_state_q        ),
@@ -585,14 +587,24 @@
   // Assertions //
   ////////////////
 
-  `ASSERT(ClkBypStaysOnOnceAsserted_A,
+  `ASSERT(EscStaysOnOnceAsserted_A,
       lc_escalate_en_o == On
       |=>
       lc_escalate_en_o == On)
 
+  `ASSERT(ClkBypStaysOnOnceAsserted_A,
+      lc_clk_byp_req_o == On
+      |=>
+      lc_clk_byp_req_o == On)
+
   `ASSERT(FlashRmaStaysOnOnceAsserted_A,
       lc_flash_rma_req_o == On
       |=>
       lc_flash_rma_req_o == On)
 
+  `ASSERT(NoClkBypInProdStates_A,
+      lc_state_q inside {LcStProd, LcStProdEnd, LcStDev}
+      |=>
+      lc_clk_byp_req_o == Off)
+
 endmodule : lc_ctrl_fsm