@@ -247,10 +247,10 @@ module abr_ctrl
247247
248248 logic [SHAREDKEY_NUM_DWORDS - 1 : 0 ][3 : 0 ][7 : 0 ] mlkem_sharedkey_data;
249249
250- `CALIPTRA_KV_READ_STATUS_ASSIGN (kv_mldsa_seed, abr_reg_hwif_in)
251- `CALIPTRA_KV_READ_STATUS_ASSIGN (kv_mlkem_seed, abr_reg_hwif_in)
252- `CALIPTRA_KV_READ_STATUS_ASSIGN (kv_mlkem_msg, abr_reg_hwif_in)
253- `CALIPTRA_KV_WRITE_STATUS_ASSIGN (kv_mlkem_sharedkey, abr_reg_hwif_in)
250+ `CALIPTRA_KV_READ_STATUS_ASSIGN (kv_mldsa_seed, abr_reg_hwif_in, zeroize )
251+ `CALIPTRA_KV_READ_STATUS_ASSIGN (kv_mlkem_seed, abr_reg_hwif_in, zeroize )
252+ `CALIPTRA_KV_READ_STATUS_ASSIGN (kv_mlkem_msg, abr_reg_hwif_in, zeroize )
253+ `CALIPTRA_KV_WRITE_STATUS_ASSIGN (kv_mlkem_sharedkey, abr_reg_hwif_in, zeroize )
254254 `CALIPTRA_KV_READ_CTRL_REG2STRUCT (kv_mldsa_seed_read_ctrl_reg, kv_mldsa_seed_rd_ctrl, abr_reg_hwif_out)
255255 `CALIPTRA_KV_READ_CTRL_REG2STRUCT (kv_mlkem_seed_read_ctrl_reg, kv_mlkem_seed_rd_ctrl, abr_reg_hwif_out)
256256 `CALIPTRA_KV_READ_CTRL_REG2STRUCT (kv_mlkem_msg_read_ctrl_reg, kv_mlkem_msg_rd_ctrl, abr_reg_hwif_out)
@@ -262,22 +262,18 @@ module abr_ctrl
262262 always_comb kv_mlkem_msg_data_present_set = kv_mlkem_msg_read_ctrl_reg.read_en;
263263
264264 // lock kv controls
265- always_comb abr_reg_hwif_in.kv_mldsa_seed_rd_ctrl.read_en.hwclr = zeroize;
266265 always_comb abr_reg_hwif_in.kv_mldsa_seed_rd_ctrl.read_en.swwe = ! kv_mldsa_seed_data_present && abr_ready;
267266 always_comb abr_reg_hwif_in.kv_mldsa_seed_rd_ctrl.read_entry.swwe = ! kv_mldsa_seed_data_present && abr_ready;
268267 always_comb abr_reg_hwif_in.kv_mldsa_seed_rd_ctrl.pcr_hash_extend.swwe = ! kv_mldsa_seed_data_present && abr_ready;
269268 always_comb abr_reg_hwif_in.kv_mldsa_seed_rd_ctrl.rsvd.swwe = ! kv_mldsa_seed_data_present && abr_ready;
270- always_comb abr_reg_hwif_in.kv_mlkem_seed_rd_ctrl.read_en.hwclr = zeroize;
271269 always_comb abr_reg_hwif_in.kv_mlkem_seed_rd_ctrl.read_en.swwe = ! kv_mlkem_seed_data_present && abr_ready;
272270 always_comb abr_reg_hwif_in.kv_mlkem_seed_rd_ctrl.read_entry.swwe = ! kv_mlkem_seed_data_present && abr_ready;
273271 always_comb abr_reg_hwif_in.kv_mlkem_seed_rd_ctrl.pcr_hash_extend.swwe = ! kv_mlkem_seed_data_present && abr_ready;
274272 always_comb abr_reg_hwif_in.kv_mlkem_seed_rd_ctrl.rsvd.swwe = ! kv_mlkem_seed_data_present && abr_ready;
275- always_comb abr_reg_hwif_in.kv_mlkem_msg_rd_ctrl.read_en.hwclr = zeroize;
276273 always_comb abr_reg_hwif_in.kv_mlkem_msg_rd_ctrl.read_en.swwe = ! kv_mlkem_msg_data_present && abr_ready;
277274 always_comb abr_reg_hwif_in.kv_mlkem_msg_rd_ctrl.read_entry.swwe = ! kv_mlkem_msg_data_present && abr_ready;
278275 always_comb abr_reg_hwif_in.kv_mlkem_msg_rd_ctrl.pcr_hash_extend.swwe = ! kv_mlkem_msg_data_present && abr_ready;
279276 always_comb abr_reg_hwif_in.kv_mlkem_msg_rd_ctrl.rsvd.swwe = ! kv_mlkem_msg_data_present && abr_ready;
280- always_comb abr_reg_hwif_in.kv_mlkem_sharedkey_wr_ctrl.write_en.hwclr = zeroize;
281277 always_comb abr_reg_hwif_in.kv_mlkem_sharedkey_wr_ctrl.write_en.swwe = abr_ready;
282278 always_comb abr_reg_hwif_in.kv_mlkem_sharedkey_wr_ctrl.write_entry.swwe = abr_ready;
283279 always_comb abr_reg_hwif_in.kv_mlkem_sharedkey_wr_ctrl.hmac_key_dest_valid.swwe = abr_ready;
0 commit comments