From c48bda8ab14ee21f3b0f204bf3f0e7c1c7d0c3a8 Mon Sep 17 00:00:00 2001 From: Caleb Whitehead Date: Wed, 20 Nov 2024 13:00:28 -0800 Subject: [PATCH] Shift FUSE REG offsets to better match 1.1 legacy offsets --- src/integration/rtl/caliptra_reg.h | 164 +++++++++---------- src/integration/rtl/caliptra_reg_defines.svh | 164 +++++++++---------- src/soc_ifc/rtl/caliptra_top_reg.h | 164 +++++++++---------- src/soc_ifc/rtl/caliptra_top_reg_defines.svh | 164 +++++++++---------- src/soc_ifc/rtl/soc_ifc_fuse_reg.rdl | 4 +- src/soc_ifc/rtl/soc_ifc_reg.sv | 18 +- src/soc_ifc/rtl/soc_ifc_reg_uvm.sv | 18 +- 7 files changed, 348 insertions(+), 348 deletions(-) diff --git a/src/integration/rtl/caliptra_reg.h b/src/integration/rtl/caliptra_reg.h index 56e407e9f..09796790c 100644 --- a/src/integration/rtl/caliptra_reg.h +++ b/src/integration/rtl/caliptra_reg.h @@ -5842,94 +5842,94 @@ #define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_6 (0x2a8) #define CLP_SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_7 (0x300302ac) #define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_7 (0x2ac) -#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) -#define SOC_IFC_REG_FUSE_RUNTIME_SVN_0 (0x2c8) -#define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_1 (0x300302cc) -#define SOC_IFC_REG_FUSE_RUNTIME_SVN_1 (0x2cc) -#define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_2 (0x300302d0) -#define SOC_IFC_REG_FUSE_RUNTIME_SVN_2 (0x2d0) -#define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_3 (0x300302d4) -#define SOC_IFC_REG_FUSE_RUNTIME_SVN_3 (0x2d4) -#define CLP_SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE (0x300302d8) -#define SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE (0x2d8) +#define CLP_SOC_IFC_REG_FUSE_FMC_KEY_MANIFEST_SVN (0x300302b4) +#define SOC_IFC_REG_FUSE_FMC_KEY_MANIFEST_SVN (0x2b4) +#define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_0 (0x300302b8) +#define SOC_IFC_REG_FUSE_RUNTIME_SVN_0 (0x2b8) +#define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_1 (0x300302bc) +#define SOC_IFC_REG_FUSE_RUNTIME_SVN_1 (0x2bc) +#define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_2 (0x300302c0) +#define SOC_IFC_REG_FUSE_RUNTIME_SVN_2 (0x2c0) +#define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_3 (0x300302c4) +#define SOC_IFC_REG_FUSE_RUNTIME_SVN_3 (0x2c4) +#define CLP_SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE (0x300302c8) +#define SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE (0x2c8) #define SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE_DIS_LOW (0) #define SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE_DIS_MASK (0x1) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_0 (0x300302dc) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_0 (0x2dc) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_1 (0x300302e0) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_1 (0x2e0) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_2 (0x300302e4) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_2 (0x2e4) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_3 (0x300302e8) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_3 (0x2e8) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_4 (0x300302ec) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_4 (0x2ec) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_5 (0x300302f0) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_5 (0x2f0) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_6 (0x300302f4) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_6 (0x2f4) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_7 (0x300302f8) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_7 (0x2f8) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_8 (0x300302fc) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_8 (0x2fc) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_9 (0x30030300) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_9 (0x300) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_10 (0x30030304) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_10 (0x304) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_11 (0x30030308) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_11 (0x308) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_12 (0x3003030c) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_12 (0x30c) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_13 (0x30030310) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_13 (0x310) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_14 (0x30030314) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_14 (0x314) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_15 (0x30030318) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_15 (0x318) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_16 (0x3003031c) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_16 (0x31c) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_17 (0x30030320) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_17 (0x320) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_18 (0x30030324) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_18 (0x324) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_19 (0x30030328) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_19 (0x328) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_20 (0x3003032c) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_20 (0x32c) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_21 (0x30030330) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_21 (0x330) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_22 (0x30030334) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_22 (0x334) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_23 (0x30030338) -#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_23 (0x338) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (0x3003033c) -#define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (0x33c) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (0x30030340) -#define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (0x340) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (0x30030344) -#define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (0x344) -#define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (0x30030348) -#define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (0x348) -#define CLP_SOC_IFC_REG_FUSE_LMS_REVOCATION (0x30030350) -#define SOC_IFC_REG_FUSE_LMS_REVOCATION (0x350) -#define CLP_SOC_IFC_REG_FUSE_MLDSA_REVOCATION (0x30030354) -#define SOC_IFC_REG_FUSE_MLDSA_REVOCATION (0x354) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_0 (0x300302cc) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_0 (0x2cc) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_1 (0x300302d0) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_1 (0x2d0) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_2 (0x300302d4) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_2 (0x2d4) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_3 (0x300302d8) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_3 (0x2d8) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_4 (0x300302dc) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_4 (0x2dc) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_5 (0x300302e0) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_5 (0x2e0) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_6 (0x300302e4) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_6 (0x2e4) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_7 (0x300302e8) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_7 (0x2e8) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_8 (0x300302ec) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_8 (0x2ec) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_9 (0x300302f0) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_9 (0x2f0) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_10 (0x300302f4) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_10 (0x2f4) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_11 (0x300302f8) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_11 (0x2f8) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_12 (0x300302fc) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_12 (0x2fc) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_13 (0x30030300) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_13 (0x300) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_14 (0x30030304) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_14 (0x304) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_15 (0x30030308) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_15 (0x308) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_16 (0x3003030c) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_16 (0x30c) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_17 (0x30030310) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_17 (0x310) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_18 (0x30030314) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_18 (0x314) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_19 (0x30030318) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_19 (0x318) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_20 (0x3003031c) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_20 (0x31c) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_21 (0x30030320) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_21 (0x320) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_22 (0x30030324) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_22 (0x324) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_23 (0x30030328) +#define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_23 (0x328) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (0x3003032c) +#define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (0x32c) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (0x30030330) +#define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (0x330) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (0x30030334) +#define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (0x334) +#define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (0x30030338) +#define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (0x338) +#define CLP_SOC_IFC_REG_FUSE_LMS_REVOCATION (0x30030340) +#define SOC_IFC_REG_FUSE_LMS_REVOCATION (0x340) +#define CLP_SOC_IFC_REG_FUSE_MLDSA_REVOCATION (0x30030344) +#define SOC_IFC_REG_FUSE_MLDSA_REVOCATION (0x344) #define SOC_IFC_REG_FUSE_MLDSA_REVOCATION_MLDSA_REVOCATION_LOW (0) #define SOC_IFC_REG_FUSE_MLDSA_REVOCATION_MLDSA_REVOCATION_MASK (0xf) -#define CLP_SOC_IFC_REG_FUSE_SOC_STEPPING_ID (0x30030358) -#define SOC_IFC_REG_FUSE_SOC_STEPPING_ID (0x358) +#define CLP_SOC_IFC_REG_FUSE_SOC_STEPPING_ID (0x30030348) +#define SOC_IFC_REG_FUSE_SOC_STEPPING_ID (0x348) #define SOC_IFC_REG_FUSE_SOC_STEPPING_ID_SOC_STEPPING_ID_LOW (0) #define SOC_IFC_REG_FUSE_SOC_STEPPING_ID_SOC_STEPPING_ID_MASK (0xffff) -#define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (0x3003035c) -#define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (0x35c) -#define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (0x30030360) -#define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (0x360) -#define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (0x30030364) -#define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (0x364) -#define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (0x30030368) -#define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (0x368) +#define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (0x3003034c) +#define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (0x34c) +#define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (0x30030350) +#define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (0x350) +#define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (0x30030354) +#define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (0x354) +#define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (0x30030358) +#define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (0x358) #define CLP_SOC_IFC_REG_SS_CALIPTRA_BASE_ADDR_L (0x30030500) #define SOC_IFC_REG_SS_CALIPTRA_BASE_ADDR_L (0x500) #define CLP_SOC_IFC_REG_SS_CALIPTRA_BASE_ADDR_H (0x30030504) diff --git a/src/integration/rtl/caliptra_reg_defines.svh b/src/integration/rtl/caliptra_reg_defines.svh index aab776a9d..d4d59e64a 100644 --- a/src/integration/rtl/caliptra_reg_defines.svh +++ b/src/integration/rtl/caliptra_reg_defines.svh @@ -5842,94 +5842,94 @@ `define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_6 (32'h2a8) `define CLP_SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_7 (32'h300302ac) `define SOC_IFC_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_7 (32'h2ac) -`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) -`define SOC_IFC_REG_FUSE_RUNTIME_SVN_0 (32'h2c8) -`define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_1 (32'h300302cc) -`define SOC_IFC_REG_FUSE_RUNTIME_SVN_1 (32'h2cc) -`define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_2 (32'h300302d0) -`define SOC_IFC_REG_FUSE_RUNTIME_SVN_2 (32'h2d0) -`define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_3 (32'h300302d4) -`define SOC_IFC_REG_FUSE_RUNTIME_SVN_3 (32'h2d4) -`define CLP_SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE (32'h300302d8) -`define SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE (32'h2d8) +`define CLP_SOC_IFC_REG_FUSE_FMC_KEY_MANIFEST_SVN (32'h300302b4) +`define SOC_IFC_REG_FUSE_FMC_KEY_MANIFEST_SVN (32'h2b4) +`define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_0 (32'h300302b8) +`define SOC_IFC_REG_FUSE_RUNTIME_SVN_0 (32'h2b8) +`define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_1 (32'h300302bc) +`define SOC_IFC_REG_FUSE_RUNTIME_SVN_1 (32'h2bc) +`define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_2 (32'h300302c0) +`define SOC_IFC_REG_FUSE_RUNTIME_SVN_2 (32'h2c0) +`define CLP_SOC_IFC_REG_FUSE_RUNTIME_SVN_3 (32'h300302c4) +`define SOC_IFC_REG_FUSE_RUNTIME_SVN_3 (32'h2c4) +`define CLP_SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE (32'h300302c8) +`define SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE (32'h2c8) `define SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE_DIS_LOW (0) `define SOC_IFC_REG_FUSE_ANTI_ROLLBACK_DISABLE_DIS_MASK (32'h1) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_0 (32'h300302dc) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_0 (32'h2dc) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_1 (32'h300302e0) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_1 (32'h2e0) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_2 (32'h300302e4) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_2 (32'h2e4) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_3 (32'h300302e8) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_3 (32'h2e8) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_4 (32'h300302ec) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_4 (32'h2ec) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_5 (32'h300302f0) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_5 (32'h2f0) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_6 (32'h300302f4) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_6 (32'h2f4) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_7 (32'h300302f8) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_7 (32'h2f8) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_8 (32'h300302fc) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_8 (32'h2fc) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_9 (32'h30030300) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_9 (32'h300) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_10 (32'h30030304) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_10 (32'h304) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_11 (32'h30030308) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_11 (32'h308) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_12 (32'h3003030c) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_12 (32'h30c) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_13 (32'h30030310) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_13 (32'h310) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_14 (32'h30030314) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_14 (32'h314) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_15 (32'h30030318) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_15 (32'h318) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_16 (32'h3003031c) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_16 (32'h31c) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_17 (32'h30030320) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_17 (32'h320) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_18 (32'h30030324) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_18 (32'h324) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_19 (32'h30030328) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_19 (32'h328) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_20 (32'h3003032c) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_20 (32'h32c) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_21 (32'h30030330) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_21 (32'h330) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_22 (32'h30030334) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_22 (32'h334) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_23 (32'h30030338) -`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_23 (32'h338) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (32'h3003033c) -`define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (32'h33c) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (32'h30030340) -`define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (32'h340) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (32'h30030344) -`define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (32'h344) -`define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (32'h30030348) -`define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (32'h348) -`define CLP_SOC_IFC_REG_FUSE_LMS_REVOCATION (32'h30030350) -`define SOC_IFC_REG_FUSE_LMS_REVOCATION (32'h350) -`define CLP_SOC_IFC_REG_FUSE_MLDSA_REVOCATION (32'h30030354) -`define SOC_IFC_REG_FUSE_MLDSA_REVOCATION (32'h354) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_0 (32'h300302cc) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_0 (32'h2cc) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_1 (32'h300302d0) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_1 (32'h2d0) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_2 (32'h300302d4) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_2 (32'h2d4) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_3 (32'h300302d8) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_3 (32'h2d8) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_4 (32'h300302dc) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_4 (32'h2dc) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_5 (32'h300302e0) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_5 (32'h2e0) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_6 (32'h300302e4) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_6 (32'h2e4) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_7 (32'h300302e8) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_7 (32'h2e8) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_8 (32'h300302ec) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_8 (32'h2ec) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_9 (32'h300302f0) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_9 (32'h2f0) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_10 (32'h300302f4) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_10 (32'h2f4) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_11 (32'h300302f8) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_11 (32'h2f8) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_12 (32'h300302fc) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_12 (32'h2fc) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_13 (32'h30030300) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_13 (32'h300) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_14 (32'h30030304) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_14 (32'h304) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_15 (32'h30030308) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_15 (32'h308) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_16 (32'h3003030c) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_16 (32'h30c) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_17 (32'h30030310) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_17 (32'h310) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_18 (32'h30030314) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_18 (32'h314) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_19 (32'h30030318) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_19 (32'h318) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_20 (32'h3003031c) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_20 (32'h31c) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_21 (32'h30030320) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_21 (32'h320) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_22 (32'h30030324) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_22 (32'h324) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_23 (32'h30030328) +`define SOC_IFC_REG_FUSE_IDEVID_CERT_ATTR_23 (32'h328) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (32'h3003032c) +`define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (32'h32c) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (32'h30030330) +`define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (32'h330) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (32'h30030334) +`define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (32'h334) +`define CLP_SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (32'h30030338) +`define SOC_IFC_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (32'h338) +`define CLP_SOC_IFC_REG_FUSE_LMS_REVOCATION (32'h30030340) +`define SOC_IFC_REG_FUSE_LMS_REVOCATION (32'h340) +`define CLP_SOC_IFC_REG_FUSE_MLDSA_REVOCATION (32'h30030344) +`define SOC_IFC_REG_FUSE_MLDSA_REVOCATION (32'h344) `define SOC_IFC_REG_FUSE_MLDSA_REVOCATION_MLDSA_REVOCATION_LOW (0) `define SOC_IFC_REG_FUSE_MLDSA_REVOCATION_MLDSA_REVOCATION_MASK (32'hf) -`define CLP_SOC_IFC_REG_FUSE_SOC_STEPPING_ID (32'h30030358) -`define SOC_IFC_REG_FUSE_SOC_STEPPING_ID (32'h358) +`define CLP_SOC_IFC_REG_FUSE_SOC_STEPPING_ID (32'h30030348) +`define SOC_IFC_REG_FUSE_SOC_STEPPING_ID (32'h348) `define SOC_IFC_REG_FUSE_SOC_STEPPING_ID_SOC_STEPPING_ID_LOW (0) `define SOC_IFC_REG_FUSE_SOC_STEPPING_ID_SOC_STEPPING_ID_MASK (32'hffff) -`define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (32'h3003035c) -`define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (32'h35c) -`define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (32'h30030360) -`define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (32'h360) -`define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (32'h30030364) -`define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (32'h364) -`define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (32'h30030368) -`define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (32'h368) +`define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (32'h3003034c) +`define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (32'h34c) +`define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (32'h30030350) +`define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (32'h350) +`define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (32'h30030354) +`define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (32'h354) +`define CLP_SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (32'h30030358) +`define SOC_IFC_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (32'h358) `define CLP_SOC_IFC_REG_SS_CALIPTRA_BASE_ADDR_L (32'h30030500) `define SOC_IFC_REG_SS_CALIPTRA_BASE_ADDR_L (32'h500) `define CLP_SOC_IFC_REG_SS_CALIPTRA_BASE_ADDR_H (32'h30030504) diff --git a/src/soc_ifc/rtl/caliptra_top_reg.h b/src/soc_ifc/rtl/caliptra_top_reg.h index 9bcf9a44a..4af43d215 100644 --- a/src/soc_ifc/rtl/caliptra_top_reg.h +++ b/src/soc_ifc/rtl/caliptra_top_reg.h @@ -429,94 +429,94 @@ #define GENERIC_AND_FUSE_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_6 (0x2a8) #define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_7 (0x300302ac) #define GENERIC_AND_FUSE_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_7 (0x2ac) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_FMC_KEY_MANIFEST_SVN (0x300302c4) -#define GENERIC_AND_FUSE_REG_FUSE_FMC_KEY_MANIFEST_SVN (0x2c4) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_0 (0x300302c8) -#define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_0 (0x2c8) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_1 (0x300302cc) -#define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_1 (0x2cc) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_2 (0x300302d0) -#define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_2 (0x2d0) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_3 (0x300302d4) -#define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_3 (0x2d4) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE (0x300302d8) -#define GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE (0x2d8) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_FMC_KEY_MANIFEST_SVN (0x300302b4) +#define GENERIC_AND_FUSE_REG_FUSE_FMC_KEY_MANIFEST_SVN (0x2b4) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_0 (0x300302b8) +#define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_0 (0x2b8) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_1 (0x300302bc) +#define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_1 (0x2bc) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_2 (0x300302c0) +#define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_2 (0x2c0) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_3 (0x300302c4) +#define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_3 (0x2c4) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE (0x300302c8) +#define GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE (0x2c8) #define GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE_DIS_LOW (0) #define GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE_DIS_MASK (0x1) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_0 (0x300302dc) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_0 (0x2dc) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_1 (0x300302e0) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_1 (0x2e0) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_2 (0x300302e4) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_2 (0x2e4) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_3 (0x300302e8) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_3 (0x2e8) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_4 (0x300302ec) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_4 (0x2ec) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_5 (0x300302f0) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_5 (0x2f0) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_6 (0x300302f4) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_6 (0x2f4) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_7 (0x300302f8) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_7 (0x2f8) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_8 (0x300302fc) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_8 (0x2fc) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_9 (0x30030300) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_9 (0x300) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_10 (0x30030304) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_10 (0x304) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_11 (0x30030308) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_11 (0x308) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_12 (0x3003030c) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_12 (0x30c) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_13 (0x30030310) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_13 (0x310) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_14 (0x30030314) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_14 (0x314) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_15 (0x30030318) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_15 (0x318) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_16 (0x3003031c) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_16 (0x31c) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_17 (0x30030320) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_17 (0x320) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_18 (0x30030324) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_18 (0x324) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_19 (0x30030328) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_19 (0x328) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_20 (0x3003032c) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_20 (0x32c) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_21 (0x30030330) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_21 (0x330) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_22 (0x30030334) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_22 (0x334) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_23 (0x30030338) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_23 (0x338) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (0x3003033c) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (0x33c) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (0x30030340) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (0x340) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (0x30030344) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (0x344) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (0x30030348) -#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (0x348) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_LMS_REVOCATION (0x30030350) -#define GENERIC_AND_FUSE_REG_FUSE_LMS_REVOCATION (0x350) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION (0x30030354) -#define GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION (0x354) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_0 (0x300302cc) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_0 (0x2cc) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_1 (0x300302d0) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_1 (0x2d0) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_2 (0x300302d4) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_2 (0x2d4) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_3 (0x300302d8) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_3 (0x2d8) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_4 (0x300302dc) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_4 (0x2dc) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_5 (0x300302e0) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_5 (0x2e0) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_6 (0x300302e4) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_6 (0x2e4) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_7 (0x300302e8) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_7 (0x2e8) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_8 (0x300302ec) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_8 (0x2ec) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_9 (0x300302f0) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_9 (0x2f0) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_10 (0x300302f4) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_10 (0x2f4) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_11 (0x300302f8) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_11 (0x2f8) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_12 (0x300302fc) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_12 (0x2fc) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_13 (0x30030300) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_13 (0x300) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_14 (0x30030304) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_14 (0x304) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_15 (0x30030308) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_15 (0x308) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_16 (0x3003030c) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_16 (0x30c) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_17 (0x30030310) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_17 (0x310) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_18 (0x30030314) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_18 (0x314) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_19 (0x30030318) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_19 (0x318) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_20 (0x3003031c) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_20 (0x31c) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_21 (0x30030320) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_21 (0x320) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_22 (0x30030324) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_22 (0x324) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_23 (0x30030328) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_23 (0x328) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (0x3003032c) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (0x32c) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (0x30030330) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (0x330) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (0x30030334) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (0x334) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (0x30030338) +#define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (0x338) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_LMS_REVOCATION (0x30030340) +#define GENERIC_AND_FUSE_REG_FUSE_LMS_REVOCATION (0x340) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION (0x30030344) +#define GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION (0x344) #define GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION_MLDSA_REVOCATION_LOW (0) #define GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION_MLDSA_REVOCATION_MASK (0xf) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID (0x30030358) -#define GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID (0x358) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID (0x30030348) +#define GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID (0x348) #define GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID_SOC_STEPPING_ID_LOW (0) #define GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID_SOC_STEPPING_ID_MASK (0xffff) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (0x3003035c) -#define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (0x35c) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (0x30030360) -#define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (0x360) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (0x30030364) -#define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (0x364) -#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (0x30030368) -#define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (0x368) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (0x3003034c) +#define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (0x34c) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (0x30030350) +#define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (0x350) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (0x30030354) +#define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (0x354) +#define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (0x30030358) +#define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (0x358) #define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_SS_CALIPTRA_BASE_ADDR_L (0x30030500) #define GENERIC_AND_FUSE_REG_SS_CALIPTRA_BASE_ADDR_L (0x500) #define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_SS_CALIPTRA_BASE_ADDR_H (0x30030504) diff --git a/src/soc_ifc/rtl/caliptra_top_reg_defines.svh b/src/soc_ifc/rtl/caliptra_top_reg_defines.svh index eb231f1f0..7ecb283c0 100644 --- a/src/soc_ifc/rtl/caliptra_top_reg_defines.svh +++ b/src/soc_ifc/rtl/caliptra_top_reg_defines.svh @@ -429,94 +429,94 @@ `define GENERIC_AND_FUSE_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_6 (32'h2a8) `define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_7 (32'h300302ac) `define GENERIC_AND_FUSE_REG_FUSE_KEY_MANIFEST_PK_HASH_MASK_7 (32'h2ac) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_FMC_KEY_MANIFEST_SVN (32'h300302c4) -`define GENERIC_AND_FUSE_REG_FUSE_FMC_KEY_MANIFEST_SVN (32'h2c4) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_0 (32'h300302c8) -`define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_0 (32'h2c8) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_1 (32'h300302cc) -`define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_1 (32'h2cc) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_2 (32'h300302d0) -`define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_2 (32'h2d0) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_3 (32'h300302d4) -`define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_3 (32'h2d4) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE (32'h300302d8) -`define GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE (32'h2d8) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_FMC_KEY_MANIFEST_SVN (32'h300302b4) +`define GENERIC_AND_FUSE_REG_FUSE_FMC_KEY_MANIFEST_SVN (32'h2b4) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_0 (32'h300302b8) +`define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_0 (32'h2b8) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_1 (32'h300302bc) +`define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_1 (32'h2bc) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_2 (32'h300302c0) +`define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_2 (32'h2c0) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_3 (32'h300302c4) +`define GENERIC_AND_FUSE_REG_FUSE_RUNTIME_SVN_3 (32'h2c4) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE (32'h300302c8) +`define GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE (32'h2c8) `define GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE_DIS_LOW (0) `define GENERIC_AND_FUSE_REG_FUSE_ANTI_ROLLBACK_DISABLE_DIS_MASK (32'h1) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_0 (32'h300302dc) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_0 (32'h2dc) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_1 (32'h300302e0) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_1 (32'h2e0) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_2 (32'h300302e4) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_2 (32'h2e4) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_3 (32'h300302e8) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_3 (32'h2e8) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_4 (32'h300302ec) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_4 (32'h2ec) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_5 (32'h300302f0) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_5 (32'h2f0) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_6 (32'h300302f4) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_6 (32'h2f4) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_7 (32'h300302f8) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_7 (32'h2f8) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_8 (32'h300302fc) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_8 (32'h2fc) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_9 (32'h30030300) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_9 (32'h300) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_10 (32'h30030304) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_10 (32'h304) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_11 (32'h30030308) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_11 (32'h308) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_12 (32'h3003030c) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_12 (32'h30c) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_13 (32'h30030310) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_13 (32'h310) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_14 (32'h30030314) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_14 (32'h314) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_15 (32'h30030318) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_15 (32'h318) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_16 (32'h3003031c) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_16 (32'h31c) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_17 (32'h30030320) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_17 (32'h320) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_18 (32'h30030324) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_18 (32'h324) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_19 (32'h30030328) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_19 (32'h328) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_20 (32'h3003032c) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_20 (32'h32c) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_21 (32'h30030330) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_21 (32'h330) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_22 (32'h30030334) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_22 (32'h334) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_23 (32'h30030338) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_23 (32'h338) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (32'h3003033c) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (32'h33c) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (32'h30030340) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (32'h340) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (32'h30030344) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (32'h344) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (32'h30030348) -`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (32'h348) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_LMS_REVOCATION (32'h30030350) -`define GENERIC_AND_FUSE_REG_FUSE_LMS_REVOCATION (32'h350) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION (32'h30030354) -`define GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION (32'h354) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_0 (32'h300302cc) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_0 (32'h2cc) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_1 (32'h300302d0) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_1 (32'h2d0) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_2 (32'h300302d4) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_2 (32'h2d4) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_3 (32'h300302d8) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_3 (32'h2d8) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_4 (32'h300302dc) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_4 (32'h2dc) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_5 (32'h300302e0) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_5 (32'h2e0) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_6 (32'h300302e4) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_6 (32'h2e4) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_7 (32'h300302e8) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_7 (32'h2e8) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_8 (32'h300302ec) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_8 (32'h2ec) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_9 (32'h300302f0) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_9 (32'h2f0) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_10 (32'h300302f4) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_10 (32'h2f4) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_11 (32'h300302f8) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_11 (32'h2f8) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_12 (32'h300302fc) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_12 (32'h2fc) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_13 (32'h30030300) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_13 (32'h300) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_14 (32'h30030304) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_14 (32'h304) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_15 (32'h30030308) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_15 (32'h308) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_16 (32'h3003030c) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_16 (32'h30c) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_17 (32'h30030310) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_17 (32'h310) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_18 (32'h30030314) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_18 (32'h314) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_19 (32'h30030318) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_19 (32'h318) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_20 (32'h3003031c) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_20 (32'h31c) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_21 (32'h30030320) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_21 (32'h320) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_22 (32'h30030324) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_22 (32'h324) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_23 (32'h30030328) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_CERT_ATTR_23 (32'h328) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (32'h3003032c) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_0 (32'h32c) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (32'h30030330) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_1 (32'h330) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (32'h30030334) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_2 (32'h334) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (32'h30030338) +`define GENERIC_AND_FUSE_REG_FUSE_IDEVID_MANUF_HSM_ID_3 (32'h338) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_LMS_REVOCATION (32'h30030340) +`define GENERIC_AND_FUSE_REG_FUSE_LMS_REVOCATION (32'h340) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION (32'h30030344) +`define GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION (32'h344) `define GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION_MLDSA_REVOCATION_LOW (0) `define GENERIC_AND_FUSE_REG_FUSE_MLDSA_REVOCATION_MLDSA_REVOCATION_MASK (32'hf) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID (32'h30030358) -`define GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID (32'h358) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID (32'h30030348) +`define GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID (32'h348) `define GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID_SOC_STEPPING_ID_LOW (0) `define GENERIC_AND_FUSE_REG_FUSE_SOC_STEPPING_ID_SOC_STEPPING_ID_MASK (32'hffff) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (32'h3003035c) -`define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (32'h35c) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (32'h30030360) -`define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (32'h360) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (32'h30030364) -`define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (32'h364) -`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (32'h30030368) -`define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (32'h368) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (32'h3003034c) +`define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_0 (32'h34c) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (32'h30030350) +`define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_1 (32'h350) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (32'h30030354) +`define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_2 (32'h354) +`define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (32'h30030358) +`define GENERIC_AND_FUSE_REG_FUSE_MANUF_DBG_UNLOCK_TOKEN_3 (32'h358) `define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_SS_CALIPTRA_BASE_ADDR_L (32'h30030500) `define GENERIC_AND_FUSE_REG_SS_CALIPTRA_BASE_ADDR_L (32'h500) `define CALIPTRA_TOP_REG_GENERIC_AND_FUSE_REG_SS_CALIPTRA_BASE_ADDR_H (32'h30030504) diff --git a/src/soc_ifc/rtl/soc_ifc_fuse_reg.rdl b/src/soc_ifc/rtl/soc_ifc_fuse_reg.rdl index 81bbc75b8..c7ae8f405 100644 --- a/src/soc_ifc/rtl/soc_ifc_fuse_reg.rdl +++ b/src/soc_ifc/rtl/soc_ifc_fuse_reg.rdl @@ -52,7 +52,7 @@ reg { [br]Caliptra Access: RO [br]SOC Access: RWL-S"; Fuse svn[32]=0; -} fuse_fmc_key_manifest_svn @0x2c4; +} fuse_fmc_key_manifest_svn @0x2b4; reg { desc = "Runtime SVN Fuse. [br]Caliptra Access: RO @@ -83,7 +83,7 @@ reg { [br]Caliptra Access: RO [br]SOC Access: RWL-S"; Fuse lms_revocation[32]=0; -} fuse_lms_revocation @0x350; +} fuse_lms_revocation @0x340; reg { desc = "One-hot encoded list of revoked Vendor MLDSA Public Keys (up to 4 keys) [br]Caliptra Access: RO diff --git a/src/soc_ifc/rtl/soc_ifc_reg.sv b/src/soc_ifc/rtl/soc_ifc_reg.sv index d85c9158e..46bf8a523 100644 --- a/src/soc_ifc/rtl/soc_ifc_reg.sv +++ b/src/soc_ifc/rtl/soc_ifc_reg.sv @@ -285,22 +285,22 @@ module soc_ifc_reg ( for(int i0=0; i0<8; i0++) begin decoded_reg_strb.fuse_key_manifest_pk_hash_mask[i0] = cpuif_req_masked & (cpuif_addr == 12'h290 + i0*12'h4); end - decoded_reg_strb.fuse_fmc_key_manifest_svn = cpuif_req_masked & (cpuif_addr == 12'h2c4); + decoded_reg_strb.fuse_fmc_key_manifest_svn = cpuif_req_masked & (cpuif_addr == 12'h2b4); for(int i0=0; i0<4; i0++) begin - decoded_reg_strb.fuse_runtime_svn[i0] = cpuif_req_masked & (cpuif_addr == 12'h2c8 + i0*12'h4); + decoded_reg_strb.fuse_runtime_svn[i0] = cpuif_req_masked & (cpuif_addr == 12'h2b8 + i0*12'h4); end - decoded_reg_strb.fuse_anti_rollback_disable = cpuif_req_masked & (cpuif_addr == 12'h2d8); + decoded_reg_strb.fuse_anti_rollback_disable = cpuif_req_masked & (cpuif_addr == 12'h2c8); for(int i0=0; i0<24; i0++) begin - decoded_reg_strb.fuse_idevid_cert_attr[i0] = cpuif_req_masked & (cpuif_addr == 12'h2dc + i0*12'h4); + decoded_reg_strb.fuse_idevid_cert_attr[i0] = cpuif_req_masked & (cpuif_addr == 12'h2cc + i0*12'h4); end for(int i0=0; i0<4; i0++) begin - decoded_reg_strb.fuse_idevid_manuf_hsm_id[i0] = cpuif_req_masked & (cpuif_addr == 12'h33c + i0*12'h4); + decoded_reg_strb.fuse_idevid_manuf_hsm_id[i0] = cpuif_req_masked & (cpuif_addr == 12'h32c + i0*12'h4); end - decoded_reg_strb.fuse_lms_revocation = cpuif_req_masked & (cpuif_addr == 12'h350); - decoded_reg_strb.fuse_mldsa_revocation = cpuif_req_masked & (cpuif_addr == 12'h354); - decoded_reg_strb.fuse_soc_stepping_id = cpuif_req_masked & (cpuif_addr == 12'h358); + decoded_reg_strb.fuse_lms_revocation = cpuif_req_masked & (cpuif_addr == 12'h340); + decoded_reg_strb.fuse_mldsa_revocation = cpuif_req_masked & (cpuif_addr == 12'h344); + decoded_reg_strb.fuse_soc_stepping_id = cpuif_req_masked & (cpuif_addr == 12'h348); for(int i0=0; i0<4; i0++) begin - decoded_reg_strb.fuse_manuf_dbg_unlock_token[i0] = cpuif_req_masked & (cpuif_addr == 12'h35c + i0*12'h4); + decoded_reg_strb.fuse_manuf_dbg_unlock_token[i0] = cpuif_req_masked & (cpuif_addr == 12'h34c + i0*12'h4); end decoded_reg_strb.SS_CALIPTRA_BASE_ADDR_L = cpuif_req_masked & (cpuif_addr == 12'h500); decoded_reg_strb.SS_CALIPTRA_BASE_ADDR_H = cpuif_req_masked & (cpuif_addr == 12'h504); diff --git a/src/soc_ifc/rtl/soc_ifc_reg_uvm.sv b/src/soc_ifc/rtl/soc_ifc_reg_uvm.sv index b12c44b25..074b59dc9 100644 --- a/src/soc_ifc/rtl/soc_ifc_reg_uvm.sv +++ b/src/soc_ifc/rtl/soc_ifc_reg_uvm.sv @@ -4809,54 +4809,54 @@ package soc_ifc_reg_uvm; this.fuse_fmc_key_manifest_svn.configure(this); this.fuse_fmc_key_manifest_svn.build(); - this.default_map.add_reg(this.fuse_fmc_key_manifest_svn, 'h2c4); + this.default_map.add_reg(this.fuse_fmc_key_manifest_svn, 'h2b4); foreach(this.fuse_runtime_svn[i0]) begin this.fuse_runtime_svn[i0] = new($sformatf("fuse_runtime_svn[%0d]", i0)); this.fuse_runtime_svn[i0].configure(this); this.fuse_runtime_svn[i0].build(); - this.default_map.add_reg(this.fuse_runtime_svn[i0], 'h2c8 + i0*'h4); + this.default_map.add_reg(this.fuse_runtime_svn[i0], 'h2b8 + i0*'h4); end this.fuse_anti_rollback_disable = new("fuse_anti_rollback_disable"); this.fuse_anti_rollback_disable.configure(this); this.fuse_anti_rollback_disable.build(); - this.default_map.add_reg(this.fuse_anti_rollback_disable, 'h2d8); + this.default_map.add_reg(this.fuse_anti_rollback_disable, 'h2c8); foreach(this.fuse_idevid_cert_attr[i0]) begin this.fuse_idevid_cert_attr[i0] = new($sformatf("fuse_idevid_cert_attr[%0d]", i0)); this.fuse_idevid_cert_attr[i0].configure(this); this.fuse_idevid_cert_attr[i0].build(); - this.default_map.add_reg(this.fuse_idevid_cert_attr[i0], 'h2dc + i0*'h4); + this.default_map.add_reg(this.fuse_idevid_cert_attr[i0], 'h2cc + i0*'h4); end foreach(this.fuse_idevid_manuf_hsm_id[i0]) begin this.fuse_idevid_manuf_hsm_id[i0] = new($sformatf("fuse_idevid_manuf_hsm_id[%0d]", i0)); this.fuse_idevid_manuf_hsm_id[i0].configure(this); this.fuse_idevid_manuf_hsm_id[i0].build(); - this.default_map.add_reg(this.fuse_idevid_manuf_hsm_id[i0], 'h33c + i0*'h4); + this.default_map.add_reg(this.fuse_idevid_manuf_hsm_id[i0], 'h32c + i0*'h4); end this.fuse_lms_revocation = new("fuse_lms_revocation"); this.fuse_lms_revocation.configure(this); this.fuse_lms_revocation.build(); - this.default_map.add_reg(this.fuse_lms_revocation, 'h350); + this.default_map.add_reg(this.fuse_lms_revocation, 'h340); this.fuse_mldsa_revocation = new("fuse_mldsa_revocation"); this.fuse_mldsa_revocation.configure(this); this.fuse_mldsa_revocation.build(); - this.default_map.add_reg(this.fuse_mldsa_revocation, 'h354); + this.default_map.add_reg(this.fuse_mldsa_revocation, 'h344); this.fuse_soc_stepping_id = new("fuse_soc_stepping_id"); this.fuse_soc_stepping_id.configure(this); this.fuse_soc_stepping_id.build(); - this.default_map.add_reg(this.fuse_soc_stepping_id, 'h358); + this.default_map.add_reg(this.fuse_soc_stepping_id, 'h348); foreach(this.fuse_manuf_dbg_unlock_token[i0]) begin this.fuse_manuf_dbg_unlock_token[i0] = new($sformatf("fuse_manuf_dbg_unlock_token[%0d]", i0)); this.fuse_manuf_dbg_unlock_token[i0].configure(this); this.fuse_manuf_dbg_unlock_token[i0].build(); - this.default_map.add_reg(this.fuse_manuf_dbg_unlock_token[i0], 'h35c + i0*'h4); + this.default_map.add_reg(this.fuse_manuf_dbg_unlock_token[i0], 'h34c + i0*'h4); end this.SS_CALIPTRA_BASE_ADDR_L = new("SS_CALIPTRA_BASE_ADDR_L"); this.SS_CALIPTRA_BASE_ADDR_L.configure(this);