From patchwork Wed Aug 2 10:21:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129804 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp410448vqx; Wed, 2 Aug 2023 05:14:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlHO26LVIRuRZFgN7rZgMqiu4910jXiH3CR5dyWOwr9IOPhpxhvfBrBPaxMkNylXbcO3CUGk X-Received: by 2002:a17:90b:603:b0:268:2b38:c9b0 with SMTP id gb3-20020a17090b060300b002682b38c9b0mr13135042pjb.0.1690978486556; Wed, 02 Aug 2023 05:14:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690978486; cv=none; d=google.com; s=arc-20160816; b=QD5n0ljvPo3Pbco1Mm4WPn4InoQ3sdQroGfXMKsE/hp9xqxxc65OMfvf2S9yMGmYyl XA6NSb+nx8AC615dZQ2LY9io/m1RDIUkeH6+8izDsHAwnD9ucl4rNkXfd+CTUSIjiceg lH9zVs7R+o0zF+ZoBnGHuEi94BrdJBOJk0t5SVKMyLZUucDnFs5oYAnt0Gal1MtCtLuA q99CB6NlGmV1Vvda8t9Ez5S8ppUXYTzBVpPqncwErPKWZ25CEfDuCb02Lqr3n9EL/21o 4taRVhySJ7DfGAQ2uNi4UHAEX8q0gvFgsj+VWBUMQEm0PNZIt3WjB54SvZF9Y+Y6tcpj hoSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=WfNPFKAN9GG2GFdyit2jWhoSZIUriu/Y8Ta0CK3Muoc=; fh=O9JPtEgoXN20WvvffwC9vht4C9mlV4cjm0SKbEbqoG0=; b=NzJ9F2ttACyDpzZDbXl3uDPrj5D+jCaCAlZHf8Lirfh1TS0YgP1A0M6WeFP5XeNQ4d vN9oGDRTaz3PPZL81EbwrDlIVZ4w87zU2ah0W0iWip6JidLtdUEnm6MeBba7m8VgeDcb hc84Po4RAIYP9VrNf9r5xTVFjmvEtyAlcleCiOblgDDux5uahrkoiLk50cJ3SG50EMXC euAtxvb1CKYsoR3g/g8Dge9VQadjbYRljXD4e/vH3d5cmhdkOGqVvfh8/fo+aFzT3r7d KBqZN31d5MKFBdVr95Kn5TdKaQpzzZK7oFE0pxMGR4GHdOUQXK6WFwnKx7oI8c8FbPKq HrEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=IzjP3wRm; dkim=neutral (no key) header.i=@linutronix.de header.b=Hq6P4Ipe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x9-20020a17090a1f8900b00250ce1755e9si973993pja.14.2023.08.02.05.14.25; Wed, 02 Aug 2023 05:14:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=IzjP3wRm; dkim=neutral (no key) header.i=@linutronix.de header.b=Hq6P4Ipe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233918AbjHBKV4 (ORCPT + 99 others); Wed, 2 Aug 2023 06:21:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233652AbjHBKVW (ORCPT ); Wed, 2 Aug 2023 06:21:22 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37D4B2690 for ; Wed, 2 Aug 2023 03:21:14 -0700 (PDT) Message-ID: <20230802101933.221483687@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690971672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=WfNPFKAN9GG2GFdyit2jWhoSZIUriu/Y8Ta0CK3Muoc=; b=IzjP3wRmszXK2hf4LQMcWiAou6gxoPMqSolNZ5BjktBqAP/EAxZqkMJoXQNqh8i1LgDU8j 6/xxQGEyvcDGkq3QkItK0fAfOwVxDJP5Tg4m0cQsmthQhhHBAUs/gXAiSFk8M1wvGHgUSb THcHR7QNkAuhN8EtHUYk5WH9wOICLGXQkG99RfaexRi+xvVW4ubbFJ2h1dAjY7xahGQHfj dsbMxZll1jjyaQec2z94av8eay3D9gra6pUwvQYGRoYFR6iK7rpp5sz568bJ/m+bZ08uLj eVX3u1mKcDRdvE0p3TMiyoeCU9WEvfusyaq8fnvzb/wPDvXX60i4vNnl2lLg+Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690971672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=WfNPFKAN9GG2GFdyit2jWhoSZIUriu/Y8Ta0CK3Muoc=; b=Hq6P4IpebG0jgbpDPGSdX/GA4v0B94529BGMSaFzFBZ44+JbQ5krNpaxEcKuc+BDx7Ly5E uyPWWtaApZ5rwYBw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Michael Kelley , Wei Liu Subject: [patch V3 09/40] x86/cpu: Move cu_id into topology info References: <20230802101635.459108805@linutronix.de> MIME-Version: 1.0 Date: Wed, 2 Aug 2023 12:21:11 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773119457522008378 X-GMAIL-MSGID: 1773119457522008378 No functional change. Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/processor.h | 4 +++- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/smpboot.c | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -89,6 +89,9 @@ struct cpuinfo_topology { // Physical die ID on AMD, Relative on Intel u32 die_id; + // Compute unit ID - AMD specific + u32 cu_id; + // Core ID relative to the package u32 core_id; }; @@ -109,7 +112,6 @@ struct cpuinfo_x86 { __u8 x86_phys_bits; /* CPUID returned core id bits: */ __u8 x86_coreid_bits; - __u8 cu_id; /* Max extended CPUID function supported: */ __u32 extended_cpuid_level; /* Maximum supported CPUID level, -1=no CPUID: */ --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -341,7 +341,7 @@ static void amd_get_topology(struct cpui c->topo.die_id = ecx & 0xff; if (c->x86 == 0x15) - c->cu_id = ebx & 0xff; + c->topo.cu_id = ebx & 0xff; if (c->x86 >= 0x17) { c->topo.core_id = ebx & 0xff; --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1789,7 +1789,7 @@ static void identify_cpu(struct cpuinfo_ c->x86_model_id[0] = '\0'; /* Unset */ c->x86_max_cores = 1; c->x86_coreid_bits = 0; - c->cu_id = 0xff; + c->topo.cu_id = 0xff; #ifdef CONFIG_X86_64 c->x86_clflush_size = 64; c->x86_phys_bits = 36; --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -490,9 +490,9 @@ static bool match_smt(struct cpuinfo_x86 if (c->topo.core_id == o->topo.core_id) return topology_sane(c, o, "smt"); - if ((c->cu_id != 0xff) && - (o->cu_id != 0xff) && - (c->cu_id == o->cu_id)) + if ((c->topo.cu_id != 0xff) && + (o->topo.cu_id != 0xff) && + (c->topo.cu_id == o->topo.cu_id)) return topology_sane(c, o, "smt"); }