x86/topology: Fix AMD core count
authorPeter Zijlstra <peterz@infradead.org>
Fri, 25 Mar 2016 14:52:34 +0000 (15:52 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 29 Mar 2016 08:45:04 +0000 (10:45 +0200)
commitee6825c80e870fff1a370c718ec77022ade0889b
treeea5476978095b97d911d00e5a21c1c769c7f401a
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca
x86/topology: Fix AMD core count

It turns out AMD gets x86_max_cores wrong when there are compute
units.

The issue is that Linux assumes:

nr_logical_cpus = nr_cores * nr_siblings

But AMD reports its CU unit as 2 cores, but then sets num_smp_siblings
to 2 as well.

Boris: fixup ras/mce_amd_inj.c too, to compute the Node Base Core
properly, according to the new nomenclature.

Fixes: 1f12e32f4cd5 ("x86/topology: Create logical package id")
Reported-by: Xiong Zhou <jencce.kernel@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andreas Herrmann <aherrmann@suse.com>
Cc: Andy Lutomirski <luto@kernel.org>
Link: http://lkml.kernel.org/r/20160317095220.GO6344@twins.programming.kicks-ass.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/include/asm/smp.h
arch/x86/kernel/cpu/amd.c
arch/x86/ras/mce_amd_inj.c