| From foo@baz Tue Aug 14 16:14:56 CEST 2018 |
| From: Borislav Petkov <bp@suse.de> |
| Date: Fri, 15 Jun 2018 20:48:39 +0200 |
| Subject: x86/CPU/AMD: Do not check CPUID max ext level before parsing SMP info |
| |
| From: Borislav Petkov <bp@suse.de> |
| |
| 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: David Woodhouse <dwmw@amazon.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/kernel/cpu/amd.c | 7 ++----- |
| 1 file changed, 2 insertions(+), 5 deletions(-) |
| |
| --- a/arch/x86/kernel/cpu/amd.c |
| +++ b/arch/x86/kernel/cpu/amd.c |
| @@ -799,11 +799,8 @@ static void init_amd(struct cpuinfo_x86 |
| |
| 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); |
| |
