Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3849e91f authored by Aravind Gopalakrishnan's avatar Aravind Gopalakrishnan Committed by Thomas Gleixner
Browse files

x86/AMD: Fix last level cache topology for AMD Fam17h systems 



On AMD Fam17h systems, the last level cache is not resident in the
northbridge. Therefore, we cannot assign cpu_llc_id to the same value as
Node ID as we have been doing until now.

We should rather look at the ApicID bits of the core to provide us the
last level cache ID info.

Signed-off-by: default avatarAravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Huang Rui <ray.huang@amd.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jacob Shin <jacob.w.shin@gmail.com>
Link: http://lkml.kernel.org/r/1446582899-9378-1-git-send-email-Aravind.Gopalakrishnan@amd.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8c058b0b

arch/x86/kernel/cpu/amd.c

+13 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c) 
#ifdef CONFIG_SMP

	unsigned bits;

	int cpu = smp_processor_id();

	unsigned int socket_id, core_complex_id;



	bits = c->x86_coreid_bits;

	/* Low order bits define the core id (index of core in socket) */
@@ -361,6 +362,18 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c) 
	/* use socket ID also for last level cache */

	per_cpu(cpu_llc_id, cpu) = c->phys_proc_id;

	amd_get_topology(c);



	/*

	 * Fix percpu cpu_llc_id here as LLC topology is different

	 * for Fam17h systems.

	 */

	 if (c->x86 != 0x17 || !cpuid_edx(0x80000006))

		return;



	socket_id	= (c->apicid >> bits) - 1;

	core_complex_id	= (c->apicid & ((1 << bits) - 1)) >> 3;



	per_cpu(cpu_llc_id, cpu) = (socket_id << 3) | core_complex_id;

#endif

}