commit 1f43bf5d47debb699cbbfc7ffee3187efdac3e11
author Mark Branstad <mark.branstad@wdc.com> Tue Oct 05 08:32:54 2021 -0700
committer tjaychen <timothytim@google.com> Wed Oct 13 10:28:01 2021 -0700
tree f8df1b305a0650f984551c6ef9b3951eb8d77a80
parent b209267af8a08ffc34879ecd3fb88e38f165cd63

[entropy_src/rtl] Removed LFSR mode, added recov_alert bits

The configuration enable fields now do not support LFSR mode.
Also, all enable fields are checked for valid values (5 or A).

Signed-off-by: Mark Branstad <mark.branstad@wdc.com>

sw/device/lib/dif/dif_entropy_src_unittest.cc

diff --git a/sw/device/lib/dif/dif_entropy_src_unittest.cc b/sw/device/lib/dif/dif_entropy_src_unittest.cc
index d474973..ac56336 100644
--- a/sw/device/lib/dif/dif_entropy_src_unittest.cc
+++ b/sw/device/lib/dif/dif_entropy_src_unittest.cc
@@ -33,15 +33,13 @@
 class ConfigTest : public DifEntropySrcTest {
  protected:
   dif_entropy_src_config_t config_ = {
-      .mode = kDifEntropySrcModeLfsr,
+      .mode = kDifEntropySrcModePtrng,
       .tests = {0},
       .reset_health_test_registers = false,
       .single_bit_mode = kDifEntropySrcSingleBitModeDisabled,
       .route_to_firmware = false,
-      .fips_mode = false,
+      .fips_mode = false,1
       .test_config = {0},
-      .sample_rate = 64,
-      .lfsr_seed = 4,
   };
 };
 
@@ -49,10 +47,6 @@
   EXPECT_EQ(dif_entropy_src_configure(nullptr, {}), kDifBadArg);
 }
 
-TEST_F(ConfigTest, LfsrSeedBadArg) {
-  config_.lfsr_seed = 16;
-  EXPECT_EQ(dif_entropy_src_configure(&entropy_src_, config_), kDifBadArg);
-}
 
 struct ConfigParams {
   dif_entropy_src_mode_t mode;
@@ -76,8 +70,6 @@
   config_.route_to_firmware = test_param.route_to_firmware;
   config_.reset_health_test_registers = test_param.reset_health_test_registers;
 
-  EXPECT_WRITE32(ENTROPY_SRC_SEED_REG_OFFSET, test_param.expected_seed);
-  EXPECT_WRITE32(ENTROPY_SRC_RATE_REG_OFFSET, 64);
   EXPECT_WRITE32(ENTROPY_SRC_ENTROPY_CONTROL_REG_OFFSET,
                  {
                      {ENTROPY_SRC_ENTROPY_CONTROL_ES_ROUTE_OFFSET,
@@ -91,8 +83,6 @@
 
   uint32_t rng_bit_enable = test_param.expected_rng_bit_en ? 0xa : 0x5;
   // Current dif does not set these fields
-  uint32_t lfsr_enable =
-      test_param.expected_mode == kDifEntropySrcModeLfsr ? 0xa : 0x5;
 
   // uint32_t route_to_fw = test_param.route_to_firmware ? 0xa : 0x5;
   uint32_t enable =
@@ -106,7 +96,6 @@
           {ENTROPY_SRC_CONF_HEALTH_TEST_CLR_OFFSET, reset_ht},
           {ENTROPY_SRC_CONF_BOOT_BYPASS_DISABLE_OFFSET, 0x5},
           // Current dif doesn ot set these fields
-          {ENTROPY_SRC_CONF_LFSR_ENABLE_OFFSET, lfsr_enable},
           //{ENTROPY_SRC_CONF_ENTROPY_DATA_REG_ENABLE_OFFSET, route_to_fw},
           {ENTROPY_SRC_CONF_ENABLE_OFFSET, enable},
       });
@@ -124,25 +113,25 @@
         ConfigParams{kDifEntropySrcModePtrng,
                      kDifEntropySrcSingleBitModeDisabled, false, false, 1,
                      false, 0, 0},
-        ConfigParams{kDifEntropySrcModeLfsr,
+        ConfigParams{kDifEntropySrcModePtrng,
                      kDifEntropySrcSingleBitModeDisabled, false, false, 2,
                      false, 0, 4},
         // Test route_to_firmware
-        ConfigParams{kDifEntropySrcModeLfsr,
+        ConfigParams{kDifEntropySrcModePtrng,
                      kDifEntropySrcSingleBitModeDisabled, true, false, 2, false,
                      0, 4},
         // Test reset_health_test_registers
-        ConfigParams{kDifEntropySrcModeLfsr,
+        ConfigParams{kDifEntropySrcModePtrng,
                      kDifEntropySrcSingleBitModeDisabled, true, true, 2, false,
                      0, 4},
         // Test single_bit_mode
-        ConfigParams{kDifEntropySrcModeLfsr, kDifEntropySrcSingleBitMode0, true,
+        ConfigParams{kDifEntropySrcModePtrng, kDifEntropySrcSingleBitMode0, true,
                      true, 2, true, 0, 4},
-        ConfigParams{kDifEntropySrcModeLfsr, kDifEntropySrcSingleBitMode1, true,
+        ConfigParams{kDifEntropySrcModePtrng, kDifEntropySrcSingleBitMode1, true,
                      true, 2, true, 1, 4},
-        ConfigParams{kDifEntropySrcModeLfsr, kDifEntropySrcSingleBitMode2, true,
+        ConfigParams{kDifEntropySrcModePtrng, kDifEntropySrcSingleBitMode2, true,
                      true, 2, true, 2, 4},
-        ConfigParams{kDifEntropySrcModeLfsr, kDifEntropySrcSingleBitMode3, true,
+        ConfigParams{kDifEntropySrcModePtrng, kDifEntropySrcSingleBitMode3, true,
                      true, 2, true, 3, 4}));
 
 class ReadTest : public DifEntropySrcTest {};