Commit 6a812691 authored Sep 16, 2009 by Andreas Herrmann Committed by Borislav Petkov Sep 16, 2009

x86, EDAC: Provide function to return NodeId of a CPU



Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>

parent b9183f9b

arch/x86/include/asm/processor.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1020,4 +1020,6 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
		extern int get_tsc_mode(unsigned long adr);
		extern int set_tsc_mode(unsigned int val);

		extern int amd_get_nb_id(int cpu);

		#endif /* _ASM_X86_PROCESSOR_H */

arch/x86/kernel/cpu/amd.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,16 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)
		#endif
		}

		int amd_get_nb_id(int cpu)
		{
		int id = 0;
		#ifdef CONFIG_SMP
		id = per_cpu(cpu_llc_id, cpu);
		#endif
		return id;
		}
		EXPORT_SYMBOL_GPL(amd_get_nb_id);

		static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)
		{
		#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)

drivers/edac/edac_mce_amd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -405,7 +405,7 @@ void decode_mce(struct mce *m)
		regs.nbsh = (u32)(m->status >> 32);
		regs.nbeal = (u32) m->addr;
		regs.nbeah = (u32)(m->addr >> 32);
		node = per_cpu(cpu_llc_id, m->extcpu);
		node = amd_get_nb_id(m->extcpu);

		amd_decode_nb_mce(node, &regs, 1);
		break;