]> www.infradead.org Git - users/jedix/linux-maple.git/commit
x86/CPU/AMD: Move TOPOEXT reenablement before reading smp_num_siblings
authorBorislav Petkov <bp@suse.de>
Fri, 22 Jun 2018 09:34:11 +0000 (11:34 +0200)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Sat, 11 Aug 2018 00:44:35 +0000 (20:44 -0400)
commit2417aeaaa1b76cd5285571c2aaab7b3d86ec40e6
tree969353d547569f89c66c097f7fa6c98ff55785ee
parented2e762302227b06c66bbd40e1c4915d128fac3c
x86/CPU/AMD: Move TOPOEXT reenablement before reading smp_num_siblings

The TOPOEXT reenablement is a workaround for broken BIOSen which didn't
enable the CPUID bit. amd_get_topology_early(), however, relies on
that bit being set so that it can read out the CPUID leaf and set
smp_num_siblings properly.

Move the reenablement up to early_init_amd(). While at it, simplify
amd_get_topology_early().

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Orabug: 28220674
CVE: CVE-2018-3620

(cherry picked from commit 7ce2f0393ea2396142b7faf6ee9b1f3676d08a5f)

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
arch/x86/kernel/cpu/amd.c