Re: [Patch] x86: export cpu_llc_id for edac drivers

[Amerigo Wang <amwang@redhat.com>]

Andreas Herrmann wrote:
> On Tue, Sep 15, 2009 at 05:25:14PM +0900, Tejun Heo wrote:
>> Heh.. was about to send out the same patch.
> 
> Maybe a better fix would be to provide a wrapper for this.
> See attached patch.
> 

Agreed.


> Regards,
> Andreas
> 
> ---
> x86, edac: Provide function to return NodeId for CPU
> 
> Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
> 


Reviewed-by: WANG Cong <amwang@redhat.com>

Thanks.


> diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
> index e08ea04..42a3f93 100644
> --- a/arch/x86/include/asm/processor.h
> +++ b/arch/x86/include/asm/processor.h
> @@ -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 */
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index 22a47c8..f32fa71 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -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)
> diff --git a/drivers/edac/edac_mce_amd.c b/drivers/edac/edac_mce_amd.c
> index c8ca713..0c21c37 100644
> --- a/drivers/edac/edac_mce_amd.c
> +++ b/drivers/edac/edac_mce_amd.c
> @@ -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;
> 
>