diff options
| author | Simon Glass | 2020-07-17 08:48:20 -0600 |
|---|---|---|
| committer | Bin Meng | 2020-07-20 09:46:46 +0800 |
| commit | 99a573fb326faf5a7bff50e4f9875f2066728d95 (patch) | |
| tree | 7a7efde7ccc0fce8c5ce88a4bbafe98d7647b0c0 /arch/x86/cpu | |
| parent | 84d3ed125ad91c5973c4a071be5eea913bea34e5 (diff) | |
x86: mp: Park CPUs before running the OS
With the new MP features the CPUs are no-longer parked when the OS is run.
Fix this by calling a special function to park them, just before the OS is
started.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/cpu.c | 5 | ||||
| -rw-r--r-- | arch/x86/cpu/mp_init.c | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index c343586e04b..69c14189d1f 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -67,6 +67,11 @@ static const char *const x86_vendor_name[] = { int __weak x86_cleanup_before_linux(void) { + int ret; + + ret = mp_park_aps(); + if (ret) + return log_msg_ret("park", ret); bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH_ADDR, CONFIG_BOOTSTAGE_STASH_SIZE); diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index dd6d6bfab7e..427ec8fc23f 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -668,6 +668,22 @@ int mp_run_on_cpus(int cpu_select, mp_run_func func, void *arg) return 0; } +static void park_this_cpu(void *unused) +{ + stop_this_cpu(); +} + +int mp_park_aps(void) +{ + int ret; + + ret = mp_run_on_cpus(MP_SELECT_APS, park_this_cpu, NULL); + if (ret) + return log_ret(ret); + + return 0; +} + int mp_init(void) { int num_aps, num_cpus; |