[otp_ctrl] Regenerate files
Signed-off-by: Michael Schaffner <msf@opentitan.org>
diff --git a/hw/ip/otp_ctrl/data/otp_ctrl.hjson b/hw/ip/otp_ctrl/data/otp_ctrl.hjson
index 8098a93..b390c50 100644
--- a/hw/ip/otp_ctrl/data/otp_ctrl.hjson
+++ b/hw/ip/otp_ctrl/data/otp_ctrl.hjson
@@ -191,7 +191,7 @@
{ name: "HwCfgSize",
desc: "Size of the HW_CFG partition",
type: "int",
- default: "208",
+ default: "240",
local: "true"
},
{ name: "DeviceIdOffset",
@@ -206,22 +206,10 @@
default: "32",
local: "true"
},
- { name: "HwCfgContentOffset",
- desc: "Offset of HW_CFG_CONTENT",
- type: "int",
- default: "1568",
- local: "true"
- },
- { name: "HwCfgContentSize",
- desc: "Size of HW_CFG_CONTENT",
- type: "int",
- default: "168",
- local: "true"
- },
{ name: "HwCfgDigestOffset",
desc: "Offset of HW_CFG_DIGEST",
type: "int",
- default: "1736",
+ default: "1768",
local: "true"
},
{ name: "HwCfgDigestSize",
@@ -233,7 +221,7 @@
{ name: "Secret0Offset",
desc: "Offset of the SECRET0 partition",
type: "int",
- default: "1744",
+ default: "1776",
local: "true"
},
{ name: "Secret0Size",
@@ -245,7 +233,7 @@
{ name: "TestUnlockTokenOffset",
desc: "Offset of TEST_UNLOCK_TOKEN",
type: "int",
- default: "1744",
+ default: "1776",
local: "true"
},
{ name: "TestUnlockTokenSize",
@@ -257,7 +245,7 @@
{ name: "TestExitTokenOffset",
desc: "Offset of TEST_EXIT_TOKEN",
type: "int",
- default: "1760",
+ default: "1792",
local: "true"
},
{ name: "TestExitTokenSize",
@@ -269,7 +257,7 @@
{ name: "Secret0DigestOffset",
desc: "Offset of SECRET0_DIGEST",
type: "int",
- default: "1776",
+ default: "1808",
local: "true"
},
{ name: "Secret0DigestSize",
@@ -281,7 +269,7 @@
{ name: "Secret1Offset",
desc: "Offset of the SECRET1 partition",
type: "int",
- default: "1784",
+ default: "1816",
local: "true"
},
{ name: "Secret1Size",
@@ -293,7 +281,7 @@
{ name: "FlashAddrKeySeedOffset",
desc: "Offset of FLASH_ADDR_KEY_SEED",
type: "int",
- default: "1784",
+ default: "1816",
local: "true"
},
{ name: "FlashAddrKeySeedSize",
@@ -305,7 +293,7 @@
{ name: "FlashDataKeySeedOffset",
desc: "Offset of FLASH_DATA_KEY_SEED",
type: "int",
- default: "1816",
+ default: "1848",
local: "true"
},
{ name: "FlashDataKeySeedSize",
@@ -317,7 +305,7 @@
{ name: "SramDataKeySeedOffset",
desc: "Offset of SRAM_DATA_KEY_SEED",
type: "int",
- default: "1848",
+ default: "1880",
local: "true"
},
{ name: "SramDataKeySeedSize",
@@ -329,7 +317,7 @@
{ name: "Secret1DigestOffset",
desc: "Offset of SECRET1_DIGEST",
type: "int",
- default: "1864",
+ default: "1896",
local: "true"
},
{ name: "Secret1DigestSize",
@@ -341,19 +329,19 @@
{ name: "Secret2Offset",
desc: "Offset of the SECRET2 partition",
type: "int",
- default: "1872",
+ default: "1904",
local: "true"
},
{ name: "Secret2Size",
desc: "Size of the SECRET2 partition",
type: "int",
- default: "120",
+ default: "88",
local: "true"
},
{ name: "RmaTokenOffset",
desc: "Offset of RMA_TOKEN",
type: "int",
- default: "1872",
+ default: "1904",
local: "true"
},
{ name: "RmaTokenSize",
@@ -365,7 +353,7 @@
{ name: "CreatorRootKeyShare0Offset",
desc: "Offset of CREATOR_ROOT_KEY_SHARE0",
type: "int",
- default: "1888",
+ default: "1920",
local: "true"
},
{ name: "CreatorRootKeyShare0Size",
@@ -377,7 +365,7 @@
{ name: "CreatorRootKeyShare1Offset",
desc: "Offset of CREATOR_ROOT_KEY_SHARE1",
type: "int",
- default: "1920",
+ default: "1952",
local: "true"
},
{ name: "CreatorRootKeyShare1Size",
diff --git a/hw/ip/otp_ctrl/doc/otp_ctrl_mmap.md b/hw/ip/otp_ctrl/doc/otp_ctrl_mmap.md
index 379c1b1..db184ef 100644
--- a/hw/ip/otp_ctrl/doc/otp_ctrl_mmap.md
+++ b/hw/ip/otp_ctrl/doc/otp_ctrl_mmap.md
@@ -9,19 +9,18 @@
| | | | 64bit | [CREATOR_SW_CFG_DIGEST](#Reg_creator_sw_cfg_digest_0) | 0x2F8 | 8 |
| 1 | OWNER_SW_CFG | 768 | 32bit | OWNER_SW_CFG_CONTENT | 0x300 | 760 |
| | | | 64bit | [OWNER_SW_CFG_DIGEST](#Reg_owner_sw_cfg_digest_0) | 0x5F8 | 8 |
-| 2 | HW_CFG | 208 | 32bit | DEVICE_ID | 0x600 | 32 |
-| | | | 32bit | HW_CFG_CONTENT | 0x620 | 168 |
-| | | | 64bit | [HW_CFG_DIGEST](#Reg_hw_cfg_digest_0) | 0x6C8 | 8 |
-| 3 | SECRET0 | 40 | 64bit | TEST_UNLOCK_TOKEN | 0x6D0 | 16 |
-| | | | 64bit | TEST_EXIT_TOKEN | 0x6E0 | 16 |
-| | | | 64bit | [SECRET0_DIGEST](#Reg_secret0_digest_0) | 0x6F0 | 8 |
-| 4 | SECRET1 | 88 | 64bit | FLASH_ADDR_KEY_SEED | 0x6F8 | 32 |
-| | | | 64bit | FLASH_DATA_KEY_SEED | 0x718 | 32 |
-| | | | 64bit | SRAM_DATA_KEY_SEED | 0x738 | 16 |
-| | | | 64bit | [SECRET1_DIGEST](#Reg_secret1_digest_0) | 0x748 | 8 |
-| 5 | SECRET2 | 120 | 64bit | RMA_TOKEN | 0x750 | 16 |
-| | | | 64bit | CREATOR_ROOT_KEY_SHARE0 | 0x760 | 32 |
-| | | | 64bit | CREATOR_ROOT_KEY_SHARE1 | 0x780 | 32 |
+| 2 | HW_CFG | 240 | 32bit | DEVICE_ID | 0x600 | 32 |
+| | | | 64bit | [HW_CFG_DIGEST](#Reg_hw_cfg_digest_0) | 0x6E8 | 8 |
+| 3 | SECRET0 | 40 | 64bit | TEST_UNLOCK_TOKEN | 0x6F0 | 16 |
+| | | | 64bit | TEST_EXIT_TOKEN | 0x700 | 16 |
+| | | | 64bit | [SECRET0_DIGEST](#Reg_secret0_digest_0) | 0x710 | 8 |
+| 4 | SECRET1 | 88 | 64bit | FLASH_ADDR_KEY_SEED | 0x718 | 32 |
+| | | | 64bit | FLASH_DATA_KEY_SEED | 0x738 | 32 |
+| | | | 64bit | SRAM_DATA_KEY_SEED | 0x758 | 16 |
+| | | | 64bit | [SECRET1_DIGEST](#Reg_secret1_digest_0) | 0x768 | 8 |
+| 5 | SECRET2 | 88 | 64bit | RMA_TOKEN | 0x770 | 16 |
+| | | | 64bit | CREATOR_ROOT_KEY_SHARE0 | 0x780 | 32 |
+| | | | 64bit | CREATOR_ROOT_KEY_SHARE1 | 0x7A0 | 32 |
| | | | 64bit | [SECRET2_DIGEST](#Reg_secret2_digest_0) | 0x7C0 | 8 |
| 6 | LIFE_CYCLE | 56 | 32bit | LC_STATE | 0x7C8 | 24 |
| | | | 32bit | LC_TRANSITION_CNT | 0x7E0 | 32 |
\ No newline at end of file
diff --git a/hw/ip/otp_ctrl/rtl/otp_ctrl_part_pkg.sv b/hw/ip/otp_ctrl/rtl/otp_ctrl_part_pkg.sv
index 9a87424..4297fd3 100644
--- a/hw/ip/otp_ctrl/rtl/otp_ctrl_part_pkg.sv
+++ b/hw/ip/otp_ctrl/rtl/otp_ctrl_part_pkg.sv
@@ -128,7 +128,7 @@
'{
variant: Buffered,
offset: 11'd1536,
- size: 208,
+ size: 240,
key_sel: key_sel_e'('0),
secret: 1'b0,
hw_digest: 1'b1,
@@ -138,7 +138,7 @@
// SECRET0
'{
variant: Buffered,
- offset: 11'd1744,
+ offset: 11'd1776,
size: 40,
key_sel: Secret0Key,
secret: 1'b1,
@@ -149,7 +149,7 @@
// SECRET1
'{
variant: Buffered,
- offset: 11'd1784,
+ offset: 11'd1816,
size: 88,
key_sel: Secret1Key,
secret: 1'b1,
@@ -160,8 +160,8 @@
// SECRET2
'{
variant: Buffered,
- offset: 11'd1872,
- size: 120,
+ offset: 11'd1904,
+ size: 88,
key_sel: Secret2Key,
secret: 1'b1,
hw_digest: 1'b1,
@@ -203,7 +203,6 @@
// Breakout types for easier access of individual items.
typedef struct packed {
logic [63:0] hw_cfg_digest;
- logic [1343:0] hw_cfg_content;
logic [255:0] device_id;
} otp_hw_cfg_data_t;
typedef struct packed {
@@ -218,7 +217,7 @@
256'h0,
192'h0
}),
- 960'({
+ 704'({
64'h1E2960279AB8F882,
256'hA991BEA2CF16541724A52D80A891BCD52BE973D4C5752E3A6912899150240B3A,
256'hD53651B6259AF2A4FB9DCA186AE168595B637FF7F7BF2E7C26917DDC15EB6827,
@@ -235,9 +234,9 @@
128'h5869574E09B5710738066DCD7EF4BB9B,
128'hC48FDBD8A0031C11FA602470308055C4
}),
- 1664'({
+ 1920'({
64'hABFF25A58087D34A,
- 1344'h0,
+ 1600'h0, // unallocated space
256'h37E5AE39A58FACEE41389646B3968A3B128F4AF0AFFC1AAC77ADEFF42376E09D
}),
6144'({
diff --git a/hw/ip/otp_ctrl/rtl/otp_ctrl_reg_pkg.sv b/hw/ip/otp_ctrl/rtl/otp_ctrl_reg_pkg.sv
index 4f5deff..a6aa2cf 100644
--- a/hw/ip/otp_ctrl/rtl/otp_ctrl_reg_pkg.sv
+++ b/hw/ip/otp_ctrl/rtl/otp_ctrl_reg_pkg.sv
@@ -28,38 +28,36 @@
parameter int OwnerSwCfgDigestOffset = 1528;
parameter int OwnerSwCfgDigestSize = 8;
parameter int HwCfgOffset = 1536;
- parameter int HwCfgSize = 208;
+ parameter int HwCfgSize = 240;
parameter int DeviceIdOffset = 1536;
parameter int DeviceIdSize = 32;
- parameter int HwCfgContentOffset = 1568;
- parameter int HwCfgContentSize = 168;
- parameter int HwCfgDigestOffset = 1736;
+ parameter int HwCfgDigestOffset = 1768;
parameter int HwCfgDigestSize = 8;
- parameter int Secret0Offset = 1744;
+ parameter int Secret0Offset = 1776;
parameter int Secret0Size = 40;
- parameter int TestUnlockTokenOffset = 1744;
+ parameter int TestUnlockTokenOffset = 1776;
parameter int TestUnlockTokenSize = 16;
- parameter int TestExitTokenOffset = 1760;
+ parameter int TestExitTokenOffset = 1792;
parameter int TestExitTokenSize = 16;
- parameter int Secret0DigestOffset = 1776;
+ parameter int Secret0DigestOffset = 1808;
parameter int Secret0DigestSize = 8;
- parameter int Secret1Offset = 1784;
+ parameter int Secret1Offset = 1816;
parameter int Secret1Size = 88;
- parameter int FlashAddrKeySeedOffset = 1784;
+ parameter int FlashAddrKeySeedOffset = 1816;
parameter int FlashAddrKeySeedSize = 32;
- parameter int FlashDataKeySeedOffset = 1816;
+ parameter int FlashDataKeySeedOffset = 1848;
parameter int FlashDataKeySeedSize = 32;
- parameter int SramDataKeySeedOffset = 1848;
+ parameter int SramDataKeySeedOffset = 1880;
parameter int SramDataKeySeedSize = 16;
- parameter int Secret1DigestOffset = 1864;
+ parameter int Secret1DigestOffset = 1896;
parameter int Secret1DigestSize = 8;
- parameter int Secret2Offset = 1872;
- parameter int Secret2Size = 120;
- parameter int RmaTokenOffset = 1872;
+ parameter int Secret2Offset = 1904;
+ parameter int Secret2Size = 88;
+ parameter int RmaTokenOffset = 1904;
parameter int RmaTokenSize = 16;
- parameter int CreatorRootKeyShare0Offset = 1888;
+ parameter int CreatorRootKeyShare0Offset = 1920;
parameter int CreatorRootKeyShare0Size = 32;
- parameter int CreatorRootKeyShare1Offset = 1920;
+ parameter int CreatorRootKeyShare1Offset = 1952;
parameter int CreatorRootKeyShare1Size = 32;
parameter int Secret2DigestOffset = 1984;
parameter int Secret2DigestSize = 8;
