From patchwork Tue Feb 13 21:05:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 200629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp812578dyb; Tue, 13 Feb 2024 13:15:30 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXNdJccRAvypOF1z/mTDRwk/V63hbErHIu8KdU93xaThJnn3f02KJcJR0mhw5etZcPZh16aJnJsFN+T24H+HbXuxQU9OQ== X-Google-Smtp-Source: AGHT+IEFKI99QGjZYqrqg51uvJNgz9BAQHaCN7QIVkyRFLafmTFYxExSvZvTbQCTiJVFFIqBoLVm X-Received: by 2002:a05:6358:6f8a:b0:178:7c7b:77bd with SMTP id s10-20020a0563586f8a00b001787c7b77bdmr565339rwn.27.1707858930653; Tue, 13 Feb 2024 13:15:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707858930; cv=pass; d=google.com; s=arc-20160816; b=lCtL6gLpxFSwZbdxZbqPH9J6FipNMI8j3KRRfj4xZjZqjT4RXl99jNRCglwI2Mlowm meQ/lUjlNDH7rf2d/KaFvcniKKVGt0q0vmtTk/duCs4FmN7zYXOF9Th2kUTbsz/c/FFb Sfhe4hJY/g93byLoWs3sJZs0tXrLCu035aOVTzONaeZUu7AMd+0nqcXyX//Soj8Q41kc biiI5TYUQHFgH/5jGbnFBj0Nz4GvLW9/Rwqsjan5H6MUsOyWtyCKkdAsJEXjdwUYnlfF +CV/OH98kXAQSnwPHjHC431TL8tYQJRFcoRcpIZrS7WawX56TaW9m+AIQmuTPUG5tBYO Z12g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=date:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:subject:cc:to:from:dkim-signature :dkim-signature:message-id; bh=qpOqg8wHgWldzZv4rvX2WggJPz3SVoiC9O3+E9lyex8=; fh=DhhjWohX2mnFU8Q2xcxf7ANSWW60k6B7iEbPHYfFM7Y=; b=xx7w0JKidsBKsS7XU5nchex2VlicXILZL9TfKXcoEyLhZrhb/6uSaWjYKS+zWzVozP /yH9ggnxYl2Zcjuvgx7HJh2+Zn96qNnIJhT/braaRBzJbwL/M9nSRf8dUO5oT3AqNp1N 9B6R5I/Vc4PIbfJIBtZkLJ3jJynrJ3xUdSmT++3hbx61iSiU37Kp/OaAb4GirVkUw5uh BZ2GSyO/l8V5kr17ePbxHqvZA1cJDy7f3EIaDgJqz5IiI7e3T3oalr0hczxPmuvyjvRV fpP4YjR7uU8VC6z/69VakTlaTTu6SCALJdI6U7HRP1Fdkkvv3JsKuLBcPj0mzTw/mwJx br2Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="K/e274NZ"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-64284-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64284-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=2; AJvYcCWo7GuF2gje43wjgFdxIjFf+Bjg9XC6ds91A04Z2NcpjLNOnpL0+81XRXHXlUfmtkk/Yk220kIRzdGcvuNm/h8+B/Y3/g== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id n6-20020a632706000000b005d8b7053276si2498569pgn.160.2024.02.13.13.15.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 13:15:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64284-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="K/e274NZ"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-64284-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64284-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 3BD3A286678 for ; Tue, 13 Feb 2024 21:14:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3FB7479DD9; Tue, 13 Feb 2024 21:05:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="K/e274NZ"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="75KGno8n" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DCD778B67 for ; Tue, 13 Feb 2024 21:05:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707858325; cv=none; b=EWWMyrW4mulmO/+l9wTjzD/wb5Dhx4/24StSGId1rg/kMEIIBo/Nzn6UQcN3NZkSmKYZY9Txx2zqv7bR9bNdxwz33juF4h24EmH5OY1f0W5gpN+SHc6OJKukCAOkENGIgMAuMMkiHgzs8btO5Fab20JCnjIXnAt1AYhjrB2MYV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707858325; c=relaxed/simple; bh=jcnrKQ8bGa1cI8YUc48EGSYADKgqOdIYaLgH8rg4ccM=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=sH2RkhPQXN0qlPUrkBU5b9bI2NpGeDiDyk4NjUFDq7fUGslbjUYRp59zbZjPYk/C7dj7L9UAGOAgrDV+qHs+Q1KsztdQlXgwO4eldyLAaY6KbcYxkY1OOJGuKM+fpqdrrjeFAy9m//4QRlsIvKWN3CSaRuOCkbsK7dGXr4gLwjQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=K/e274NZ; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=75KGno8n; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Message-ID: <20240212154640.177504138@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1707858322; 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=qpOqg8wHgWldzZv4rvX2WggJPz3SVoiC9O3+E9lyex8=; b=K/e274NZbDcRp4r1Y7Wy/RBSt6CiOsSqWdb47mBRlxNqEdvzxhbt3RnXj7qe0FZHN9cGBX oTeqHthR0sc4nEOF4jxxUgVhmd/ROeMc0HFWMLA44hmTGbeRb67DHyQ4ZZoEOwYtbwRAHH geFrx+Qy49AocvOIO3sAQfS8wTvedyEeG9lG1sYEzRbdApSvAxZgBndyFFDA3advQBVGlD c26MGoFU0ju1GChH0Ja3hvv6NMHl7M48r3/3dr/2/Ho17rMbrLjakUkWkdyxLSPFLtrGUU GEEvv4dbn3Y20Xo5cOAKQvXv9vU8UYg0nQWcPKHS6uMfZhT+gviBwSRjbeKeyA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1707858322; 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=qpOqg8wHgWldzZv4rvX2WggJPz3SVoiC9O3+E9lyex8=; b=75KGno8nXfqDJKSNNZgy8X4Blr6YUpxPmpWrsBfhYqvtXNGPXRcYaUifTgOiKKdppKlleb rxykisF84IaPjzBQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Sohil Mehta , K Prateek Nayak , Kan Liang , Zhang Rui , "Paul E. McKenney" , Feng Tang , Andy Shevchenko , Michael Kelley , "Peter Zijlstra (Intel)" , Andy Shevchenko , Wei Liu Subject: [patch V3 22/22] x86/apic: Use a proper define for invalid ACPI CPU ID References: <20240212154529.402604963@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Tue, 13 Feb 2024 22:05:21 +0100 (CET) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790819885763622662 X-GMAIL-MSGID: 1790819885763622662 From: Thomas Gleixner 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 --- arch/x86/include/asm/apic.h | 3 +++ arch/x86/kernel/apic/apic.c | 2 +- arch/x86/xen/enlighten_hvm.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) --- --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -48,7 +48,10 @@ static inline void x86_32_probe_apic(voi extern u32 cpuid_to_apicid[]; +#define CPU_ACPIID_INVALID U32_MAX + #ifdef CONFIG_X86_LOCAL_APIC + extern int apic_verbosity; extern int local_apic_timer_c2_ok; --- 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;