From patchwork Mon Jan 9 11:15:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 40802 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2096152wrt; Mon, 9 Jan 2023 03:18:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXuf41zmyCEwDqNslCAZ29XiqgINaYW7BNYDU3s3+cfCT24u5PwBxwOI88wko3Rk/X3nvpgK X-Received: by 2002:a17:906:94f:b0:7c1:4f7c:947f with SMTP id j15-20020a170906094f00b007c14f7c947fmr57548676ejd.72.1673263095979; Mon, 09 Jan 2023 03:18:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673263095; cv=none; d=google.com; s=arc-20160816; b=b4IBAot57AyoO4DB5evZfBB7o3urRap/RE14yqdhIplbdvb49lRIqkRoFxqlEUYKg2 mwTbgGitXTA1UO1liMCEQ+AJbA5R3pVIE63tBeGGQKerhkmkvLFAOIPcXMwHqVeyxFlD yhKqjSg4RaPCmpO6yEUu8Mha9GvHH0XidnRJUqkp34zyaAuw+jlgj9wO1MCUIPB0k18O fCILeMmN0RfFXFB6hyy/H5lN9lzwJ0P1PxhAOqczdVYH2cu40Tk10i835k7p0JaR+hUX S5jlbFm1xoDuNbVi4OfQCTM8nyYHAxvYA/PYtG5xB7PFVyThtlCrmK68Lp3Q+S+Gbc0Z KeOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=fwBBNxv7C7lDprLRZa06JGOtQtbPsAWbCJVlihexc7Y=; b=u6D3xPJ79UBmdJI8yqA4XxHKRfevkszrseMLfuixzEUjBQFlD2gezdb82qd/1UdHgS m1Z3x3wFlSgjv7JSXwwIAmHJmiRILCDQqSOwNSH/8E4ut1Uxu9pMyBEVnWZTUn4r31nR xfOwRi0ys15Fyimhk+9gy3wmgGNfjXq+31Mdk2gGFBT+p/zz7unl73cuPELxX3tcXAV3 bMh090Vv/kqx9PDnPGM7XVrbCBjF8Y376+RkuWorloq+6yC37M807kldMnE1K8AalX3z CSzs2+mpGf8ec1oAWVpkCQUXIekuwEbVOz8ZQ/c0S5dqg2CSzhnc/B/CD5YlOZ58U6Oq dbSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SzEjD7CG; 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 gs15-20020a1709072d0f00b008310ae17418si10247042ejc.594.2023.01.09.03.17.51; Mon, 09 Jan 2023 03:18:15 -0800 (PST) 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=SzEjD7CG; 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 S234085AbjAILPt (ORCPT + 99 others); Mon, 9 Jan 2023 06:15:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233846AbjAILPJ (ORCPT ); Mon, 9 Jan 2023 06:15:09 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9E78140B4; Mon, 9 Jan 2023 03:15:07 -0800 (PST) Date: Mon, 09 Jan 2023 11:15:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673262906; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fwBBNxv7C7lDprLRZa06JGOtQtbPsAWbCJVlihexc7Y=; b=SzEjD7CGHGwviEQ+tCm47RP4nW39pKZ5twCFoJHLeQ8L6OtX7imSO24iFKARmDJUAzc4Zb Kn30L+5hO+LO7S5HXGcaoMlP/uYBQS+IdYO+EBcBBCmqOfOdMNW5aJQt6L62M0Ugs5Zcjz ui5fkgU/m6GZcH4SXEGCzXk/9SLrMbpBcnigxA7h2UZ58VLKML43VGVx5Hg9Y//ClGHGIL FZImiONxQVTbh6tQ2afQTnsHBIBOhR4OC5wP662BpZ9Voj7OENrOl0x4gafPvycBy8J5Ry +EadhQCwt+VX/YivDwDlHBBDyppAtoxvTdxKKIh3rXfUiUoTfjgxKxQFvrFj1g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673262906; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fwBBNxv7C7lDprLRZa06JGOtQtbPsAWbCJVlihexc7Y=; b=AJpkU9WXTnhVydkstoEiAcEJ4o78etonN8OpzAQJLbP2WBla75socWUDobF8c+4VyLFoHL 5z1ud2FoO6CG52Aw== From: "tip-bot2 for Kan Liang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/urgent] perf/x86/cstate: Add Meteor Lake support Cc: Kan Liang , Ingo Molnar , Andi Kleen , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230104201349.1451191-6-kan.liang@linux.intel.com> References: <20230104201349.1451191-6-kan.liang@linux.intel.com> MIME-Version: 1.0 Message-ID: <167326290572.4906.628148987099820944.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754124367734441599?= X-GMAIL-MSGID: =?utf-8?q?1754543524288210750?= The following commit has been merged into the perf/urgent branch of tip: Commit-ID: 01f2ea5bcf89dbd7a6530dbce7f2fb4e327e7006 Gitweb: https://git.kernel.org/tip/01f2ea5bcf89dbd7a6530dbce7f2fb4e327e7006 Author: Kan Liang AuthorDate: Wed, 04 Jan 2023 12:13:46 -08:00 Committer: Ingo Molnar CommitterDate: Mon, 09 Jan 2023 12:00:51 +01:00 perf/x86/cstate: Add Meteor Lake support Meteor Lake is Intel's successor to Raptor lake. From the perspective of Intel cstate residency counters, there is nothing changed compared with Raptor lake. Share adl_cstates with Raptor lake. Update the comments for Meteor Lake. Signed-off-by: Kan Liang Signed-off-by: Ingo Molnar Reviewed-by: Andi Kleen Link: https://lore.kernel.org/r/20230104201349.1451191-6-kan.liang@linux.intel.com --- arch/x86/events/intel/cstate.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c index a2834bc..3019fb1 100644 --- a/arch/x86/events/intel/cstate.c +++ b/arch/x86/events/intel/cstate.c @@ -41,6 +41,7 @@ * MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 * Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL + * MTL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01 @@ -51,50 +52,50 @@ * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, - * TGL,TNT,RKL,ADL,RPL,SPR + * TGL,TNT,RKL,ADL,RPL,SPR,MTL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, - * ICL,TGL,RKL,ADL,RPL + * ICL,TGL,RKL,ADL,RPL,MTL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, * KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL, - * RPL,SPR + * RPL,SPR,MTL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL, * GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL, - * ADL,RPL + * ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter. * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, - * TGL,TNT,RKL,ADL,RPL,SPR + * TGL,TNT,RKL,ADL,RPL,SPR,MTL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, - * KBL,CML,ICL,TGL,RKL,ADL,RPL + * KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, - * ADL,RPL + * ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, - * ADL,RPL + * ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, - * TNT,RKL,ADL,RPL + * TNT,RKL,ADL,RPL,MTL * Scope: Package (physical package) * */ @@ -686,6 +687,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_cstates), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_cstates), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_cstates), + X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &adl_cstates), + X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &adl_cstates), { }, }; MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);