commit e39d5f73e0da7bc28f7a301dd52341ee69b839d3
author Miguel Osorio <miguelosorio@google.com> Thu Jul 29 19:49:16 2021 -0700
committer moidx <migue48@gmail.com> Fri Jul 30 13:17:15 2021 -0700
tree bf496697e198f818d2060827516d21e927cc07fe
parent 4f8a8e78ecca13aa55c7899024832f2f7ece18cb

[sw/test] Add entropy dependency to dif_otbn_test

Signed-off-by: Miguel Osorio <miguelosorio@google.com>

sw/device/tests/dif/dif_otbn_smoketest.c

diff --git a/sw/device/tests/dif/dif_otbn_smoketest.c b/sw/device/tests/dif/dif_otbn_smoketest.c
index 2d082f4..f02cc52 100644
--- a/sw/device/tests/dif/dif_otbn_smoketest.c
+++ b/sw/device/tests/dif/dif_otbn_smoketest.c
@@ -7,27 +7,11 @@
 #include "sw/device/lib/runtime/log.h"
 #include "sw/device/lib/runtime/otbn.h"
 #include "sw/device/lib/testing/check.h"
+#include "sw/device/lib/testing/entropy_testutils.h"
 #include "sw/device/lib/testing/test_main.h"
 
 #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
 
-// Temporary solution to configure/enable the EDN and CSRNG to allow OTBN to run
-// before a DIF is available, https://github.com/lowRISC/opentitan/issues/6082
-static const uint32_t kEntropySrcConfRegOffset = 0x18;
-static const uint32_t kCsrngCtrlRegOffset = 0x14;
-static const uint32_t kEdnCtrlRegOffset = 0x14;
-
-static void setup_edn(void) {
-  mmio_region_write32(mmio_region_from_addr(TOP_EARLGREY_ENTROPY_SRC_BASE_ADDR),
-                      kEntropySrcConfRegOffset, 0x2);
-  mmio_region_write32(mmio_region_from_addr(TOP_EARLGREY_CSRNG_BASE_ADDR),
-                      kCsrngCtrlRegOffset, 0xaa);
-  mmio_region_write32(mmio_region_from_addr(TOP_EARLGREY_EDN0_BASE_ADDR),
-                      kEdnCtrlRegOffset, 0xaa);
-  mmio_region_write32(mmio_region_from_addr(TOP_EARLGREY_EDN1_BASE_ADDR),
-                      kEdnCtrlRegOffset, 0xaa);
-}
-
 OTBN_DECLARE_APP_SYMBOLS(barrett384);
 OTBN_DECLARE_PTR_SYMBOL(barrett384, wrap_barrett384);
 
@@ -161,7 +145,7 @@
 }
 
 bool test_main() {
-  setup_edn();
+  entropy_testutils_boot_mode_init();
 
   dif_otbn_config_t otbn_config = {
       .base_addr = mmio_region_from_addr(TOP_EARLGREY_OTBN_BASE_ADDR),

sw/device/tests/dif/meson.build

diff --git a/sw/device/tests/dif/meson.build b/sw/device/tests/dif/meson.build
index 18645cb..7ff797b 100644
--- a/sw/device/tests/dif/meson.build
+++ b/sw/device/tests/dif/meson.build
@@ -158,6 +158,7 @@
     'dif_otbn_smoketest_lib',
     sources: ['dif_otbn_smoketest.c'],
     dependencies: [
+      sw_lib_testing_entropy_testutils_lib,
       sw_lib_dif_otbn,
       sw_lib_runtime_hart,
       sw_lib_runtime_otbn,