[prim,rtl] use prim_const in various blocks

- otp_ctrl (constkeys, digests)
- lc_ctrl (hw_rev)
- keymgr (seeds)

Signed-off-by: Michael Gautschi <[email protected]>

Author: gautschimi

hw/ip/keymgr/rtl/keymgr.sv

@@ -107,19 +107,21 @@ module keymgr
   seed_t kmac_seed;
   seed_t none_seed;
 
-  prim_sec_anchor_buf #(
-    .Width(TotalSeedWidth)
-  ) u_seed_anchor (
-    .in_i({RndCnstRevisionSeed,
-           RndCnstCreatorIdentitySeed,
-           RndCnstOwnerIntIdentitySeed,
-           RndCnstOwnerIdentitySeed,
-           RndCnstSoftOutputSeed,
-           RndCnstHardOutputSeed,
-           RndCnstAesSeed,
-           RndCnstOtbnSeed,
-           RndCnstKmacSeed,
-           RndCnstNoneSeed}),
+  localparam logic [TotalSeedWidth-1:0] RndConstSeed = {RndCnstRevisionSeed,
+                                                        RndCnstCreatorIdentitySeed,
+                                                        RndCnstOwnerIntIdentitySeed,
+                                                        RndCnstOwnerIdentitySeed,
+                                                        RndCnstSoftOutputSeed,
+                                                        RndCnstHardOutputSeed,
+                                                        RndCnstAesSeed,
+                                                        RndCnstOtbnSeed,
+                                                        RndCnstKmacSeed,
+                                                        RndCnstNoneSeed};
+
+  prim_sec_anchor_const #(
+    .Width(TotalSeedWidth),
+    .ConstVal(RndConstSeed)
+  ) u_seed_anchor_const (
     .out_o({revision_seed,
             creator_identity_seed,
             owner_int_identity_seed,

hw/ip/keymgr_dpe/rtl/keymgr_dpe.sv

@@ -94,27 +94,25 @@ module keymgr_dpe
   seed_t kmac_seed;
   seed_t none_seed;
 
-  prim_sec_anchor_buf #(
-    .Width(TotalSeedWidth)
-  ) u_seed_anchor (
-    .in_i({
-      RndCnstRevisionSeed,
-      RndCnstSoftOutputSeed,
-      RndCnstHardOutputSeed,
-      RndCnstAesSeed,
-      RndCnstOtbnSeed,
-      RndCnstKmacSeed,
-      RndCnstNoneSeed
-    }),
-    .out_o({
-      revision_seed,
-      soft_output_seed,
-      hard_output_seed,
-      aes_seed,
-      otbn_seed,
-      kmac_seed,
-      none_seed
-    })
+  localparam logic [TotalSeedWidth-1:0] RndConstSeed = {RndCnstRevisionSeed,
+                                                        RndCnstSoftOutputSeed,
+                                                        RndCnstHardOutputSeed,
+                                                        RndCnstAesSeed,
+                                                        RndCnstOtbnSeed,
+                                                        RndCnstKmacSeed,
+                                                        RndCnstNoneSeed};
+
+  prim_sec_anchor_const #(
+    .Width(TotalSeedWidth),
+    .ConstVal(RndConstSeed)
+  ) u_seed_anchor_const (
+    .out_o({revision_seed,
+            soft_output_seed,
+            hard_output_seed,
+            aes_seed,
+            otbn_seed,
+            kmac_seed,
+            none_seed})
   );
 
   // Register module

hw/ip/lc_ctrl/rtl/lc_ctrl.sv

@@ -342,18 +342,18 @@ module lc_ctrl
 
   logic lc_idle_d, lc_done_d;
 
-  // Assign the hardware revision constant and feed it through an anchor buffer. This ensures the
-  // individual bits remain visible in the netlist, thereby enabling metal fixes to be reflected
-  // in the hardware revision.
-  lc_hw_rev_t hw_rev;
-  assign hw_rev = '{silicon_creator_id: SiliconCreatorId,
-                    product_id:         ProductId,
-                    revision_id:        RevisionId,
-                    reserved:           '0};
-  prim_sec_anchor_buf #(
-    .Width($bits(lc_hw_rev_t))
-  ) u_hw_rev_anchor_buf (
-    .in_i(hw_rev),
+  // Create the hardware revision with the anchor const that instantiates specific standard cells.
+  // This ensures the individual bits are not combined through logic optimization and remain visible
+  // in the netlist, thereby enabling metal fixes to be reflected in the hardware revision.
+  localparam lc_hw_rev_t HwRev = '{silicon_creator_id: SiliconCreatorId,
+                                   product_id:         ProductId,
+                                   revision_id:        RevisionId,
+                                   reserved:           '0};
+
+  prim_sec_anchor_const #(
+    .Width($bits(lc_hw_rev_t)),
+    .ConstVal(HwRev)
+  ) u_hw_rev_anchor_const (
     .out_o(hw_rev_o)
   );
 

hw/ip_templates/otp_ctrl/rtl/otp_ctrl_scrmbl.sv

@@ -109,26 +109,26 @@ module otp_ctrl_scrmbl
   digest_iv_array_t rnd_cnst_digest_iv_anchor;
 
   for (genvar i = 0; i < NumScrmblKeys; i++) begin : gen_anchor_keys
-    prim_sec_anchor_buf #(
-      .Width(ScrmblKeyWidth)
-    ) u_key_anchor_buf (
-      .in_i(RndCnstKey[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblKeyWidth),
+      .ConstVal(RndCnstKey[i])
+    ) u_key_anchor_const (
       .out_o(rnd_cnst_key_anchor[i])
     );
   end
 
   for (genvar i = 0; i < NumDigestSets; i++) begin : gen_anchor_digests
-    prim_sec_anchor_buf #(
-      .Width(ScrmblKeyWidth)
-    ) u_const_anchor_buf (
-      .in_i(RndCnstDigestConst[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblKeyWidth),
+      .ConstVal(RndCnstDigestConst[i])
+    ) u_digest_anchor_const (
       .out_o(rnd_cnst_digest_anchor[i])
     );
 
-    prim_sec_anchor_buf #(
-      .Width(ScrmblBlockWidth)
-    ) u_iv_anchor_buf (
-      .in_i(RndCnstDigestIV[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblBlockWidth),
+      .ConstVal(RndCnstDigestIV[i])
+    ) u_iv_anchor_const (
       .out_o(rnd_cnst_digest_iv_anchor[i])
     );
   end

hw/top_darjeeling/ip_autogen/otp_ctrl/rtl/otp_ctrl_scrmbl.sv

@@ -109,26 +109,26 @@ module otp_ctrl_scrmbl
   digest_iv_array_t rnd_cnst_digest_iv_anchor;
 
   for (genvar i = 0; i < NumScrmblKeys; i++) begin : gen_anchor_keys
-    prim_sec_anchor_buf #(
-      .Width(ScrmblKeyWidth)
-    ) u_key_anchor_buf (
-      .in_i(RndCnstKey[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblKeyWidth),
+      .ConstVal(RndCnstKey[i])
+    ) u_key_anchor_const (
       .out_o(rnd_cnst_key_anchor[i])
     );
   end
 
   for (genvar i = 0; i < NumDigestSets; i++) begin : gen_anchor_digests
-    prim_sec_anchor_buf #(
-      .Width(ScrmblKeyWidth)
-    ) u_const_anchor_buf (
-      .in_i(RndCnstDigestConst[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblKeyWidth),
+      .ConstVal(RndCnstDigestConst[i])
+    ) u_digest_anchor_const (
       .out_o(rnd_cnst_digest_anchor[i])
     );
 
-    prim_sec_anchor_buf #(
-      .Width(ScrmblBlockWidth)
-    ) u_iv_anchor_buf (
-      .in_i(RndCnstDigestIV[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblBlockWidth),
+      .ConstVal(RndCnstDigestIV[i])
+    ) u_iv_anchor_const (
       .out_o(rnd_cnst_digest_iv_anchor[i])
     );
   end

hw/top_earlgrey/ip_autogen/otp_ctrl/rtl/otp_ctrl_scrmbl.sv

@@ -109,26 +109,26 @@ module otp_ctrl_scrmbl
   digest_iv_array_t rnd_cnst_digest_iv_anchor;
 
   for (genvar i = 0; i < NumScrmblKeys; i++) begin : gen_anchor_keys
-    prim_sec_anchor_buf #(
-      .Width(ScrmblKeyWidth)
-    ) u_key_anchor_buf (
-      .in_i(RndCnstKey[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblKeyWidth),
+      .ConstVal(RndCnstKey[i])
+    ) u_key_anchor_const (
       .out_o(rnd_cnst_key_anchor[i])
     );
   end
 
   for (genvar i = 0; i < NumDigestSets; i++) begin : gen_anchor_digests
-    prim_sec_anchor_buf #(
-      .Width(ScrmblKeyWidth)
-    ) u_const_anchor_buf (
-      .in_i(RndCnstDigestConst[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblKeyWidth),
+      .ConstVal(RndCnstDigestConst[i])
+    ) u_digest_anchor_const (
       .out_o(rnd_cnst_digest_anchor[i])
     );
 
-    prim_sec_anchor_buf #(
-      .Width(ScrmblBlockWidth)
-    ) u_iv_anchor_buf (
-      .in_i(RndCnstDigestIV[i]),
+    prim_sec_anchor_const #(
+      .Width(ScrmblBlockWidth),
+      .ConstVal(RndCnstDigestIV[i])
+    ) u_iv_anchor_const (
       .out_o(rnd_cnst_digest_iv_anchor[i])
     );
   end