Skip to content

ot_sram_ctrl: change the defaut pace delay for initialization #308

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
rivos-eblot merged 1 commit into from
Dec 5, 2025
Merged

ot_sram_ctrl: change the defaut pace delay for initialization #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions hw/opentitan/ot_sram_ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ REG32(READBACK, 0x20u)
#define REG_NAME(_reg_) \
((((_reg_) < REGS_COUNT) && REG_NAMES[_reg_]) ? REG_NAMES[_reg_] : "?")

#define INIT_TIMER_CHUNK_NS 100000 /* 100 us */
#define INIT_TIMER_CHUNK_US 10u
#define INIT_TIMER_CHUNK_WORDS (4096u / sizeof(uint32_t)) /* 4 KB */

/* clang-format off */
Expand Down Expand Up @@ -140,6 +140,7 @@ struct OtSramCtrlState {
OtVMapperState *vmapper; /* optional */
uint32_t size; /* in bytes */
uint32_t init_chunk_words; /* init chunk size in words */
uint32_t init_pace_us; /* init delay pacing, in us */
bool ifetch; /* only used when no otp_ctrl is defined */
bool noinit; /* discard initialization emulation feature */
bool noswitch; /* do not switch to performance/host RAM after init */
Expand Down Expand Up @@ -253,8 +254,8 @@ static bool ot_sram_ctrl_initialize(OtSramCtrlState *s, unsigned count,
trace_ot_sram_ctrl_schedule_init(s->ot_id);

/* schedule a new initialization chunk */
uint64_t now = qemu_clock_get_ns(OT_VIRTUAL_CLOCK);
timer_mod(s->init_timer, (int64_t)(now + INIT_TIMER_CHUNK_NS));
int64_t now = qemu_clock_get_ns(OT_VIRTUAL_CLOCK);
timer_mod(s->init_timer, now + ((int64_t)s->init_pace_us) * 1000u);

return false;
}
Expand Down Expand Up @@ -675,6 +676,8 @@ static const Property ot_sram_ctrl_properties[] = {
OtVMapperState *),
DEFINE_PROP_UINT32("size", OtSramCtrlState, size, 0u),
DEFINE_PROP_UINT32("wci_size", OtSramCtrlState, init_chunk_words, 0u),
DEFINE_PROP_UINT32("init-pace-us", OtSramCtrlState, init_pace_us,
Comment on lines 677 to +679
Copy link

@AlexJones0 AlexJones0 Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside: It's not necessary to change in this PR, but it is still not clear to me: should we be using - or _ (or both) in property names?

Copy link
Author

@rivos-eblot rivos-eblot Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I now try to use - for properties; however properties that are managed by readconfig file may not follow this rule.
I guess a project-wide clean up would be required at some point.

INIT_TIMER_CHUNK_US),
DEFINE_PROP_BOOL("ifetch", OtSramCtrlState, ifetch, false),
DEFINE_PROP_BOOL("noinit", OtSramCtrlState, noinit, false),
DEFINE_PROP_BOOL("noswitch", OtSramCtrlState, noswitch, false),
Expand Down
Loading