summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/hardwaremain.c1
-rw-r--r--src/lib/thread.c11
2 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index a239f8f238..a6ab66347e 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -456,7 +456,6 @@ void main(void)
/* Handoff sleep type from romstage. */
acpi_is_wakeup_s3();
- threads_initialize();
/* Initialise GNVS early. */
if (CONFIG(ACPI_SOC_NVS))
diff --git a/src/lib/thread.c b/src/lib/thread.c
index 413e5b4bec..2ff09a50d5 100644
--- a/src/lib/thread.c
+++ b/src/lib/thread.c
@@ -257,13 +257,16 @@ static void *thread_alloc_space(struct thread *t, size_t bytes)
return (void *)t->stack_current;
}
-void threads_initialize(void)
+static void threads_initialize(void)
{
int i;
struct thread *t;
u8 *stack_top;
struct cpu_info *ci;
+ if (initialized)
+ return;
+
/* `cpu_info()` requires the stacks to be STACK_SIZE aligned */
assert(IS_ALIGNED((uintptr_t)thread_stacks, CONFIG_STACK_SIZE));
@@ -295,6 +298,9 @@ int thread_run(struct thread_handle *handle, enum cb_err (*func)(void *), void *
struct thread *current;
struct thread *t;
+ /* Lazy initialization */
+ threads_initialize();
+
current = current_thread();
if (!thread_can_yield(current)) {
@@ -327,6 +333,9 @@ int thread_run_until(struct thread_handle *handle, enum cb_err (*func)(void *),
if (!ENV_RAMSTAGE)
dead_code();
+ /* Lazy initialization */
+ threads_initialize();
+
current = current_thread();
if (!thread_can_yield(current)) {