From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1751766AbZIPJm4@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751766AbZIPJm4 (ORCPT <rfc822;w@1wt.eu>);
	Wed, 16 Sep 2009 05:42:56 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751148AbZIPJmy
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Wed, 16 Sep 2009 05:42:54 -0400
Received: from mx1.redhat.com ([209.132.183.28]:50632 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751496AbZIPJmx (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 16 Sep 2009 05:42:53 -0400
Message-ID: <4AB0B34D.6040402@redhat.com>
Date: Wed, 16 Sep 2009 17:43:41 +0800
From: Amerigo Wang <amwang@redhat.com>
User-Agent: Thunderbird 2.0.0.22 (X11/20090719)
MIME-Version: 1.0
To: Andreas Herrmann <andreas.herrmann3@amd.com>
CC: Tejun Heo <tj@kernel.org>, linux-kernel@vger.kernel.org,
       Rusty Russell <rusty@rustcorp.com.au>, "H. Peter Anvin" <hpa@zytor.com>,
       Mike Travis <travis@sgi.com>, Thomas Gleixner <tglx@linutronix.de>,
       Yinghai Lu <yinghai@kernel.org>, akpm@linux-foundation.org,
       Ingo Molnar <mingo@elte.hu>, Borislav Petkov <borislav.petkov@amd.com>
Subject: Re: [Patch] x86: export cpu_llc_id for edac drivers
References: <20090915082005.4701.86110.sendpatchset@localhost.localdomain> <4AAF4F6A.5070901@kernel.org> <20090915142233.GA21670@alberich.amd.com>
In-Reply-To: <20090915142233.GA21670@alberich.amd.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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;
> 
>