x86/CPU/AMD: Do not check CPUID max ext level before parsing SMP info
authorBorislav Petkov <bp@suse.de>
Fri, 15 Jun 2018 18:48:39 +0000 (20:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Aug 2018 16:12:52 +0000 (18:12 +0200)
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>
arch/x86/kernel/cpu/amd.c

index c17da9cd7de1dc992d39ab49ce23200f9b0afab7..f9b3011a35753dc5be5beac5387bf01bd93bf922 100644 (file)
@@ -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);