commit dfd05b5a3ff1bfe2a01f27587495ebe43b381916
author Silvestrs Timofejevs <silvestrst@lowrisc.org> Fri Dec 18 09:29:29 2020 +0000
committer tjaychen <timothytim@google.com> Mon Dec 21 19:26:44 2020 -0800
tree c7791f574272edc40e060a8a81b0307f7738ffaa
parent c0d32d98d841185959a28a70475220a0ad738b0c

[sw, dif_rstmgr] Make sure unittest up-to-date with HW

Signed-off-by: Silvestrs Timofejevs <silvestrst@lowrisc.org>

sw/device/lib/dif/dif_rstmgr.h

diff --git a/sw/device/lib/dif/dif_rstmgr.h b/sw/device/lib/dif/dif_rstmgr.h
index 625a50c..c76af59 100644
--- a/sw/device/lib/dif/dif_rstmgr.h
+++ b/sw/device/lib/dif/dif_rstmgr.h
@@ -87,10 +87,6 @@
    * escalation, watchdog or anything else.
    */
   kDifRstmgrResetInfoHwReq = (0x3 << 3),
-  /**
-   * \internal used to catch missing `_Static_assert` for public variants.
-   */
-  kDifRstmgrResetInfoLast = (0x1 << 4),
 } dif_rstmgr_reset_info_t;
 
 /**

sw/device/tests/dif/dif_rstmgr_unittest.cc

diff --git a/sw/device/tests/dif/dif_rstmgr_unittest.cc b/sw/device/tests/dif/dif_rstmgr_unittest.cc
index 21fa095..ce5ac49 100644
--- a/sw/device/tests/dif/dif_rstmgr_unittest.cc
+++ b/sw/device/tests/dif/dif_rstmgr_unittest.cc
@@ -125,18 +125,24 @@
 
 class ResetCausesGetTest : public RstmgrTest {
  protected:
+  // Make sure that the test is up-to-date with the implementation.
   ResetCausesGetTest() {
-    // Make sure that the test is up-to-date with the implementation.
-    uint32_t bitfield =
-        bitfield_bit32_write(0, reset_info_reasons_.back(), true);
-    EXPECT_EQ(bitfield, kDifRstmgrResetInfoLast);
+    // Make sure that the last reset reason in the test matches the last reset
+    // reason in the DIF at the time of writing this test.
+    bitfield_field32_t last = reset_info_reasons_.back();
+    uint32_t bitfield = bitfield_field32_write(0, last, last.mask);
+    EXPECT_EQ(bitfield, kDifRstmgrResetInfoHwReq);
+
+    // Number of reset reasons between test and the peripheral match at the
+    // time of writing this test.
+    EXPECT_EQ(reset_info_reasons_.size(), 4);
   }
 
-  const std::vector<uint32_t> reset_info_reasons_{
-      RSTMGR_RESET_INFO_POR_BIT,
-      RSTMGR_RESET_INFO_LOW_POWER_EXIT_BIT,
-      RSTMGR_RESET_INFO_NDM_RESET_BIT,
-      RSTMGR_RESET_INFO_HW_REQ_OFFSET + RSTMGR_PARAM_NUMHWRESETS - 1,
+  const std::vector<bitfield_field32_t> reset_info_reasons_{
+      bitfield_bit32_to_field32(RSTMGR_RESET_INFO_POR_BIT),
+      bitfield_bit32_to_field32(RSTMGR_RESET_INFO_LOW_POWER_EXIT_BIT),
+      bitfield_bit32_to_field32(RSTMGR_RESET_INFO_NDM_RESET_BIT),
+      RSTMGR_RESET_INFO_HW_REQ_FIELD,
   };
 };
 
@@ -150,7 +156,7 @@
 TEST_F(ResetCausesGetTest, Success) {
   // Single reason expectations.
   for (auto reason : reset_info_reasons_) {
-    uint32_t bitfield = bitfield_bit32_write(0, reason, true);
+    uint32_t bitfield = bitfield_field32_write(0, reason, reason.mask);
     EXPECT_READ32(RSTMGR_RESET_INFO_REG_OFFSET, bitfield);
 
     dif_rstmgr_reset_info_bitfield_t info;
@@ -159,18 +165,19 @@
   }
 
   // The first and the last reset causes.
-  EXPECT_READ32(RSTMGR_RESET_INFO_REG_OFFSET,
-                {
-                    {reset_info_reasons_.front(), true},
-                    {reset_info_reasons_.back(), true},
-                });
+  bitfield_field32_t first = reset_info_reasons_.front();
+  bitfield_field32_t last = reset_info_reasons_.back();
+  EXPECT_READ32(RSTMGR_RESET_INFO_REG_OFFSET, {
+                                                  {first.index, first.mask},
+                                                  {last.index, last.mask},
+                                              });
 
   dif_rstmgr_reset_info_bitfield_t info;
   EXPECT_EQ(dif_rstmgr_reset_info_get(&rstmgr_, &info), kDifRstmgrOk);
 
-  // Make sure that `kDifRstmgrResetInfoPor` and `kDifRstmgrResetInfoLast`
+  // Make sure that `kDifRstmgrResetInfoPor` and `kDifRstmgrResetInfoHwReq`
   // reset causes are set.
-  EXPECT_EQ(info & (kDifRstmgrResetInfoPor | kDifRstmgrResetInfoLast), info);
+  EXPECT_EQ(info & (kDifRstmgrResetInfoPor | kDifRstmgrResetInfoHwReq), info);
 }
 
 class ResetCausesClearTest : public RstmgrTest {};