Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH 2/2] x86/CPU/AMD: Derive CPU topology from CPUID Fn0xB
To:     linux-kernel@vger.kernel.org, x86@kernel.org
Cc:     tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, bp@suse.de
References: <1522051559-23415-1-git-send-email-suravee.suthikulpanit@amd.com>
 <1522051559-23415-3-git-send-email-suravee.suthikulpanit@amd.com>
From:   Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Message-ID: <a314c050-2c35-91bf-1e96-0c7cda0ae403@amd.com>
Date:   Tue, 27 Mar 2018 19:04:45 +0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0)
 Gecko/20100101 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <1522051559-23415-3-git-send-email-suravee.suthikulpanit@amd.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Received-SPF: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2018 12:04:53.1306 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: c8161322-6ad7-4072-def4-08d593daf4f0
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0139
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi All,

On 3/26/18 3:05 PM, Suravee Suthikulpanit wrote:
> Derive topology information from Extended Topology Enumeration
> (CPUID Fn0x0000000B) when the information is available.
> 
> Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> ---
>   arch/x86/kernel/cpu/amd.c | 16 ++++++++++++----
>   1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index 2c1a9f2..2b40144 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -338,10 +338,18 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
>   			c->cu_id = ebx & 0xff;
>   
>   		if (c->x86 >= 0x17) {
> -			c->cpu_core_id = ebx & 0xff;
> +			int err = detect_extended_topology(c);
>   
> -			if (smp_num_siblings > 1)
> -				c->x86_max_cores /= smp_num_siblings;
> +			if (err) {
> +				c->cpu_core_id = ebx & 0xff;
> +
> +				if (smp_num_siblings > 1)
> +					c->x86_max_cores /= smp_num_siblings;
> +			} else {
> +				int bits = get_count_order(c->x86_max_cores);
> +
> +				c->x86_coreid_bits = get_count_order(bits);
> +			}
>   		}

I made a mistake here in the attempt to clean up the code. I'll send out V2 to fix this.

Thanks,
Suravee