diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-08-18 11:46:32 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-08-19 15:30:51 +0000 |
| commit | 0cc2ce432771a2625214973c471461e7df9c4a12 (patch) | |
| tree | 980063ed9a33db709e5b98d4160865a30cfc3db4 /src/cpu/intel | |
| parent | ff284f656606548f122c59a9ffb6ab453ca89149 (diff) | |
arch/x86: Clean up CONFIG_SMP and MAX_CPUS test
Change-Id: I7c138758707f87c0d7a827b6887c7752d3714cde
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21088
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/cpu/intel')
| -rw-r--r-- | src/cpu/intel/fsp_model_206ax/model_206ax_init.c | 4 | ||||
| -rw-r--r-- | src/cpu/intel/fsp_model_406dx/model_406dx_init.c | 4 | ||||
| -rw-r--r-- | src/cpu/intel/model_2065x/model_2065x_init.c | 4 | ||||
| -rw-r--r-- | src/cpu/intel/model_206ax/model_206ax_init.c | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/src/cpu/intel/fsp_model_206ax/model_206ax_init.c b/src/cpu/intel/fsp_model_206ax/model_206ax_init.c index be1f28b370..30a8d15429 100644 --- a/src/cpu/intel/fsp_model_206ax/model_206ax_init.c +++ b/src/cpu/intel/fsp_model_206ax/model_206ax_init.c @@ -316,14 +316,12 @@ static void intel_cores_init(struct device *cpu) cpu->path.apic.apic_id, new->path.apic.apic_id); -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 /* Start the new CPU */ - if (!start_cpu(new)) { + if (is_smp_boot() && !start_cpu(new)) { /* Record the error in cpu? */ printk(BIOS_ERR, "CPU %u would not start!\n", new->path.apic.apic_id); } -#endif } } diff --git a/src/cpu/intel/fsp_model_406dx/model_406dx_init.c b/src/cpu/intel/fsp_model_406dx/model_406dx_init.c index 6f1eb2cf75..ab3b6b330a 100644 --- a/src/cpu/intel/fsp_model_406dx/model_406dx_init.c +++ b/src/cpu/intel/fsp_model_406dx/model_406dx_init.c @@ -115,14 +115,12 @@ static void intel_cores_init(struct device *cpu) cpu->path.apic.apic_id, new->path.apic.apic_id); -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 /* Start the new CPU */ - if (!start_cpu(new)) { + if (is_smp_boot() && !start_cpu(new)) { /* Record the error in cpu? */ printk(BIOS_ERR, "CPU %u would not start!\n", new->path.apic.apic_id); } -#endif } } diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c index f7e6c1dc91..377e297435 100644 --- a/src/cpu/intel/model_2065x/model_2065x_init.c +++ b/src/cpu/intel/model_2065x/model_2065x_init.c @@ -295,14 +295,12 @@ static void intel_cores_init(struct device *cpu) cpu->path.apic.apic_id, new->path.apic.apic_id); -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 /* Start the new CPU */ - if (!start_cpu(new)) { + if (is_smp_boot() && !start_cpu(new)) { /* Record the error in cpu? */ printk(BIOS_ERR, "CPU %u would not start!\n", new->path.apic.apic_id); } -#endif } } diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index 589f3b67c6..ed5c29242d 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -489,14 +489,12 @@ static void intel_cores_init(struct device *cpu) cpu->path.apic.apic_id, new->path.apic.apic_id); -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 /* Start the new CPU */ - if (!start_cpu(new)) { + if (is_smp_boot() && !start_cpu(new)) { /* Record the error in cpu? */ printk(BIOS_ERR, "CPU %u would not start!\n", new->path.apic.apic_id); } -#endif } } |