From patchwork Wed Aug 2 10:21:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp362476vqx; Wed, 2 Aug 2023 03:48:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlFmkwsl3UQAmjTfZaPIMHaLCKawxUoVFN9CLlH7IN6B5bwd4WeUXpCTrxl0DjFFG9oBAc8j X-Received: by 2002:a17:907:7885:b0:99c:4ea0:ed18 with SMTP id ku5-20020a170907788500b0099c4ea0ed18mr607435ejc.8.1690973322665; Wed, 02 Aug 2023 03:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690973322; cv=none; d=google.com; s=arc-20160816; b=a3WM67GLu9f734SF5CL4iRXj9+imQPJrx5Adga1fQOn28cSegp1I0FGSzGDS/eo/4R 7s2Lgh3+PNz3c9vfFIVXB2tkJZZDdxEUzqRHbK+DLL/pYL24PSHhRvCJSsS6Z0gLOLkW fAIPrHOWVAcLngohLf7mloBbFvZfX8meBidX3/849+QzFAObKOhmf5rDDqDQAfahx6ft qiwaLGqNfv/YoKHWTfDoWyQ9TCltJ2B0BkdGS7KhGpUmMxJ+QMEwOsJcch3keFWgELwF lBigPgyCMHai65dqD1+5i5ePAdoN6iR3N63gCXGydAHSiG5o8S6YT0v5WfC0iH7sqci5 tbTw== 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=R30kgmHCGWHq0zLlNoJY82eQjQTUWAtGppL/g8UfpDM=; fh=O9JPtEgoXN20WvvffwC9vht4C9mlV4cjm0SKbEbqoG0=; b=LpZBzfaA7P3oDv5+51P8fuu3FVG/J36cK4BAwQXb1AbE79pQq/9yEx68mveYTuxd13 bwPUaVbOT7MD1P1SGydyLmsR+kMGhUsVHVW2y/WviYbBcNjiN6HBPaDFb43RiYk6azWq cybf3upgJ4zEc1mTmcIV4IbmoIuR0ye+m9qhgMhVY37raJsu+sBZlW3BrZ25ZJzU8cdj PcTFLtzM47JPpWTFbhBNZ+nSTfGKpOd6sBvN+OxHwLTgmccT70lBaiFWaurg3BFRPpfe 88ShbOSBN7+Z+6nJIvttGsUdajlub7xQIyh3kJNrSrQ7iZaT7oYHsgrw3feOw1q8coNZ qbPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=mZl1oUzD; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 kk20-20020a170907767400b00987dc76f82fsi5560323ejc.285.2023.08.02.03.48.18; Wed, 02 Aug 2023 03:48:42 -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=mZl1oUzD; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S234093AbjHBKXz (ORCPT + 99 others); Wed, 2 Aug 2023 06:23:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234303AbjHBKXE (ORCPT ); Wed, 2 Aug 2023 06:23:04 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 102EF2690 for ; Wed, 2 Aug 2023 03:21:52 -0700 (PDT) Message-ID: <20230802101934.206290194@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690971699; 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=R30kgmHCGWHq0zLlNoJY82eQjQTUWAtGppL/g8UfpDM=; b=mZl1oUzDzgeWX3rmxlgRdLTiQDbPFmeO0/A2HrRvkAERAez2aawbNHcoB9IjICYykqsGkJ sURpz8prF17M1VTPJ4WRXF2SbyVBmnlYY7xtiOY5xjwiy8hp2o1iHZdftbxBuH7ML8bbek Zoc8j9gEFHuYzRaemTUQZiC4o624zTtPHxMFJCcGR1AhAWE0et3Q0QYWgmNMFnhKWLQxsO VmjzLLHKKim94T5m6eF6UhswcTkosd4M7Nsxi/vd+7jszUmJt0AS2jKZ0ill/UEjzBNyFR FQsWTUmLXlFkOiEi+BAmi3lwZiH8HuoHpCN3RUi7YaOkKN3r0P9Sx1DLkQFuOA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690971699; 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=R30kgmHCGWHq0zLlNoJY82eQjQTUWAtGppL/g8UfpDM=; b=hBkkqc1sMjkOr4/4dzFwd5yWmJS/klD+OeiB/zox0MhLUbSboB2A2tw5Oi2VtfviSCjtaG FeiTZjYsCbv6rTDg== 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 26/40] x86/cpu: Move __max_die_per_package to common.c References: <20230802101635.459108805@linutronix.de> MIME-Version: 1.0 Date: Wed, 2 Aug 2023 12:21:38 +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: 1773114042502080378 X-GMAIL-MSGID: 1773114042502080378 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 --- 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