x86/CPU/AMD: Do not check CPUID max ext level before parsing SMP info

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>
Orabug: 28220674
CVE: CVE-2018-3620

(cherry picked from commit 119bff8a9c9bb00116a844ec68be7bc4b1c768f5)

Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Conflicts:
	arch/x86/kernel/cpu/amd.c
Contextual: we only have two functions

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index ff68fddb290f39b0c17b8dc7b3aea499895a708a..eaa846fa27335497e19d374e1075348fbf7a2e95 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -717,11 +717,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);