Skip to content

Commit

Permalink
Move fuse_owner_pk_hash to CPTRA_OWNER_PK_HASH
Browse files Browse the repository at this point in the history 
* Add new dedicated lock register for CPTRA_OWNER_PK_HASH
* Drive CPTRA_OWNER_PK_HASH swwel appropriately
* Update val collateral
* Update coverage groups
* Regenerate RDL outputs from changes
* Addresses #540
  • Loading branch information
@calebofearth
calebofearth committed Nov 12, 2024
1 parent 972038f commit 89a3630
Show file tree
Hide file tree
Showing 15 changed files with 684 additions and 490 deletions.
52 changes: 28 additions & 24 deletions src/integration/rtl/caliptra_reg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5716,6 +5716,34 @@
#define SOC_IFC_REG_CPTRA_RSVD_REG_0 (0x120)
#define CLP_SOC_IFC_REG_CPTRA_RSVD_REG_1 (0x30030124)
#define SOC_IFC_REG_CPTRA_RSVD_REG_1 (0x124)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_0 (0x30030140)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_0 (0x140)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_1 (0x30030144)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_1 (0x144)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_2 (0x30030148)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_2 (0x148)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_3 (0x3003014c)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_3 (0x14c)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_4 (0x30030150)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_4 (0x150)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_5 (0x30030154)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_5 (0x154)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_6 (0x30030158)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_6 (0x158)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_7 (0x3003015c)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_7 (0x15c)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_8 (0x30030160)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_8 (0x160)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_9 (0x30030164)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_9 (0x164)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_10 (0x30030168)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_10 (0x168)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_11 (0x3003016c)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_11 (0x16c)
#define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_LOCK (0x30030170)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_LOCK (0x170)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_LOCK_LOCK_LOW (0)
#define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_LOCK_LOCK_MASK (0x1)
#define CLP_SOC_IFC_REG_FUSE_UDS_SEED_0 (0x30030200)
#define SOC_IFC_REG_FUSE_UDS_SEED_0 (0x200)
#define CLP_SOC_IFC_REG_FUSE_UDS_SEED_1 (0x30030204)
Expand Down Expand Up @@ -5792,30 +5820,6 @@
#define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK (0x290)
#define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_MASK_LOW (0)
#define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_MASK_MASK (0xf)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_0 (0x30030294)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_0 (0x294)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_1 (0x30030298)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_1 (0x298)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_2 (0x3003029c)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_2 (0x29c)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_3 (0x300302a0)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_3 (0x2a0)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_4 (0x300302a4)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_4 (0x2a4)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_5 (0x300302a8)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_5 (0x2a8)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_6 (0x300302ac)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_6 (0x2ac)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_7 (0x300302b0)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_7 (0x2b0)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_8 (0x300302b4)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_8 (0x2b4)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_9 (0x300302b8)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_9 (0x2b8)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_10 (0x300302bc)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_10 (0x2bc)
#define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_11 (0x300302c0)
#define SOC_IFC_REG_FUSE_OWNER_PK_HASH_11 (0x2c0)
#define CLP_SOC_IFC_REG_FUSE_FMC_KEY_MANIFEST_SVN (0x300302c4)
#define SOC_IFC_REG_FUSE_FMC_KEY_MANIFEST_SVN (0x2c4)
#define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_0 (0x300302c8)
Expand Down
52 changes: 28 additions & 24 deletions src/integration/rtl/caliptra_reg_defines.svh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5716,6 +5716,34 @@
`define SOC_IFC_REG_CPTRA_RSVD_REG_0 (32'h120)
`define CLP_SOC_IFC_REG_CPTRA_RSVD_REG_1 (32'h30030124)
`define SOC_IFC_REG_CPTRA_RSVD_REG_1 (32'h124)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_0 (32'h30030140)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_0 (32'h140)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_1 (32'h30030144)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_1 (32'h144)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_2 (32'h30030148)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_2 (32'h148)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_3 (32'h3003014c)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_3 (32'h14c)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_4 (32'h30030150)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_4 (32'h150)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_5 (32'h30030154)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_5 (32'h154)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_6 (32'h30030158)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_6 (32'h158)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_7 (32'h3003015c)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_7 (32'h15c)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_8 (32'h30030160)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_8 (32'h160)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_9 (32'h30030164)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_9 (32'h164)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_10 (32'h30030168)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_10 (32'h168)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_11 (32'h3003016c)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_11 (32'h16c)
`define CLP_SOC_IFC_REG_CPTRA_OWNER_PK_HASH_LOCK (32'h30030170)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_LOCK (32'h170)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_LOCK_LOCK_LOW (0)
`define SOC_IFC_REG_CPTRA_OWNER_PK_HASH_LOCK_LOCK_MASK (32'h1)
`define CLP_SOC_IFC_REG_FUSE_UDS_SEED_0 (32'h30030200)
`define SOC_IFC_REG_FUSE_UDS_SEED_0 (32'h200)
`define CLP_SOC_IFC_REG_FUSE_UDS_SEED_1 (32'h30030204)
Expand Down Expand Up @@ -5792,30 +5820,6 @@
`define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK (32'h290)
`define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_MASK_LOW (0)
`define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_MASK_MASK (32'hf)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_0 (32'h30030294)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_0 (32'h294)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_1 (32'h30030298)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_1 (32'h298)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_2 (32'h3003029c)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_2 (32'h29c)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_3 (32'h300302a0)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_3 (32'h2a0)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_4 (32'h300302a4)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_4 (32'h2a4)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_5 (32'h300302a8)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_5 (32'h2a8)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_6 (32'h300302ac)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_6 (32'h2ac)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_7 (32'h300302b0)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_7 (32'h2b0)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_8 (32'h300302b4)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_8 (32'h2b4)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_9 (32'h300302b8)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_9 (32'h2b8)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_10 (32'h300302bc)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_10 (32'h2bc)
`define CLP_SOC_IFC_REG_FUSE_OWNER_PK_HASH_11 (32'h300302c0)
`define SOC_IFC_REG_FUSE_OWNER_PK_HASH_11 (32'h2c0)
`define CLP_SOC_IFC_REG_FUSE_FMC_KEY_MANIFEST_SVN (32'h300302c4)
`define SOC_IFC_REG_FUSE_FMC_KEY_MANIFEST_SVN (32'h2c4)
`define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_0 (32'h300302c8)
Expand Down
Loading

0 comments on commit 89a3630

Please sign in to comment.