summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2018-06-15 20:48:39 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-15 18:12:52 +0200
commit35c67d5baad3e2ab745393cbfeb6c6cc9ac6a334 (patch)
tree2202f802bc8106146ec6545c3ddb67a376d304c4
parentd20d8f7f6a92ce1211b27af925bdd6e2beebfab8 (diff)
x86/CPU/AMD: Do not check CPUID max ext level before parsing SMP info
commit 119bff8a9c9bb00116a844ec68be7bc4b1c768f5 upstream Old code used to check whether CPUID ext max level is >= 0x80000008 because that last leaf contains the number of cores of the physical CPU. The three functions called there now do not depend on that leaf anymore so the check can go. Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/kernel/cpu/amd.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index c17da9cd7de1..f9b3011a3575 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -835,11 +835,8 @@ static void init_amd(struct cpuinfo_x86 *c)
cpu_detect_cache_sizes(c);
- /* Multi core CPU? */
- if (c->extended_cpuid_level >= 0x80000008) {
- amd_detect_cmp(c);
- srat_detect_node(c);
- }
+ amd_detect_cmp(c);
+ srat_detect_node(c);
init_amd_cacheinfo(c);