[sram_ctrl] Harden initialization counter
Signed-off-by: Michael Schaffner <msf@google.com>
diff --git a/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson b/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
index 25c084d..46b3a95 100644
--- a/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
+++ b/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
@@ -12801,7 +12801,7 @@
module_name: sensor_ctrl_aon
}
{
- name: sram_ctrl_ret_aon_fatal_bus_integ_error
+ name: sram_ctrl_ret_aon_fatal_error
width: 1
type: alert
async: "1"
@@ -12927,7 +12927,7 @@
module_name: edn1
}
{
- name: sram_ctrl_main_fatal_bus_integ_error
+ name: sram_ctrl_main_fatal_error
width: 1
type: alert
async: "1"
diff --git a/hw/top_earlgrey/dv/env/autogen/chip_env_pkg__params.sv b/hw/top_earlgrey/dv/env/autogen/chip_env_pkg__params.sv
index d2e7bb9..e2aeb1b 100644
--- a/hw/top_earlgrey/dv/env/autogen/chip_env_pkg__params.sv
+++ b/hw/top_earlgrey/dv/env/autogen/chip_env_pkg__params.sv
@@ -46,7 +46,7 @@
"sensor_ctrl_aon_recov_ot3",
"sensor_ctrl_aon_recov_ot4",
"sensor_ctrl_aon_recov_ot5",
- "sram_ctrl_ret_aon_fatal_bus_integ_error",
+ "sram_ctrl_ret_aon_fatal_error",
"flash_ctrl_recov_err",
"flash_ctrl_recov_mp_err",
"flash_ctrl_recov_ecc_err",
@@ -64,7 +64,7 @@
"entropy_src_fatal_alert",
"edn0_fatal_alert",
"edn1_fatal_alert",
- "sram_ctrl_main_fatal_bus_integ_error",
+ "sram_ctrl_main_fatal_error",
"otbn_fatal",
"otbn_recov",
"rom_ctrl_fatal",
diff --git a/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv b/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
index 2075a37..0a21d99 100644
--- a/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
+++ b/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
@@ -1890,7 +1890,7 @@
.MemSizeRam(4096),
.InstrExec(SramCtrlRetAonInstrExec)
) u_sram_ctrl_ret_aon (
- // [41]: fatal_bus_integ_error
+ // [41]: fatal_error
.alert_tx_o ( alert_tx[41:41] ),
.alert_rx_i ( alert_rx[41:41] ),
@@ -2286,7 +2286,7 @@
.MemSizeRam(131072),
.InstrExec(SramCtrlMainInstrExec)
) u_sram_ctrl_main (
- // [59]: fatal_bus_integ_error
+ // [59]: fatal_error
.alert_tx_o ( alert_tx[59:59] ),
.alert_rx_i ( alert_rx[59:59] ),
diff --git a/hw/top_earlgrey/sw/autogen/top_earlgrey.c b/hw/top_earlgrey/sw/autogen/top_earlgrey.c
index f5fb4e0..baa4da7 100644
--- a/hw/top_earlgrey/sw/autogen/top_earlgrey.c
+++ b/hw/top_earlgrey/sw/autogen/top_earlgrey.c
@@ -244,7 +244,7 @@
[kTopEarlgreyAlertIdSensorCtrlAonRecovOt3] = kTopEarlgreyAlertPeripheralSensorCtrlAon,
[kTopEarlgreyAlertIdSensorCtrlAonRecovOt4] = kTopEarlgreyAlertPeripheralSensorCtrlAon,
[kTopEarlgreyAlertIdSensorCtrlAonRecovOt5] = kTopEarlgreyAlertPeripheralSensorCtrlAon,
- [kTopEarlgreyAlertIdSramCtrlRetAonFatalBusIntegError] = kTopEarlgreyAlertPeripheralSramCtrlRetAon,
+ [kTopEarlgreyAlertIdSramCtrlRetAonFatalError] = kTopEarlgreyAlertPeripheralSramCtrlRetAon,
[kTopEarlgreyAlertIdFlashCtrlRecovErr] = kTopEarlgreyAlertPeripheralFlashCtrl,
[kTopEarlgreyAlertIdFlashCtrlRecovMpErr] = kTopEarlgreyAlertPeripheralFlashCtrl,
[kTopEarlgreyAlertIdFlashCtrlRecovEccErr] = kTopEarlgreyAlertPeripheralFlashCtrl,
@@ -262,7 +262,7 @@
[kTopEarlgreyAlertIdEntropySrcFatalAlert] = kTopEarlgreyAlertPeripheralEntropySrc,
[kTopEarlgreyAlertIdEdn0FatalAlert] = kTopEarlgreyAlertPeripheralEdn0,
[kTopEarlgreyAlertIdEdn1FatalAlert] = kTopEarlgreyAlertPeripheralEdn1,
- [kTopEarlgreyAlertIdSramCtrlMainFatalBusIntegError] = kTopEarlgreyAlertPeripheralSramCtrlMain,
+ [kTopEarlgreyAlertIdSramCtrlMainFatalError] = kTopEarlgreyAlertPeripheralSramCtrlMain,
[kTopEarlgreyAlertIdOtbnFatal] = kTopEarlgreyAlertPeripheralOtbn,
[kTopEarlgreyAlertIdOtbnRecov] = kTopEarlgreyAlertPeripheralOtbn,
[kTopEarlgreyAlertIdRomCtrlFatal] = kTopEarlgreyAlertPeripheralRomCtrl,
diff --git a/hw/top_earlgrey/sw/autogen/top_earlgrey.h b/hw/top_earlgrey/sw/autogen/top_earlgrey.h
index 554e57f..62926be 100644
--- a/hw/top_earlgrey/sw/autogen/top_earlgrey.h
+++ b/hw/top_earlgrey/sw/autogen/top_earlgrey.h
@@ -1298,7 +1298,7 @@
kTopEarlgreyAlertIdSensorCtrlAonRecovOt3 = 38, /**< sensor_ctrl_aon_recov_ot3 */
kTopEarlgreyAlertIdSensorCtrlAonRecovOt4 = 39, /**< sensor_ctrl_aon_recov_ot4 */
kTopEarlgreyAlertIdSensorCtrlAonRecovOt5 = 40, /**< sensor_ctrl_aon_recov_ot5 */
- kTopEarlgreyAlertIdSramCtrlRetAonFatalBusIntegError = 41, /**< sram_ctrl_ret_aon_fatal_bus_integ_error */
+ kTopEarlgreyAlertIdSramCtrlRetAonFatalError = 41, /**< sram_ctrl_ret_aon_fatal_error */
kTopEarlgreyAlertIdFlashCtrlRecovErr = 42, /**< flash_ctrl_recov_err */
kTopEarlgreyAlertIdFlashCtrlRecovMpErr = 43, /**< flash_ctrl_recov_mp_err */
kTopEarlgreyAlertIdFlashCtrlRecovEccErr = 44, /**< flash_ctrl_recov_ecc_err */
@@ -1316,7 +1316,7 @@
kTopEarlgreyAlertIdEntropySrcFatalAlert = 56, /**< entropy_src_fatal_alert */
kTopEarlgreyAlertIdEdn0FatalAlert = 57, /**< edn0_fatal_alert */
kTopEarlgreyAlertIdEdn1FatalAlert = 58, /**< edn1_fatal_alert */
- kTopEarlgreyAlertIdSramCtrlMainFatalBusIntegError = 59, /**< sram_ctrl_main_fatal_bus_integ_error */
+ kTopEarlgreyAlertIdSramCtrlMainFatalError = 59, /**< sram_ctrl_main_fatal_error */
kTopEarlgreyAlertIdOtbnFatal = 60, /**< otbn_fatal */
kTopEarlgreyAlertIdOtbnRecov = 61, /**< otbn_recov */
kTopEarlgreyAlertIdRomCtrlFatal = 62, /**< rom_ctrl_fatal */
