commit 159b6bb58a5d093997531319124b95a46e052479
author Alphan Ulusoy <alphan@google.com> Wed Feb 09 10:51:07 2022 -0500
committer Alphan Ulusoy <alphan@google.com> Fri Feb 11 16:15:33 2022 -0500
tree 63029d4f395ddc76453c3df112ef35acee84fbe1
parent 8373e7da1c9e9c1c8ba33d957f5713e28cd94b93

[sw/silicon_creator] Request a system reset in shutdown_hang()

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

sw/device/silicon_creator/lib/BUILD

diff --git a/sw/device/silicon_creator/lib/BUILD b/sw/device/silicon_creator/lib/BUILD
index 89c3416..5e7c061 100644
--- a/sw/device/silicon_creator/lib/BUILD
+++ b/sw/device/silicon_creator/lib/BUILD
@@ -297,6 +297,7 @@
         "//hw/ip/rv_core_ibex/data:rv_core_ibex_regs",
         "//hw/ip/sram_ctrl/data:sram_ctrl_regs",
         "//hw/top_earlgrey/ip/flash_ctrl/data/autogen:flash_ctrl_regs",
+        "//hw/top_earlgrey/ip/rstmgr/data/autogen:rstmgr_regs",
         "//hw/top_earlgrey/sw/autogen:top_earlgrey",
         "//sw/device/lib/base",
         "//sw/device/lib/base:abs_mmio",
@@ -326,6 +327,7 @@
         "//hw/ip/sram_ctrl/data:sram_ctrl_regs",
         "//hw/top_earlgrey:alert_handler_regs",
         "//hw/top_earlgrey/ip/flash_ctrl/data/autogen:flash_ctrl_regs",
+        "//hw/top_earlgrey/ip/rstmgr/data/autogen:rstmgr_regs",
         "//hw/top_earlgrey/sw/autogen:top_earlgrey",
         "//sw/device/lib/base",
         "//sw/device/silicon_creator/lib/base:mock_abs_mmio",

sw/device/silicon_creator/lib/meson.build

diff --git a/sw/device/silicon_creator/lib/meson.build b/sw/device/silicon_creator/lib/meson.build
index 711e984..fb8642d 100644
--- a/sw/device/silicon_creator/lib/meson.build
+++ b/sw/device/silicon_creator/lib/meson.build
@@ -119,6 +119,7 @@
       hw_ip_sram_ctrl_reg_h,
       hw_ip_flash_ctrl_reg_h,
       hw_ip_ibex_reg_h,
+      hw_ip_rstmgr_reg_h,
       'shutdown.c',
     ],
     dependencies: [
@@ -175,6 +176,7 @@
       hw_ip_sram_ctrl_reg_h,
       hw_ip_flash_ctrl_reg_h,
       hw_ip_ibex_reg_h,
+      hw_ip_rstmgr_reg_h,
       'shutdown.c',
       'shutdown_unittest.cc',
     ],

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 253a95a..e73ff3e 100644
--- a/sw/device/silicon_creator/lib/shutdown.c
+++ b/sw/device/silicon_creator/lib/shutdown.c
@@ -11,6 +11,7 @@
 #include "sw/device/lib/base/hardened.h"
 #include "sw/device/lib/base/macros.h"
 #include "sw/device/lib/base/memory.h"
+#include "sw/device/lib/base/multibits.h"
 #include "sw/device/lib/base/stdasm.h"
 #include "sw/device/silicon_creator/lib/drivers/alert.h"
 #include "sw/device/silicon_creator/lib/drivers/lifecycle.h"
@@ -23,6 +24,7 @@
 #include "keymgr_regs.h"
 #include "lc_ctrl_regs.h"
 #include "otp_ctrl_regs.h"
+#include "rstmgr_regs.h"
 #include "rv_core_ibex_regs.h"
 #include "sram_ctrl_regs.h"
 
@@ -306,9 +308,16 @@
 }
 
 SHUTDOWN_FUNC(noreturn, shutdown_hang(void)) {
-  enum { kSramCtrlBase = TOP_EARLGREY_SRAM_CTRL_MAIN_REGS_BASE_ADDR };
+  enum {
+    kSramCtrlBase = TOP_EARLGREY_SRAM_CTRL_MAIN_REGS_BASE_ADDR,
+    kRstmgrBase = TOP_EARLGREY_RSTMGR_AON_BASE_ADDR,
+  };
 
   // Disable SRAM execution and lock the register.
+  // Note: In addition to this register, which is disabled by default at reset,
+  // SRAM execution is gated by the lifecycle state
+  // (SRAM_CTRL.INSTR.BUS.LC_GATED) and EN_SRAM_IFETCH item in the HW_CFG OTP
+  // partition.
   abs_mmio_write32(kSramCtrlBase + SRAM_CTRL_EXEC_EN_OFFSET, 0);
   abs_mmio_write32(kSramCtrlBase + SRAM_CTRL_EXEC_REGWEN_REG_OFFSET, 0);
 
@@ -316,9 +325,11 @@
 #ifdef OT_PLATFORM_RV32
   while (true) {
     asm volatile(
-        // Request a new scrambling key, then lock the SRAM control register.
-        "sw %[kRenewKey], %[kCtrlOffset](%[kMainRamCtrlBase]);"
-        "sw zero, %[kRegWriteEn](%[kMainRamCtrlBase]);"
+        "1:"
+        // Request a new scrambling key.
+        "sw %[kSramRenewKey], %[kSramCtrlCtrlReg](%[kSramCtrlBase]);"
+        // Request a system reset.
+        "sw %[kMultiBitBool4True], %[kRstmgrResetReqReg](%[kRstmgrBase]);"
 
         // TODO(lowRISC/opentitan#7148): restrict the ePMP such that only
         // ROM may execute.  mundaym's suggestion: set entry 2 as a NAPOT
@@ -327,16 +338,17 @@
         // any further modifications.
 
         // Generate a halt-maze.
-        "1:"
         "wfi; wfi; wfi; wfi; j 1b;"
         "wfi; wfi; j 1b;"
         "wfi; j 1b;"
         "wfi;"
         :
-        : [kRenewKey] "r"(1 << SRAM_CTRL_CTRL_RENEW_SCR_KEY_BIT),
-          [kCtrlOffset] "I"(SRAM_CTRL_CTRL_REG_OFFSET),
-          [kMainRamCtrlBase] "r"(kSramCtrlBase),
-          [kRegWriteEn] "I"(SRAM_CTRL_CTRL_REGWEN_REG_OFFSET));
+        : [kSramRenewKey] "r"(1 << SRAM_CTRL_CTRL_RENEW_SCR_KEY_BIT),
+          [kSramCtrlCtrlReg] "I"(SRAM_CTRL_CTRL_REG_OFFSET),
+          [kSramCtrlBase] "r"(kSramCtrlBase),
+          [kMultiBitBool4True] "r"(kMultiBitBool4True),
+          [kRstmgrBase] "r"(kRstmgrBase),
+          [kRstmgrResetReqReg] "I"(RSTMGR_RESET_REQ_REG_OFFSET));
   }
 #endif
 }