diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2017-06-16 09:37:31 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-06-19 15:33:10 -0700 |
| commit | 8a16e6483ab80a85af44e8ba164e5e91a51ec43a (patch) | |
| tree | f466b3e4ba712c0b6a0d5510d4aaff0a937e5005 /core/minute-ia/task.c | |
| parent | 90167c1764ab7c532b121bd08990b81631a3c896 (diff) | |
| download | chrome-ec-8a16e6483ab80a85af44e8ba164e5e91a51ec43a.tar.gz | |
task: Wait for HOOK_INIT completion before scheduling tasks
Until HOOK_INIT has completed, do not allow any tasks other than HOOKS
or IDLE to be scheduled. Programmers often make the assumption that
a HOOK_INIT function is guaranteed to be run before task code that depends
on it, so let's make it so.
BUG=chromium:649398
BRANCH=None
TEST=Manual on kevin, compare boot without patch:
...
[0.004 power state 0 = G3, in 0x0008] <-- from chipset task
RTC: 0x00000000 (0.00 s)
[0.004 power state 4 = G3->S5, in 0x0008]
RTC: 0x00000000 (0.00 s)
[0.005 clear MKBP fifo]
[0.006 clear MKBP fifo]
[0.006 KB init state: ... <-- from keyscan task
[0.012 SW 0x05]
[0.155 hash start 0x00020000 0x00019a38]
[0.158 HOOK_INIT DONE!]
... to boot with patch:
...
RTC: 0x58cc614c (1489789260.00 s)
[0.004 clear MKBP fifo]
[0.005 clear MKBP fifo]
[0.010 SW 0x05]
[0.155 hash start 0x00020000 0x000198e0]
[0.157 HOOK_INIT DONE!]
...
Also, verify kevin boots to OS and is generally functional through
sysjump and basic tasks, and verify elm (stm32f0 / cortex-m0) boots.
Change-Id: If56fab05ce9b9650feb93c5cfc2d084aa281e622
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/456628
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'core/minute-ia/task.c')
| -rw-r--r-- | core/minute-ia/task.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c index 0d131ae318..e3676e292c 100644 --- a/core/minute-ia/task.c +++ b/core/minute-ia/task.c @@ -145,6 +145,12 @@ static int need_resched_or_profiling; * make a call to enable all tasks. */ static uint32_t tasks_ready = (1 << TASK_ID_HOOKS); +/* + * Initially allow only the HOOKS and IDLE task to run, regardless of ready + * status, in order for HOOK_INIT to complete before other tasks. + * task_enable_all_tasks() will open the flood gates. + */ +static uint32_t tasks_enabled = (1 << TASK_ID_HOOKS) | (1 << TASK_ID_IDLE); static int start_called; /* Has task swapping started */ @@ -217,10 +223,6 @@ uint32_t switch_handler(int desched, task_id_t resched) } #endif - /* Stay in hook till task_enable_all_tasks() */ - if (!task_start_called() && tasks_ready > 3) - tasks_ready = 3; - current = current_task; #ifdef CONFIG_DEBUG_STACK_OVERFLOW @@ -242,8 +244,8 @@ uint32_t switch_handler(int desched, task_id_t resched) } tasks_ready |= 1 << resched; - ASSERT(tasks_ready); - next = __task_id_to_ptr(__fls(tasks_ready)); + ASSERT(tasks_ready & tasks_enabled); + next = __task_id_to_ptr(__fls(tasks_ready & tasks_enabled)); #ifdef CONFIG_TASK_PROFILING /* Track time in interrupts */ @@ -430,9 +432,10 @@ uint32_t task_wait_event_mask(uint32_t event_mask, int timeout_us) void task_enable_all_tasks(void) { - /* Mark all tasks as ready to run. */ - tasks_ready = (1 << TASK_ID_COUNT) - 1; + /* Mark all tasks as ready and table to run. */ + tasks_ready = tasks_enabled = (1 << TASK_ID_COUNT) - 1; + /* BUG: task_start() was likely already called */ start_called = 1; /* The host OS driver should wait till the FW completes all hook inits. |