From patchwork Mon Aug 14 08:54:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 135253 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2623631vqi; Mon, 14 Aug 2023 02:30:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFk2lea5yxE19xI17uqRIL7+/TQVrwhIJU1/qtqbjbYwkKJDT+INFLmMCQyiClnaf7B1fMN X-Received: by 2002:a17:906:9ca:b0:994:56d3:8a42 with SMTP id r10-20020a17090609ca00b0099456d38a42mr7822660eje.27.1692005458131; Mon, 14 Aug 2023 02:30:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692005458; cv=none; d=google.com; s=arc-20160816; b=O2OgcjTOLCcPBfzcmpsm7CB3uAKmEE5ltme8IbRmU7XEwL5jMi48rqaRw0FbXDfhga so/5dlPlO6Bkg/PSCMzVx8UNIzLaymjA6qu3GjOYIlEnRVjnVaWehM0WPtR1wjujSsiL fgtKoPwRLmnjeqJJYZWIjB8niJLOajQXydiVK+CEeGrd8EabYU1q31Di1UDdvIIoMyO/ sUiVPpD7NLBzhtT1kvbcz2om0FlSB5RmpCL9MXDMdHSvkG9wtNllYcEVAH2Ds9NnUwVy tFHHhAZtCFdRvk2NqOM2rvwdjFkZWMujnSupNz/WHAGLLPTSFrNx6Zp02GoQ6xNtyQ2s pj+w== 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=hGG18YRpAzYxpKTnwH+uiIi5fZmUPp4aoRZn/mz3oxM=; fh=vmKIJtcbtoHWhyuxI4oEq8r1SWZ2V9Rrbp1Orw2DxqA=; b=BoKEZXRGjjHigg6Bv95HY98hSyqGN7kYHy7qBoRGmocYHLh3U7l6yH3XEakv2mGzL1 NnnkIs7Yh7bn8iwwRl3uOavh89UnUZFzjom/agSSQh91zJslnzFHvicpfm3pENUD0rXX rv19pKajP02GYcwcVJiZY4N0wc8hyM1WeKDkPuT4kCuzwBNKn3v0QmmPMAadeFRZzgZ7 p+nX1fkwqYGvRzlrTPzCD8UDiFMbsmEnYpzur4a+DT45IdW/55psbaG78guLBxLn/01v SClOMaBR/U+gbzAA8bHgDK61A0IgSzRjqZ3HqQFBWaYOiPHoGxjo3CqOFL6b04OiLMSf hkAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=UUYvQhLG; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=5HpOfSb2; 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 f4-20020a170906824400b0099bcb54fae7si7164576ejx.512.2023.08.14.02.30.34; Mon, 14 Aug 2023 02:30:58 -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=UUYvQhLG; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=5HpOfSb2; 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 S235268AbjHNIz6 (ORCPT + 99 others); Mon, 14 Aug 2023 04:55:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234862AbjHNIyT (ORCPT ); Mon, 14 Aug 2023 04:54:19 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 695F51AA for ; Mon, 14 Aug 2023 01:54:18 -0700 (PDT) Message-ID: <20230814085113.646802453@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1692003256; 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=hGG18YRpAzYxpKTnwH+uiIi5fZmUPp4aoRZn/mz3oxM=; b=UUYvQhLGJ6lL+hVqyH0uLzifGsuHpLWV5WLTrOxoxplN9w4vxb+J/Kb8Z6aABnoZJsuQ1k xCjkO9P1cyj7ygc8QmIOq2Gfk0EmlO6984UcntvOsmEKuriq/0IxNkGMRBtcN8vQwAeHKZ xLUnSQ/U4WHtkPYHz+/F6Vk5RrnqjKbHQCcVdDO3nBcQFe4MxuW9zyG89pI4WtxyAKJduv f6nsVDTAIv19lwp17ceeHv9k4kijfmNDf503rumbEzr3chfvQcxWR08SHYq4AV32cSIzA4 gFSq4kTgKYKGvTbXN5E2YqyuuWEcAxpRkPiowUn68ehiPqx4fDwJDXNDOFZZVQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1692003256; 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=hGG18YRpAzYxpKTnwH+uiIi5fZmUPp4aoRZn/mz3oxM=; b=5HpOfSb2ftYMCvkwTLtvn7F/YzsGinTG3ZYP0XQJlKsa1j1PTuBDstXsvq4yOsbSAtnzci 3iWS3gNDntyx1ECQ== 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 , Pu Wen , Qiuxu Zhuo , Sohil Mehta Subject: [patch V4 27/41] x86/cpu: Move __max_die_per_package to common.c References: <20230814085006.593997112@linutronix.de> MIME-Version: 1.0 Date: Mon, 14 Aug 2023 10:54:16 +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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774196315412640008 X-GMAIL-MSGID: 1774196315412640008 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 --- 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