From patchwork Tue Feb 13 21:04:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 200601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp808311dyb; Tue, 13 Feb 2024 13:06:55 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUfb7H25RA5oFrrpwR3S0eoZC5Lnr9fFE0qbRE8YgYGTbD/exaskZovuQAEc+s5/yo7Z4DA8cgXJixTBfhrOw/zWK1Ugw== X-Google-Smtp-Source: AGHT+IFRpEPeQB0auXpMGM1APIif7ncGvIsh8aJmuDL6yI445JY8mDkLcYs+UpnO43IDFJjoS7yW X-Received: by 2002:a05:6a00:3d0c:b0:6e1:7e8:7a55 with SMTP id lo12-20020a056a003d0c00b006e107e87a55mr484714pfb.31.1707858415096; Tue, 13 Feb 2024 13:06:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707858415; cv=pass; d=google.com; s=arc-20160816; b=UJfa2C22mBs1Ix7ZlRJp0SinvWHdQANkonhZ1Zjd/FQi6Cmdn2NoanC4KFpFNwR05B WKXdEHqrkFCxTS48O7WZrva0smf52qb17QTorO2S4ys4RCFVOvgk554FVXp6i4rEa+AW pM2/3K+x/7KJaEeQkrOFiPXVlbjKUg9CBAyeFB8vI3/hHh4nsUEBvAcwky3+B4PvfYHb bRDPpH0LTNLMapCO725JZiRR5SL6slt1smXFIpqsc1SeniH97D8epY8kqvZQA+of97wF EWtIomfRnVjRg2NfGquYlzzpUzFIAJcJqjcEQKC1/92DdiFHo+vD1GYfqc0a/Ri4nDd4 +CWw== 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=ZRJkzOwB5/1YL71AgKNjiEjK5SJG7QnNpgljQo39jQw=; fh=P/dx3rC6OILVAI9s4FR99pT+IenJnAwvDw1wKImqbT0=; b=e+gkRRRTdM+lQGxQBzdeORIeOMw6GQK0SsAhYx0DUjllboYzEOkTZmPejeoy4GQW4z bfVZtDNvuEzcsO44l3kjjuqkXwuma0JlGaX6DlrW18cCCLhFVXz7zr8LukyQjKQAQcBT AQs06QGBVyK9OyXm3JtMm72zRNdtKvKvNRPejgE3U/Dd89s3oVlTopoJrpptEMnRx93L cbsX69wQ4btadCD96KhDPGWIQ6ieXmS/s+oafQ1OILGVl63nWeNv+vgBDxCUriFPmFsk vNDZO4WU7OyvHpo4wihXrj4oYFRB9A1OSfgz20g7UslS275ZMyZWopvCq4/hEWT7TYtr 9rgA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=bzy2ZvOG; 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-64244-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64244-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=2; AJvYcCW1/F+HAkmryNXeQBwiXDp9Kqt+AdqvPF+5jyvmpIFSJjfXUu4fmX5eGV0gcjUT/j3f8/1642x2wTiZ5abqR3M0utZ7mw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id u17-20020a63b551000000b005cd90b47495si2529535pgo.264.2024.02.13.13.06.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 13:06:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64244-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=bzy2ZvOG; 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-64244-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64244-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id AFBC0B21EC2 for ; Tue, 13 Feb 2024 21:05:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 274B8627F7; Tue, 13 Feb 2024 21:04:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="bzy2ZvOG"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="dL335nHV" 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 1073362156 for ; Tue, 13 Feb 2024 21:04:07 +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=1707858249; cv=none; b=U5wXBWlDuf39qFsDhvL7QQWLBTN2gNRZaP3uFaGV3t+B6RD0sSkLgw6e7wR+ly9Vd81fI/FakJVKCs5m/HtRFLMLtmf206ZvCd5dA96/+fsTas6A8WFW37i/Omwhdn6QBtjnm9ZbTCzSWjllXzqOXQl5kHKQqi4oG502KmQK5Kw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707858249; c=relaxed/simple; bh=Llmx1y+tansg1E/Nq2ZhT8Zi+oyVTBjaKh4Q99ryi8Y=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=sR8Bm5Z3BcWDRAyPRUDefsc1rR52Xd0cUyq3ljteeUolUa2tY5scUBXg83h6fWmahLcb3s9HnDt1sZJyg+chy/bl5lmKTW8nH333ZM/Xl41g8toA89jYZTqEVec4Iv5wcWjAETBVJ3WdQPQa1+Y946MsvKtbYaiGcAKUywnwEMU= 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=bzy2ZvOG; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=dL335nHV; 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: <20240212153624.768188958@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1707858246; 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=ZRJkzOwB5/1YL71AgKNjiEjK5SJG7QnNpgljQo39jQw=; b=bzy2ZvOGowCps5I9bCqO5rtcFKyjSdrmAPi4IYLghO9yV4JQ/o+AY4Q1QWra0oosFL61ER 7ZKZ45RMv9Qcc+H81K/z6amDNvuOYDH8/+a1fjMyvhpcB8YyS+2FGv/ER8dF6Qp2zMKAA8 IQVwedCgDmaJhqKlUnc5JecmHde6M7QuxCut7HKGQqCpwgGttPAPI9bjaxwAUbHkxHBS6M 4cMB6wS34GCK5dpq1pkhAfKuorwqnl6VD3U2kS9TUPZ4zdMoT1tPI2Eobe1C/ltRKKGdgp mj9A800W/I5GCZhLpjOMYQMgsdS5WS79LhfoAyjfeaRq+67xN5Oxthu+G7SUqg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1707858246; 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=ZRJkzOwB5/1YL71AgKNjiEjK5SJG7QnNpgljQo39jQw=; b=dL335nHVU9/g+Tgf6/Cvgd3H3oXjShjugxT2iwKIxe6J3f+GIPshUIb5kyaeaX9eWtPh6p X29I5lEUmnkLihBQ== 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)" , Wang Wendy Subject: [patch V6 05/19] x86/cpu: Move __max_die_per_package to common.c References: <20240212153109.330805450@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:04:05 +0100 (CET) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790819345279997786 X-GMAIL-MSGID: 1790819345279997786 From: Thomas Gleixner In preparation of a complete replacement for the topology leaf 0xb/0x1f evaluation, move __max_die_per_package into the common code. Will be removed once everything is converted over. Signed-off-by: Thomas Gleixner Tested-by: Juergen Gross Tested-by: Sohil Mehta Tested-by: Michael Kelley Tested-by: Zhang Rui Tested-by: Wang Wendy --- arch/x86/kernel/cpu/common.c | 3 +++ arch/x86/kernel/cpu/topology.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) --- --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -75,6 +75,9 @@ u32 elf_hwcap2 __read_mostly; int smp_num_siblings = 1; EXPORT_SYMBOL(smp_num_siblings); +unsigned int __max_die_per_package __read_mostly = 1; +EXPORT_SYMBOL(__max_die_per_package); + static struct ppin_info { int feature; int msr_ppin_ctl; --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -25,9 +25,6 @@ #define BITS_SHIFT_NEXT_LEVEL(eax) ((eax) & 0x1f) #define LEVEL_MAX_SIBLINGS(ebx) ((ebx) & 0xffff) -unsigned int __max_die_per_package __read_mostly = 1; -EXPORT_SYMBOL(__max_die_per_package); - #ifdef CONFIG_SMP /* * Check if given CPUID extended topology "leaf" is implemented