Skip to content

ot_flash: Re-enable disabled flash MMIO region on reset #210

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
Oct 3, 2025
Merged

ot_flash: Re-enable disabled flash MMIO region on reset #210

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
1dd32b3
[ot] hw/opentitan: ot_flash: Add trace on reset
AlexJones0 Oct 2, 2025
ac4eda1
[ot] hw/opentitan: ot_flash: Re-enable flash memory region on reset
AlexJones0 Oct 2, 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
7 changes: 7 additions & 0 deletions hw/opentitan/ot_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3175,6 +3175,8 @@ static void ot_flash_reset_enter(Object *obj, ResetType type)
OtFlashClass *c = OT_FLASH_GET_CLASS(obj);
OtFlashState *s = OT_FLASH(obj);

trace_ot_flash_reset(s->ot_id, "enter");

if (c->parent_phases.enter) {
c->parent_phases.enter(obj, type);
}
Expand Down Expand Up @@ -3266,6 +3268,9 @@ static void ot_flash_reset_enter(Object *obj, ResetType type)

s->csrs[R_CSR0_REGWEN] = 0x1u;

/* restore flash memory region enablement if previously disabled */
memory_region_set_enabled(&s->mmio.mem, true);

s->latched_alerts = 0u;

s->lc_broadcast.incoming_signal_bm = 0u;
Expand Down Expand Up @@ -3293,6 +3298,8 @@ static void ot_flash_reset_exit(Object *obj, ResetType type)
OtFlashClass *c = OT_FLASH_GET_CLASS(obj);
OtFlashState *s = OT_FLASH(obj);

trace_ot_flash_reset(s->ot_id, "exit");

if (c->parent_phases.exit) {
c->parent_phases.exit(obj, type);
}
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 @@ -215,6 +215,7 @@ ot_flash_op_prog(const char* id, unsigned op_addr, unsigned count, unsigned rema
ot_flash_op_start(const char* id, const char *op, bool hw) "%s: %s (hw=%u)"
ot_flash_prog_word(const char* id, bool info_part, unsigned word_addr, uint32_t word) "%s: info_part %u word_addr %u word %u"
ot_flash_read_keymgr_seed(const char* id, unsigned page, bool success) "%s: %u: %u"
ot_flash_reset(const char *id, const char *phase) "%s: %s"
ot_flash_reset_fifo(const char* id, const char *name) "%s: %s"
ot_flash_set_error(const char* id, const char *op, bool hw, uint32_t err_code, uint32_t err_addr) "%s: %s (hw=%u): err=0x%08x at addr=0x%06x"
ot_flash_update_alert(const char* id, int prev, int next) "%s: %d -> %d"
Expand Down
Loading