| Message ID | 20230807135027.588808550@linutronix.de |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1493408vqr;
Mon, 7 Aug 2023 07:32:48 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IF3DLhDoA8Jt1getPgOBphU2V0lNMh3GmFH9/Xic9Bgo9BV0vIeNUYedQDxI0IF/RM2lE4v
X-Received: by 2002:a17:902:bd07:b0:1b1:9218:6bf9 with SMTP id
p7-20020a170902bd0700b001b192186bf9mr8856996pls.43.1691418768342;
Mon, 07 Aug 2023 07:32:48 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1691418768; cv=none;
d=google.com; s=arc-20160816;
b=hyNFIPjynZjCwO3i+JE1J8NcV8MFmbxg7YP/s6IZsJ0p4qKWlrNYawbDtPHvfp5t/k
7c70Iv7GhN3KD021PC1S4iIFo5/aMBoKIOyRSKl6Ei5JipsMDKtV3MwxdZOf4yaIA/AQ
HzdyYH0rbuT8nIBVmdeN8Z47ZfZDKbuTnQ9+k6AFp+psm0DjcZXr6/LR5bFFDZl53o9d
JTX91bLBpNylp4PBR3qDbHOWeXBlWC2wWo0PRIKnibMMZz4NeyfbfNfYn4dKP6Dk/jX6
NQEU/lE6/VUwhv+wfMYcQbLanyHWH3pECJ4xMarDcAYXesAak76VSrY+S0GwFg9ai/4m
DnFA==
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=IrlwyG1bzr7R52EqtilduQSm4PCjRDmOOCFPZIpHccM=;
fh=/92WVKYrcN3rA268QXyKzVtm/UtxHeI2lnbU295XDiQ=;
b=P09+TlRYkR2JdZt5rXcTo/3c+61oLXOqHBnPP3s6WeCMVRwHv3kdGnYgRuHafJGPZW
xCIZYIUIO9e7jti5hENNUy41iRQTzxs0ji1UNVR77mJNkLqT2wpdyynXOkrV+azhz94Y
0yMlnMBVVQfJV5GNnpJtlGrIOxpnTTY6eMAnKhVFt2aNIedKQPX47R3g3evBaD3imfom
NkrsgGqZTuVJE7HlQxjz8Q/NxVOYiZzUJx/cCi4YO0QLxzzXgthX9wZuwL9R6wjFlZu1
C4qGI1XOxjV4dIwJ+Zokxqyne+48lfbKunNlwmGjJulKm9WBWWMA6+3TaqPXPcvRb9el
iVlA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=CuctpTbi;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e
header.b=nzYIVBJX;
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
lo12-20020a170903434c00b001b8847d973fsi5703147plb.219.2023.08.07.07.32.29;
Mon, 07 Aug 2023 07:32:48 -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=CuctpTbi;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e
header.b=nzYIVBJX;
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 S232860AbjHGNyK (ORCPT <rfc822;aaronkmseo@gmail.com> + 99 others);
Mon, 7 Aug 2023 09:54:10 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41384 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S234483AbjHGNxW (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 7 Aug 2023 09:53:22 -0400
Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABD9E1711
for <linux-kernel@vger.kernel.org>;
Mon, 7 Aug 2023 06:53:09 -0700 (PDT)
Message-ID: <20230807135027.588808550@linutronix.de>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1691416388;
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=IrlwyG1bzr7R52EqtilduQSm4PCjRDmOOCFPZIpHccM=;
b=CuctpTbiRz/wJD5qxPJyWEZjXhE/AiIO/3JAvaUWdaR3Zx4gwPXvjNJhJ3LX6bS1X4fnBo
pybUVpXMVOESSDu4FTLEv+0QgK/dCVfNtpcbzmoE4/wfTaC/s4c0KFrh+Coc2x9mudfRWI
sqtOpLTaUajy8wIfNRvC7lKMRjpjKBzKldxJZKTsO76l4kVjWd87hzIDW70zvKkQ8i68lN
IIVxYZRX8khwnqjWXGrjkMdJeooZWXZlAkCQZSJtquJ5dSyWYyONxblEexDyGlD009I81K
EG45MK9MOpMQYOwaDfW33o5713X38mChqkh9qqMP1VzaqT+T4J/QsjIa0myqgA==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1691416388;
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=IrlwyG1bzr7R52EqtilduQSm4PCjRDmOOCFPZIpHccM=;
b=nzYIVBJXi35UKPVRUwOmLmZ4kSEOI3s1SERwuMB5niQ8qYLIBLW5qSWLjh8wg8VKjIRX4b
f1X9qRA09Xsiw4DA==
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Tom Lendacky <thomas.lendacky@amd.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Arjan van de Ven <arjan@linux.intel.com>,
Huang Rui <ray.huang@amd.com>, Juergen Gross <jgross@suse.com>,
Dimitri Sivanich <dimitri.sivanich@hpe.com>,
Michael Kelley <mikelley@microsoft.com>,
Sohil Mehta <sohil.mehta@intel.com>,
K Prateek Nayak <kprateek.nayak@amd.com>,
Kan Liang <kan.liang@linux.intel.com>,
Zhang Rui <rui.zhang@intel.com>,
"Paul E. McKenney" <paulmck@kernel.org>,
Feng Tang <feng.tang@intel.com>,
Andy Shevchenko <andy@infradead.org>
Subject: [patch 22/53] x86/apic: Use a proper define for invalid ACPI CPU ID
References: <20230807130108.853357011@linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Date: Mon, 7 Aug 2023 15:53:07 +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 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1773581126046737646
X-GMAIL-MSGID: 1773581126046737646
|
| Series |
x86/topology: The final installment
|
|
Commit Message
Thomas Gleixner
Aug. 7, 2023, 1:53 p.m. UTC
The ACPI ID for CPUs is preset with U32_MAX which is completely non
obvious. Use a proper define for it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/apic.h | 2 ++
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/xen/enlighten_hvm.c | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
--- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -46,6 +46,8 @@ extern void x86_32_probe_apic(void); static inline void x86_32_probe_apic(void) { } #endif +#define CPU_ACPIID_INVALID U32_MAX + #ifdef CONFIG_X86_LOCAL_APIC extern int apic_verbosity; --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -111,7 +111,7 @@ static inline bool apic_accessible(void) * Map cpu index to physical APIC ID */ DEFINE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_apicid, BAD_APICID); -DEFINE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_acpiid, U32_MAX); +DEFINE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_acpiid, CPU_ACPIID_INVALID); EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_apicid); EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_acpiid); --- a/arch/x86/xen/enlighten_hvm.c +++ b/arch/x86/xen/enlighten_hvm.c @@ -168,7 +168,7 @@ static int xen_cpu_up_prepare_hvm(unsign */ xen_uninit_lock_cpu(cpu); - if (cpu_acpi_id(cpu) != U32_MAX) + if (cpu_acpi_id(cpu) != CPU_ACPIID_INVALID) per_cpu(xen_vcpu_id, cpu) = cpu_acpi_id(cpu); else per_cpu(xen_vcpu_id, cpu) = cpu;