Skip to content

Commit

Permalink
Update HW_REV_ID to indicate v1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
calebofearth committed May 17, 2024
1 parent cf3b02d commit 3e7375d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion src/soc_ifc/rtl/soc_ifc_external_reg.rdl
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,11 @@ reg {
SoC stepping ID is repopulated with the value in the fuse register on every warm reset
[br]Caliptra Access: RO
[br]SOC Access: RO";
field {sw=r; resetsignal = cptra_rst_b;} CPTRA_GENERATION[16]=1;
field {desc = "Caliptra official release version. Bit field encoding is:
[br][lb]15:8[rb] Patch version
[br][lb] 7:4[rb] Minor version
[br][lb] 3:0[rb] Major version";
sw=r; resetsignal = cptra_rst_b;} CPTRA_GENERATION[16]=0x0201;
field {sw=r; hw=w; resetsignal = cptra_rst_b;} SOC_STEPPING_ID[16]=0;
} CPTRA_HW_REV_ID;
reg {
Expand Down
2 changes: 1 addition & 1 deletion src/soc_ifc/rtl/soc_ifc_reg.sv
Original file line number Diff line number Diff line change
Expand Up @@ -5804,7 +5804,7 @@ module soc_ifc_reg (
for(genvar i0=0; i0<2; i0++) begin
assign readback_array[i0*1 + 51][31:0] = (decoded_reg_strb.CPTRA_GENERIC_OUTPUT_WIRES[i0] && !decoded_req_is_wr) ? field_storage.CPTRA_GENERIC_OUTPUT_WIRES[i0].generic_wires.value : '0;
end
assign readback_array[53][15:0] = (decoded_reg_strb.CPTRA_HW_REV_ID && !decoded_req_is_wr) ? 16'h1 : '0;
assign readback_array[53][15:0] = (decoded_reg_strb.CPTRA_HW_REV_ID && !decoded_req_is_wr) ? 16'h201 : '0;
assign readback_array[53][31:16] = (decoded_reg_strb.CPTRA_HW_REV_ID && !decoded_req_is_wr) ? hwif_in.CPTRA_HW_REV_ID.SOC_STEPPING_ID.next : '0;
for(genvar i0=0; i0<2; i0++) begin
assign readback_array[i0*1 + 54][31:0] = (decoded_reg_strb.CPTRA_FW_REV_ID[i0] && !decoded_req_is_wr) ? field_storage.CPTRA_FW_REV_ID[i0].REV_ID.value : '0;
Expand Down
2 changes: 1 addition & 1 deletion src/soc_ifc/rtl/soc_ifc_reg_uvm.sv
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ package soc_ifc_reg_uvm;

virtual function void build();
this.CPTRA_GENERATION = new("CPTRA_GENERATION");
this.CPTRA_GENERATION.configure(this, 16, 0, "RO", 0, 'h1, 1, 1, 0);
this.CPTRA_GENERATION.configure(this, 16, 0, "RO", 0, 'h201, 1, 1, 0);
this.SOC_STEPPING_ID = new("SOC_STEPPING_ID");
this.SOC_STEPPING_ID.configure(this, 16, 16, "RO", 1, 'h0, 1, 1, 0);
if (has_coverage(UVM_CVR_REG_BITS)) begin
Expand Down
2 changes: 1 addition & 1 deletion src/soc_ifc/tb/soc_ifc_tb_pkg.sv
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ package soc_ifc_tb_pkg;
"CPTRA_MBOX_VALID_PAUSER" : 32'hffff_ffff,
"CPTRA_TRNG_VALID_PAUSER" : 32'hffff_ffff,
"INTERNAL_FW_UPDATE_RESET_WAIT_CYCLES" : 32'h5,
"CPTRA_HW_REV_ID" : 32'h1,
"CPTRA_HW_REV_ID" : 32'h201,
"CPTRA_WDT_TIMER1_TIMEOUT_PERIOD" : 32'hffff_ffff,
"CPTRA_WDT_TIMER2_TIMEOUT_PERIOD" : 32'hffff_ffff,
"CPTRA_FUSE_VALID_PAUSER" : 32'hffff_ffff
Expand Down

0 comments on commit 3e7375d

Please sign in to comment.