commit 6968f4ffd9d5a286754d3f99e87cda8cf158b206
author Alphan Ulusoy <alphan@google.com> Mon Jan 17 10:03:10 2022 -0500
committer Alphan Ulusoy <alphan@google.com> Tue Jan 18 13:49:59 2022 -0500
tree 943629d81259032628203481e0b799b5a340203c
parent ce2da4b2b2c5964d37cc67fa75b4adeac67b088e

[sw/silicon_creator] Use SW_FATAL_ERR in shutdown_software_escalate()

Signed-off-by: Alphan Ulusoy <alphan@google.com>

sw/device/silicon_creator/lib/shutdown.c

diff --git a/sw/device/silicon_creator/lib/shutdown.c b/sw/device/silicon_creator/lib/shutdown.c
index b932df8..5c9274e 100644
--- a/sw/device/silicon_creator/lib/shutdown.c
+++ b/sw/device/silicon_creator/lib/shutdown.c
@@ -22,6 +22,7 @@
 #include "keymgr_regs.h"
 #include "lc_ctrl_regs.h"
 #include "otp_ctrl_regs.h"
+#include "rv_core_ibex_regs.h"
 #include "sram_ctrl_regs.h"
 
 static_assert(ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT <=
@@ -273,10 +274,10 @@
 }
 
 SHUTDOWN_FUNC(NO_MODIFIERS, shutdown_software_escalate(void)) {
-  // TODO(lowRISC/opentitan#7148): Use a software alert when available.
-  // For now, signal a fatal_intg_error from SRAM.
-  enum { kBase = TOP_EARLGREY_SRAM_CTRL_MAIN_REGS_BASE_ADDR };
-  abs_mmio_write32(kBase + SRAM_CTRL_ALERT_TEST_REG_OFFSET, 1);
+  enum { kBase = TOP_EARLGREY_RV_CORE_IBEX_CFG_BASE_ADDR };
+  //  Setting rv_core_ibex.SW_FATAL_ERR (rw0c) to any value other than
+  // `kMultiBitBool4False` will continuously cause alert events.
+  abs_mmio_write32(kBase + RV_CORE_IBEX_SW_FATAL_ERR_REG_OFFSET, 0);
 }
 
 SHUTDOWN_FUNC(NO_MODIFIERS, shutdown_keymgr_kill(void)) {