From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757208AbbCCQa4 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 3 Mar 2015 11:30:56 -0500
Received: from mail.skyhub.de ([78.46.96.112]:49330 "EHLO mail.skyhub.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757046AbbCCQay (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 3 Mar 2015 11:30:54 -0500
Date: Tue, 3 Mar 2015 17:29:43 +0100
From: Borislav Petkov <bp@alien8.de>
To: Daniel J Blueman <daniel@numascale.com>
Cc: Ingo Molnar <mingo@redhat.com>, Thomas Gleixner <tglx@linutronix.de>,
        "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org,
        linux-kernel@vger.kernel.org, Steffen Persvold <sp@numascale.com>
Subject: Re: [PATCH RESEND] x86: Fix sibling map with NumaChip
Message-ID: <20150303162943.GA3673@pd.tnic>
References: <1425395893-21157-1-git-send-email-daniel@numascale.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <1425395893-21157-1-git-send-email-daniel@numascale.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Mar 03, 2015 at 11:18:13PM +0800, Daniel J Blueman wrote:
> @@ -180,11 +180,15 @@ static int __init numachip_probe(void)
>  
>  static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)
>  {
> -
> -	if (c->phys_proc_id != node) {
> -		c->phys_proc_id = node;
> -		per_cpu(cpu_llc_id, smp_processor_id()) = node;
> -	}
> +	u64 val;
> +	u32 nodes;
> +
> +	per_cpu(cpu_llc_id, smp_processor_id()) = node;
> +
> +	/* Account for nodes per socket in multi-core-module processors */
> +	rdmsrl(MSR_FAM10H_NODE_ID, val);

You need to check a CPUID bit before accessing that MSR, see
amd_get_topology(). get_apic_id() in apic_numachip.c should be corrected
too.

Thanks.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--