Skip to content

Commit 2cc3236

Browse files
committed
[tests] Port csrng_edn_concurrency_test to multitop
Signed-off-by: Robert Schilling <[email protected]>
1 parent 29a71e2 commit 2cc3236

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

sw/device/tests/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1176,6 +1176,7 @@ opentitan_test(
11761176
"//hw/top_earlgrey:silicon_creator": None,
11771177
"//hw/top_earlgrey:silicon_owner_sival_rom_ext": "silicon_owner",
11781178
},
1179+
DARJEELING_TEST_ENVS,
11791180
),
11801181
silicon_owner = silicon_params(
11811182
tags = ["broken"],
@@ -1188,7 +1189,7 @@ opentitan_test(
11881189
),
11891190
deps = [
11901191
":otbn_randomness_impl",
1191-
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
1192+
"//hw/top:dt",
11921193
"//sw/device/lib/base:memory",
11931194
"//sw/device/lib/base:mmio",
11941195
"//sw/device/lib/dif:aes",

sw/device/tests/csrng_edn_concurrency_test.c

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,33 @@
22
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
33
// SPDX-License-Identifier: Apache-2.0
44

5+
#include "hw/top/dt/dt_aes.h"
6+
#include "hw/top/dt/dt_csrng.h"
7+
#include "hw/top/dt/dt_edn.h"
8+
#include "hw/top/dt/dt_entropy_src.h"
9+
#include "hw/top/dt/dt_otbn.h"
10+
#include "hw/top/dt/dt_rv_core_ibex.h"
11+
#include "hw/top/dt/dt_rv_plic.h"
512
#include "sw/device/lib/base/macros.h"
613
#include "sw/device/lib/base/mmio.h"
714
#include "sw/device/lib/dif/dif_aes.h"
815
#include "sw/device/lib/dif/dif_csrng.h"
916
#include "sw/device/lib/dif/dif_csrng_shared.h"
1017
#include "sw/device/lib/dif/dif_edn.h"
1118
#include "sw/device/lib/dif/dif_entropy_src.h"
19+
#include "sw/device/lib/dif/dif_rv_plic.h"
1220
#include "sw/device/lib/runtime/irq.h"
1321
#include "sw/device/lib/runtime/log.h"
1422
#include "sw/device/lib/testing/csrng_testutils.h"
1523
#include "sw/device/lib/testing/edn_testutils.h"
1624
#include "sw/device/lib/testing/entropy_testutils.h"
1725
#include "sw/device/lib/testing/otbn_testutils.h"
1826
#include "sw/device/lib/testing/rand_testutils.h"
19-
#include "sw/device/lib/testing/rv_plic_testutils.h"
2027
#include "sw/device/lib/testing/test_framework/check.h"
2128
#include "sw/device/lib/testing/test_framework/ottf_macros.h"
2229
#include "sw/device/lib/testing/test_framework/ottf_main.h"
2330
#include "sw/device/tests/otbn_randomness_impl.h"
2431

25-
#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
26-
#include "sw/device/lib/testing/autogen/isr_testutils.h"
27-
2832
static dif_csrng_t csrng;
2933
static dif_edn_t edn0;
3034
static dif_edn_t edn1;
@@ -140,23 +144,14 @@ OTTF_DEFINE_TEST_CONFIG(.enable_concurrency = true);
140144
* Initializes the peripherals used in this test.
141145
*/
142146
static void init_peripherals(void) {
143-
CHECK_DIF_OK(dif_csrng_init(
144-
mmio_region_from_addr(TOP_EARLGREY_CSRNG_BASE_ADDR), &csrng));
145-
CHECK_DIF_OK(
146-
dif_edn_init(mmio_region_from_addr(TOP_EARLGREY_EDN0_BASE_ADDR), &edn0));
147-
CHECK_DIF_OK(
148-
dif_edn_init(mmio_region_from_addr(TOP_EARLGREY_EDN1_BASE_ADDR), &edn1));
149-
CHECK_DIF_OK(dif_entropy_src_init(
150-
mmio_region_from_addr(TOP_EARLGREY_ENTROPY_SRC_BASE_ADDR), &entropy_src));
151-
CHECK_DIF_OK(dif_rv_plic_init(
152-
mmio_region_from_addr(TOP_EARLGREY_RV_PLIC_BASE_ADDR), &plic));
153-
CHECK_DIF_OK(dif_rv_core_ibex_init(
154-
mmio_region_from_addr(TOP_EARLGREY_RV_CORE_IBEX_CFG_BASE_ADDR),
155-
&rv_core_ibex));
156-
CHECK_DIF_OK(
157-
dif_otbn_init(mmio_region_from_addr(TOP_EARLGREY_OTBN_BASE_ADDR), &otbn));
158-
CHECK_DIF_OK(
159-
dif_aes_init(mmio_region_from_addr(TOP_EARLGREY_AES_BASE_ADDR), &aes));
147+
CHECK_DIF_OK(dif_csrng_init_from_dt(kDtCsrng, &csrng));
148+
CHECK_DIF_OK(dif_edn_init_from_dt(kDtEdn0, &edn0));
149+
CHECK_DIF_OK(dif_edn_init_from_dt(kDtEdn1, &edn1));
150+
CHECK_DIF_OK(dif_entropy_src_init_from_dt(kDtEntropySrc, &entropy_src));
151+
CHECK_DIF_OK(dif_rv_plic_init_from_dt(kDtRvPlic, &plic));
152+
CHECK_DIF_OK(dif_rv_core_ibex_init_from_dt(kDtRvCoreIbex, &rv_core_ibex));
153+
CHECK_DIF_OK(dif_otbn_init_from_dt(kDtOtbn, &otbn));
154+
CHECK_DIF_OK(dif_aes_init_from_dt(kDtAes, &aes));
160155
}
161156

162157
/**

0 commit comments

Comments
 (0)