Skip to content

ot_otbn: Connect Recoverable alert to OTBN's error bits. #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2025
Merged

ot_otbn: Connect Recoverable alert to OTBN's error bits. #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7c6023
[ot] hw/opentitan: ot_otbn: Connect `Recoverable` alert to OTBN's err…
AlexJones0 Sep 3, 2025
84f9476
[ot] scripts/opentitan: tests: add newly passing OTBN tests
AlexJones0 Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 41 additions & 10 deletions hw/opentitan/ot_otbn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ struct OtOTBNState {
uint32_t intr_enable;
uint32_t intr_test;
uint32_t alert_test;
uint32_t fatal_alert_cause;
uint32_t errbits;
uint32_t load_checksum;

enum OtOTBNCommand last_cmd;
Expand Down Expand Up @@ -220,10 +220,42 @@ static void ot_otbn_update_irq(OtOTBNState *s)

static void ot_otbn_update_alert(OtOTBNState *s)
{
for (unsigned ix = 0; ix < ALERT_COUNT; ix++) {
bool level = (bool)(s->alert_test & (1u << ix));
if (ix == ALERT_FATAL) {
level |= (bool)s->fatal_alert_cause;
uint32_t levels = s->alert_test;

uint16_t recov_err_bits = (uint16_t)s->errbits;
if (recov_err_bits) {
levels |= 1u << ALERT_RECOVERABLE;
}

uint16_t fatal_err_bits = (uint16_t)(s->errbits >> 16u);
if (fatal_err_bits) {
levels |= 1u << ALERT_FATAL;
}

for (unsigned ix = 0u; ix < ALERT_COUNT; ix++) {
int level = (int)((levels >> ix) & 0x1u);
if (level != ibex_irq_get_level(&s->alerts[ix])) {
trace_ot_otbn_update_alert(s->ot_id,
ibex_irq_get_level(&s->alerts[ix]),
level);
}
ibex_irq_set(&s->alerts[ix], level);
}

if (!s->alert_test && !recov_err_bits) {
return;
}
/* ALERT_TEST and recoverable error alerts are transient */
s->alert_test = 0u;
s->errbits &= ~UINT16_MAX;
levels = fatal_err_bits ? (1u << ALERT_FATAL) : 0u;

for (unsigned ix = 0u; ix < ALERT_COUNT; ix++) {
int level = (int)((levels >> ix) & 0x1u);
if (level != ibex_irq_get_level(&s->alerts[ix])) {
trace_ot_otbn_update_alert(s->ot_id,
ibex_irq_get_level(&s->alerts[ix]),
level);
}
ibex_irq_set(&s->alerts[ix], level);
}
Expand All @@ -233,10 +265,9 @@ static void ot_otbn_post_execute(void *opaque)
{
OtOTBNState *s = OT_OTBN(opaque);

uint32_t errbits = ot_otbn_proxy_get_err_bits(s->proxy);
s->errbits = ot_otbn_proxy_get_err_bits(s->proxy);
uint32_t insncount = ot_otbn_proxy_get_instruction_count(s->proxy);
trace_ot_otbn_post_execute(s->ot_id, errbits, insncount);
s->fatal_alert_cause |= errbits >> 16U;
trace_ot_otbn_post_execute(s->ot_id, s->errbits, insncount);
s->intr_state |= INTR_DONE_MASK;
ot_otbn_proxy_acknowledge_execution(s->proxy);
ot_otbn_update_alert(s);
Expand Down Expand Up @@ -496,7 +527,7 @@ static uint64_t ot_otbn_regs_read(void *opaque, hwaddr addr, unsigned size)
val32 = ot_otbn_proxy_get_err_bits(s->proxy);
break;
case R_FATAL_ALERT_CAUSE:
val32 = s->fatal_alert_cause;
val32 = s->errbits >> 16u;
break;
case R_INSN_CNT:
val32 = ot_otbn_proxy_get_instruction_count(s->proxy);
Expand Down Expand Up @@ -714,7 +745,7 @@ static void ot_otbn_reset_enter(Object *obj, ResetType type)
s->intr_enable = 0;
s->intr_test = 0;
s->alert_test = 0;
s->fatal_alert_cause = 0;
s->errbits = 0;
s->load_checksum = 0;

s->last_cmd = OT_OTBN_CMD_NONE;
Expand Down
1 change: 1 addition & 0 deletions hw/opentitan/trace-events
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ ot_otbn_proxy_entropy_request(const char * id, unsigned rnd) "%s: %u"
ot_otbn_proxy_entropy_req_bh(const char * id, void) "%s"
ot_otbn_proxy_push_entropy(const char * id, const char *kind, bool fips) "%s: %s: fips %u"
ot_otbn_request_entropy(const char * id, unsigned ep) "%s: ep:%u"
ot_otbn_update_alert(const char * id, int prev, int next) "%s: %d -> %d"

# ot_otp.c

Expand Down
2 changes: 2 additions & 0 deletions scripts/opentitan/tests-passing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,11 @@
//sw/device/tests:kmac_mode_kmac_test_sim_qemu_rom_with_fake_keys
//sw/device/tests:kmac_smoketest_sim_qemu_rom_with_fake_keys
//sw/device/tests:otbn_ecdsa_op_irq_test_sim_qemu_rom_with_fake_keys
//sw/device/tests:otbn_irq_test_sim_qemu_rom_with_fake_keys
//sw/device/tests:otbn_isa_test_sim_qemu_rom_with_fake_keys
//sw/device/tests:otbn_randomness_test_sim_qemu_rom_with_fake_keys
//sw/device/tests:otbn_rsa_test_sim_qemu_rom_with_fake_keys
//sw/device/tests:otbn_smoketest_sim_qemu_rom_with_fake_keys
//sw/device/tests:plic_sw_irq_test_sim_qemu_rom_with_fake_keys
//sw/device/tests:pmp_smoketest_napot_sim_qemu_rom_with_fake_keys
//sw/device/tests:pmp_smoketest_tor_sim_qemu_rom_with_fake_keys
Expand Down
Loading