Skip to content

Commit 7897936

Browse files
committed
[ot] Update OpenTitan EDN registers to match Earlgrey 1.0
1 parent cc81106 commit 7897936

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

hw/opentitan/ot_edn.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,21 @@ REG32(BOOT_INS_CMD, 0x18u)
7272
REG32(BOOT_GEN_CMD, 0x1cu)
7373
REG32(SW_CMD_REQ, 0x20u)
7474
REG32(SW_CMD_STS, 0x24u)
75-
FIELD(SW_CMD_STS, CMD_RDY, 0u, 1u)
76-
FIELD(SW_CMD_STS, CMD_STS, 1u, 1u)
77-
REG32(RESEED_CMD, 0x28u)
78-
REG32(GENERATE_CMD, 0x2cu)
79-
REG32(MAX_NUM_REQS_BETWEEN_RESEEDS, 0x30u)
80-
REG32(RECOV_ALERT_STS, 0x34u)
75+
FIELD(SW_CMD_STS, CMD_REG_RDY, 0u, 1u)
76+
FIELD(SW_CMD_STS, CMD_RDY, 1u, 1u)
77+
FIELD(SW_CMD_STS, CMD_ACK, 2u, 1u)
78+
FIELD(SW_CMD_STS, CMD_STS, 3u, 3u)
79+
REG32(HW_CMD_STS, 0x28u)
80+
REG32(RESEED_CMD, 0x2cu)
81+
REG32(GENERATE_CMD, 0x30u)
82+
REG32(MAX_NUM_REQS_BETWEEN_RESEEDS, 0x34u)
83+
REG32(RECOV_ALERT_STS, 0x38u)
8184
FIELD(RECOV_ALERT_STS, EDN_ENABLE_FIELD_ALERT, 0u, 1u)
8285
FIELD(RECOV_ALERT_STS, BOOT_REQ_MODE_FIELD_ALERT, 1u, 1u)
8386
FIELD(RECOV_ALERT_STS, AUTO_REQ_MODE_FIELD_ALERT, 2u, 1u)
8487
FIELD(RECOV_ALERT_STS, CMD_FIFO_RST_FIELD_ALERT, 3u, 1u)
8588
FIELD(RECOV_ALERT_STS, EDN_BUS_CMP_ALERT, 12u, 1u)
86-
REG32(ERR_CODE, 0x38u)
89+
REG32(ERR_CODE, 0x3cu)
8790
FIELD(ERR_CODE, SFIFO_RESCMD_ERR, 0u, 1u)
8891
FIELD(ERR_CODE, SFIFO_GENCMD_ERR, 1u, 1u)
8992
FIELD(ERR_CODE, SFIFO_OUTPUT_ERR, 2u, 1u)
@@ -93,9 +96,9 @@ REG32(ERR_CODE, 0x38u)
9396
FIELD(ERR_CODE, FIFO_WRITE_ERR, 28u, 1u)
9497
FIELD(ERR_CODE, FIFO_READ_ERR, 29u, 1u)
9598
FIELD(ERR_CODE, FIFO_STATE_ERR, 30u, 1u)
96-
REG32(ERR_CODE_TEST, 0x3cu)
99+
REG32(ERR_CODE_TEST, 0x40u)
97100
FIELD(ERR_CODE_TEST, VAL, 0u, 5u)
98-
REG32(MAIN_SM_STATE, 0x40u)
101+
REG32(MAIN_SM_STATE, 0x44u)
99102
FIELD(MAIN_SM_STATE, VAL, 0u, 9u)
100103
/* clang-format on */
101104

0 commit comments

Comments
 (0)