[hw,lc_ctrl,rtl] Only consider lc_ctrl tokens to be secret

Signed-off-by: Robert Schilling <[email protected]>

Author: Razer6

hw/ip/lc_ctrl/dv/cov/lc_ctrl_volatile_unlock_enabled_unr_exclude.el

@@ -1246,7 +1246,7 @@ Condition 4 "3444895930" "((lc_state_q == LcStRaw) && (trans_target_i == {lc_ctr
 ANNOTATION: "VC_COV_UNR"
 Condition 4 "3444895930" "((lc_state_q == LcStRaw) && (trans_target_i == {lc_ctrl_state_pkg::DecLcStateNumRep {DecLcStTestUnlocked0}}) && ((!trans_invalid_error_o))) 1 -1" (3 "110")
 ANNOTATION: "VC_COV_UNR"
-Condition 7 "2326366313" "(unhashed_token_i == lc_ctrl_state_pkg::RndCnstRawUnlockTokenHashed) 1 -1" (1 "0")
+Condition 7 "2326366313" "(unhashed_token_i == lc_ctrl_token_pkg::RndCnstRawUnlockTokenHashed) 1 -1" (1 "0")
 ANNOTATION: "VC_COV_UNR"
 Condition 8 "1288749660" "((lc_cnt_q == LcCnt0) ? LcCnt1 : lc_cnt_q) 1 -1" (2 "1")
 ANNOTATION: "VC_COV_UNR"

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

@@ -518,8 +518,8 @@ class lc_ctrl_errors_vseq extends lc_ctrl_smoke_vseq;
     lc_ctrl_state_pkg::lc_token_t token_err_inj;
     kmac_pkg::rsp_digest_t kmac_digest;
 
-    tokens_a[ZeroTokenIdx]       = lc_ctrl_state_pkg::AllZeroTokenHashed;
-    tokens_a[RawUnlockTokenIdx]  = lc_ctrl_state_pkg::RndCnstRawUnlockTokenHashed;
+    tokens_a[ZeroTokenIdx]       = lc_ctrl_token_pkg::AllZeroTokenHashed;
+    tokens_a[RawUnlockTokenIdx]  = lc_ctrl_token_pkg::RndCnstRawUnlockTokenHashed;
     tokens_a[TestUnlockTokenIdx] = cfg.lc_ctrl_vif.otp_i.test_unlock_token;
     tokens_a[TestExitTokenIdx]   = cfg.lc_ctrl_vif.otp_i.test_exit_token;
     tokens_a[RmaTokenIdx]        = cfg.lc_ctrl_vif.otp_i.rma_token;

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

@@ -122,8 +122,8 @@ class lc_ctrl_smoke_vseq extends lc_ctrl_base_vseq;
     kmac_pkg::rsp_digest_t kmac_digest;
     // No token for InvalidTokenIdx
     lc_ctrl_state_pkg::lc_token_t tokens_a[NumTokens-1];
-    tokens_a[ZeroTokenIdx]       = lc_ctrl_state_pkg::AllZeroTokenHashed;
-    tokens_a[RawUnlockTokenIdx]  = lc_ctrl_state_pkg::RndCnstRawUnlockTokenHashed;
+    tokens_a[ZeroTokenIdx]       = lc_ctrl_token_pkg::AllZeroTokenHashed;
+    tokens_a[RawUnlockTokenIdx]  = lc_ctrl_token_pkg::RndCnstRawUnlockTokenHashed;
     tokens_a[TestUnlockTokenIdx] = cfg.lc_ctrl_vif.otp_i.test_unlock_token;
     tokens_a[TestExitTokenIdx]   = cfg.lc_ctrl_vif.otp_i.test_exit_token;
     tokens_a[RmaTokenIdx]        = cfg.lc_ctrl_vif.otp_i.rma_token;

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

