From patchwork Wed Jan 4 20:08:28 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: 39076 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5332849wrt; Wed, 4 Jan 2023 12:10:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXsY9JM8VDL7dhmVx2FsBVT1MhJ6LJWQlsuibBBMkIB9RfwsT3R0CedTJMJCP8A+bkATkj9u X-Received: by 2002:a05:6402:550e:b0:45c:835b:ac64 with SMTP id fi14-20020a056402550e00b0045c835bac64mr42604639edb.31.1672863013176; Wed, 04 Jan 2023 12:10:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672863013; cv=none; d=google.com; s=arc-20160816; b=0hBYea8peRav9wfPW2L7a79zRlpydbKOmSvv4RubdgmzAttgDnK3mPMkGs/2QFuuyI s3S3OQc24oC2yehOwFCKzjtOMpU8P/KPAn8OH3BRx7UYl+ggT7NHPqfo7erT8nToggF8 g597uzlaydUBx5AFxVAz5yQVHXq2ZUfqUhRb241d64yvNaCJQDX574qKWNIyNoVjSQ2n zYb9v7JW/3pOELrPgILjSufUAkALXvJSJ32mwd0CAtsZnR4/oMz4/MvCyqZD/JzNVhYa eNbJexHBXUOFu2kSSXnMNR1FW/hl91QI/CqD3f01L3sf5hktNUSEjPoBo8nu9O2buRnZ iFww== 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=E8t7dQIyWK5WQjI17E7L9fh3dy/gkCN7U/fHMiEQLO0=; b=ICwLmIqMZA1P5O1jGFnzvQCAVnpeNwbB7Qc9sUOIpG4nQZ44ue/xifKODYoyVndvzt D+BgGe6niNPhaZjVFANJaDviZuIUTCQgFExFFcEk99S0oikrhrRVw/wLwknAGNEAjoaZ c0LgR0KQjaTqFH6+7sw02Z3DVbQ+tWAVuHvnuxMhYjdBi7NkP3D/xXhfFmuzYRKahAN6 qyb/BhfsQWgqAeYdBATEyVwzbT3A9/C6TPYaZJnbpvZn0se9GoJMjCTJEMgoDbiiB9xp /KZC7G5xk9OhdGb/WnSt5JsgWvK8khtBsKksNMB53VRB346VlR/3lT1wNrw/5Y43TwUx 2JVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=XIwZSc2V; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=pxeEgIEv; 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 q13-20020a50cc8d000000b0046ad8dfcfbasi30811081edi.344.2023.01.04.12.09.49; Wed, 04 Jan 2023 12:10:13 -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=XIwZSc2V; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=pxeEgIEv; 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 S239818AbjADUIw (ORCPT + 99 others); Wed, 4 Jan 2023 15:08:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239830AbjADUIc (ORCPT ); Wed, 4 Jan 2023 15:08:32 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F687FCF1; Wed, 4 Jan 2023 12:08:31 -0800 (PST) Date: Wed, 04 Jan 2023 20:08:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1672862909; 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=E8t7dQIyWK5WQjI17E7L9fh3dy/gkCN7U/fHMiEQLO0=; b=XIwZSc2VoNql0e7b1X4+VX0T2V0MW6Ixy72YlraZvE2piUUPT/xoyr7dYd5O3u0Pg+tQ7O oLx6Lpg53zSiPI2ubKGNHIVMKcRYubetPTUUlib98x92G0iBnjSXZbFrw8FA5bpB2qzcLd k7Jdp6bN/1oUi6Nudh0/LL7eXVRO+ZHdQewznFgI4AFOaBbuuVkkS+t3rAa5PatOytjF6f hzvFAX9u1gFugTAjHN7crpg6b332bA5W7uw+gi+8x30hQlrdss4gZr+3/Iz3Qnp57Tga4+ M9IMT8A3pPFB2S4DMWT/d0NbjUrE4u8m4/PU4Fw7lVKkDeGf/gsfn3hbGDxUaw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1672862909; 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=E8t7dQIyWK5WQjI17E7L9fh3dy/gkCN7U/fHMiEQLO0=; b=pxeEgIEvUuLF7D0Hxj9uqAlmvWA/STFGsOvre6UpHckKwmHDSgzq3ql8B94Z0sZjD/WO91 RccyTC4u2duqakCg== From: "tip-bot2 for Zhang Rui" 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/rapl: Add support for Intel Meteor Lake Cc: Zhang Rui , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230104145831.25498-1-rui.zhang@intel.com> References: <20230104145831.25498-1-rui.zhang@intel.com> MIME-Version: 1.0 Message-ID: <167286290849.4906.3624732511270016278.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?1754104124576531871?= X-GMAIL-MSGID: =?utf-8?q?1754124006759657998?= The following commit has been merged into the perf/urgent branch of tip: Commit-ID: f52853a668bfeddd79f319d536a506f68cc2b478 Gitweb: https://git.kernel.org/tip/f52853a668bfeddd79f319d536a506f68cc2b478 Author: Zhang Rui AuthorDate: Wed, 04 Jan 2023 22:58:30 +08:00 Committer: Ingo Molnar CommitterDate: Wed, 04 Jan 2023 21:00:28 +01:00 perf/x86/rapl: Add support for Intel Meteor Lake Meteor Lake RAPL support is the same as previous Sky Lake. Add Meteor Lake model for RAPL. Signed-off-by: Zhang Rui Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230104145831.25498-1-rui.zhang@intel.com --- arch/x86/events/rapl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index ae5779e..589c688 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -809,6 +809,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &model_skl), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &model_skl), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &model_skl), + X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &model_skl), + X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &model_skl), {}, }; MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);