Skip to content

Commit da126d7

Browse files
committed
[sw,test] Port entropy_src_edn_reqs test to DT
Signed-off-by: Robert Schilling <[email protected]>
1 parent 61f0c58 commit da126d7

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

sw/device/tests/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1586,11 +1586,12 @@ opentitan_test(
15861586
{
15871587
"//hw/top_earlgrey:silicon_creator": None,
15881588
},
1589+
DARJEELING_TEST_ENVS,
15891590
),
15901591
verilator = verilator_params(timeout = "long"),
15911592
deps = [
15921593
":otbn_randomness_impl",
1593-
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
1594+
"//hw/top:dt",
15941595
"//sw/device/lib/base:memory",
15951596
"//sw/device/lib/base:mmio",
15961597
"//sw/device/lib/dif:aes",

sw/device/tests/entropy_src_edn_reqs_test.c

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
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_alert_handler.h"
7+
#include "hw/top/dt/dt_csrng.h"
8+
#include "hw/top/dt/dt_edn.h"
9+
#include "hw/top/dt/dt_entropy_src.h"
10+
#include "hw/top/dt/dt_keymgr.h"
11+
#include "hw/top/dt/dt_kmac.h"
12+
#include "hw/top/dt/dt_otbn.h"
13+
#include "hw/top/dt/dt_otp_ctrl.h"
14+
#include "hw/top/dt/dt_pwrmgr.h"
15+
#include "hw/top/dt/dt_rv_core_ibex.h"
516
#include "sw/device/lib/arch/boot_stage.h"
617
#include "sw/device/lib/base/memory.h"
718
#include "sw/device/lib/base/mmio.h"
@@ -27,7 +38,6 @@
2738
#include "sw/device/tests/otbn_randomness_impl.h"
2839

2940
#include "hw/top/alert_handler_regs.h" // Generated.
30-
#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
3141

3242
static dif_aes_t aes;
3343
static dif_csrng_t csrng;
@@ -200,31 +210,18 @@ static void alert_handler_test(const dif_pwrmgr_t *pwrmgr) {
200210
}
201211

202212
void test_initialize(void) {
203-
CHECK_DIF_OK(dif_entropy_src_init(
204-
mmio_region_from_addr(TOP_EARLGREY_ENTROPY_SRC_BASE_ADDR), &entropy_src));
205-
CHECK_DIF_OK(dif_csrng_init(
206-
mmio_region_from_addr(TOP_EARLGREY_CSRNG_BASE_ADDR), &csrng));
207-
CHECK_DIF_OK(
208-
dif_edn_init(mmio_region_from_addr(TOP_EARLGREY_EDN0_BASE_ADDR), &edn0));
209-
CHECK_DIF_OK(
210-
dif_edn_init(mmio_region_from_addr(TOP_EARLGREY_EDN1_BASE_ADDR), &edn1));
211-
CHECK_DIF_OK(dif_rv_core_ibex_init(
212-
mmio_region_from_addr(TOP_EARLGREY_RV_CORE_IBEX_CFG_BASE_ADDR), &ibex));
213-
CHECK_DIF_OK(dif_pwrmgr_init(
214-
mmio_region_from_addr(TOP_EARLGREY_PWRMGR_AON_BASE_ADDR), &pwrmgr));
215-
CHECK_DIF_OK(dif_keymgr_init(
216-
mmio_region_from_addr(TOP_EARLGREY_KEYMGR_BASE_ADDR), &kmgr));
217-
CHECK_DIF_OK(
218-
dif_otbn_init(mmio_region_from_addr(TOP_EARLGREY_OTBN_BASE_ADDR), &otbn));
219-
CHECK_DIF_OK(dif_otp_ctrl_init(
220-
mmio_region_from_addr(TOP_EARLGREY_OTP_CTRL_CORE_BASE_ADDR), &otp));
221-
CHECK_DIF_OK(
222-
dif_aes_init(mmio_region_from_addr(TOP_EARLGREY_AES_BASE_ADDR), &aes));
223-
CHECK_DIF_OK(
224-
dif_kmac_init(mmio_region_from_addr(TOP_EARLGREY_KMAC_BASE_ADDR), &kmac));
225-
CHECK_DIF_OK(dif_alert_handler_init(
226-
mmio_region_from_addr(TOP_EARLGREY_ALERT_HANDLER_BASE_ADDR),
227-
&alert_handler));
213+
CHECK_DIF_OK(dif_entropy_src_init_from_dt(kDtEntropySrc, &entropy_src));
214+
CHECK_DIF_OK(dif_csrng_init_from_dt(kDtCsrng, &csrng));
215+
CHECK_DIF_OK(dif_edn_init_from_dt(kDtEdn0, &edn0));
216+
CHECK_DIF_OK(dif_edn_init_from_dt(kDtEdn1, &edn1));
217+
CHECK_DIF_OK(dif_rv_core_ibex_init_from_dt(kDtRvCoreIbex, &ibex));
218+
CHECK_DIF_OK(dif_pwrmgr_init_from_dt(kDtPwrmgrAon, &pwrmgr));
219+
CHECK_DIF_OK(dif_keymgr_init_from_dt(kDtKeymgr, &kmgr));
220+
CHECK_DIF_OK(dif_otbn_init_from_dt(kDtOtbn, &otbn));
221+
CHECK_DIF_OK(dif_otp_ctrl_init_from_dt(kDtOtpCtrl, &otp));
222+
CHECK_DIF_OK(dif_aes_init_from_dt(kDtAes, &aes));
223+
CHECK_DIF_OK(dif_kmac_init_from_dt(kDtKmac, &kmac));
224+
CHECK_DIF_OK(dif_alert_handler_init_from_dt(kDtAlertHandler, &alert_handler));
228225
}
229226

230227
status_t execute_test(void) {

0 commit comments

Comments
 (0)