diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-06-06 01:00:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-15 17:37:26 +0200 |
| commit | dcf82399d6d1f2e3ee621cf4c87506574d348c39 (patch) | |
| tree | 0f4f6420f7bfb05e19d81daa0e20665abae6a7a6 | |
| parent | c3155990e210e1809cb14f87bc4b8d31ae7695a7 (diff) | |
| download | linux-dcf82399d6d1f2e3ee621cf4c87506574d348c39.tar.gz | |
x86/cpu/intel: Evaluate smp_num_siblings early
commit 1910ad5624968f93be48e8e265513c54d66b897c upstream.
Make use of the new early detection function to initialize smp_num_siblings
on the boot cpu before the MP-Table or ACPI/MADT scan happens. That's
required for force disabling SMT.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index eb75564f2d257..6602941cfebf3 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -301,6 +301,13 @@ static void early_init_intel(struct cpuinfo_x86 *c) } check_mpx_erratum(c); + + /* + * Get the number of SMT siblings early from the extended topology + * leaf, if available. Otherwise try the legacy SMT detection. + */ + if (detect_extended_topology_early(c) < 0) + detect_ht_early(c); } #ifdef CONFIG_X86_32 |