@@ -37,7 +37,7 @@ class lc_ctrl_volatile_unlock_smoke_vseq extends lc_ctrl_smoke_vseq;
     lc_cnt_int = dec_lc_cnt(lc_cnt);
     if (lc_cnt != LcCnt24) begin
       int exp_lc_cnt = lc_cnt_int == 0 ? 1 : lc_cnt_int;
-      lc_ctrl_state_pkg::lc_token_t token_val = lc_ctrl_state_pkg::RndCnstRawUnlockTokenHashed;
+      lc_ctrl_state_pkg::lc_token_t token_val = lc_ctrl_token_pkg::RndCnstRawUnlockTokenHashed;
       csr_wr(ral.claim_transition_if, CLAIM_TRANS_VAL);
       csr_wr(ral.transition_ctrl.volatile_raw_unlock, 1);
       csr_wr(ral.transition_target, {DecLcStateNumRep{next_state[DecLcStateWidth-1:0]}});

hw/ip/lc_ctrl/lc_ctrl.core

@@ -21,6 +21,7 @@ filesets:
       - lowrisc:ip:otp_macro_pkg
       - lowrisc:ip:kmac_pkg
       - lowrisc:ip:rv_dm
+      - lowrisc:virtual_constants:lc_ctrl_token_pkg
     files:
       - rtl/lc_ctrl_regs_reg_top.sv
       - rtl/lc_ctrl_dmi_reg_top.sv

hw/ip/lc_ctrl/lc_ctrl_pkg.core

@@ -8,7 +8,7 @@ filesets:
   files_rtl:
     depend:
       - lowrisc:tlul:headers
-      - lowrisc:virtual_ip:lc_ctrl_state_pkg
+      - lowrisc:ip:lc_ctrl_state_pkg
       - lowrisc:prim:assert
     files:
       - rtl/lc_ctrl_reg_pkg.sv

hw/ip/lc_ctrl/lc_ctrl_state_pkg.core

@@ -0,0 +1,28 @@
+CAPI=2:
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+name: "lowrisc:ip:lc_ctrl_state_pkg:0.1"
+description: "LC Controller State Package"
+filesets:
+  files_rtl:
+    depend:
+      - lowrisc:prim:util
+    files:
+      - rtl/lc_ctrl_state_pkg.sv
+    file_type: systemVerilogSource
+
+targets:
+  default: &default_target
+    filesets:
+      - files_rtl
+    toplevel: lc_ctrl
+
+  lint:
+    <<: *default_target
+    default_tool: verilator
+    tools:
+      verilator:
+        mode: lint-only
+        verilator_options:
+          - "-Wall"

hw/ip/lc_ctrl/rtl/lc_ctrl_fsm.sv

@@ -110,6 +110,7 @@ module lc_ctrl_fsm
   // State group diversification value for keymgr
   output lc_keymgr_div_t        lc_keymgr_div_o
 );
+  import lc_ctrl_token_pkg::*;
 
   /////////////////////////////
   // Synchronizers / Buffers //

hw/top_darjeeling/rtl/autogen/testing/lc_ctrl_state_pkg.sv renamed to hw/ip/lc_ctrl/rtl/lc_ctrl_state_pkg.sv

@@ -220,18 +220,7 @@ ${_print_state_enum('AuthSt', 'auth_state', lc_st_enc.config)}
 
   typedef logic [DecLcCountWidth-1:0] dec_lc_cnt_t;
 
-
-  ///////////////////////////////////////////
-  // Hashed RAW unlock and all-zero tokens //
-  ///////////////////////////////////////////
-
   parameter int LcTokenWidth = ${lc_st_enc.config['token_size']};
   typedef logic [LcTokenWidth-1:0] lc_token_t;
-<% token_size = lc_st_enc.config['token_size'] %>
-% for token in lc_st_enc.config['tokens']:
-  parameter lc_token_t ${token['name']} = {
-    ${"{0:}'h{1:0X}".format(token_size, token['value'])}
-  };
-% endfor
 
 endpackage : lc_ctrl_state_pkg