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: 39075 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5332577wrt; Wed, 4 Jan 2023 12:09:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXs4KRj4T7kfEH4y9RcewQqCBrUI6605Ee0xLJiVtkLgb35YqO8sGb3nbH7evuSA6Hc61mhR X-Received: by 2002:a17:907:8e87:b0:84c:a863:ebe6 with SMTP id tx7-20020a1709078e8700b0084ca863ebe6mr17480277ejc.43.1672862973620; Wed, 04 Jan 2023 12:09:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672862973; cv=none; d=google.com; s=arc-20160816; b=PGSUkFw7jFkwtU/ygqZw9HhRaAG3DGw6G4lDTNGZflL16Egq2QxJ1hnxyY/v5NIs/6 fMRkLQb4qh2clD1qdxUvX16sxBxNLd5xwsu35yXhxKVoNSIH/LXQr6XAM1y9mgj1AUNz VKiLRwVKlNaVBF21ktD8rpW9kiSs4tW0EIF5tRQWoN5T+V8iSv5eEXEoGTnv8cpKgHeF evZpz1uK1Ua4DzSYULNhyacSlJGJHgJ5VNaF+ae5xFW71G3wuoHZ6gANHlD7kXn6CboP Glj8MWiM4ndJVY3X2Ob6fTvKKlIyu62TyRbRxTv9OhDQ0Ba8ik44jpLCd8rQeqpcYbw3 b0rg== 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=LZV1obDgxLjUh+fB0UGnxusAPClwEZEjOfePLcRM4CY=; b=M9bdwsTRYavGs1v9n/1vh5zUhrU7DaVFdkIdEsyEZwXlvLH3fg+HE+RqHa0hYuB8jH 85uzudlJFwNlEhR2DPZhQxUaV//xBl3vmcsEOiX9rh3oql66aqD7Gcg0pkH5+eL8Rdzn Slwg6JVUSg4pe/JByuRHeXzrFR/RUuJD2Y2wShIpdFc3LvHLXZ3amrRYWYV4ECnvLDd/ Mms6xCpzdS4F5qGU7Qg5UjRE+HlUaj7EADdXxqg4Q+OL46WnIAG7Mw3A3dq38OZeSl8l gX+TNmRAmln2Tep/Sn4N2iFCrye8cc3U/dlyQalKT3UWkKCw2OeOy1iHhAMFPCLM/p1k 3lrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="k/rCnHue"; dkim=neutral (no key) header.i=@linutronix.de; 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 hs16-20020a1709073e9000b0084b9b15e1cfsi33643890ejc.41.2023.01.04.12.09.10; Wed, 04 Jan 2023 12:09:33 -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="k/rCnHue"; dkim=neutral (no key) header.i=@linutronix.de; 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 S239756AbjADUIs (ORCPT + 99 others); Wed, 4 Jan 2023 15:08:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239845AbjADUIc (ORCPT ); Wed, 4 Jan 2023 15:08:32 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3615111C32; 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=LZV1obDgxLjUh+fB0UGnxusAPClwEZEjOfePLcRM4CY=; b=k/rCnHueBbd6pGUmTUVjyCBT0/2e8dcKKFO0M07tsc7gisWAKoHvihQ3I9/0E4uIcBJfxm FyUt3eYaN+NyIm5RBDMbe3N+uSbiOVynZMvRQnw7uXBJ+z8pGULrQFUWs7rytGI4pReIyR t/BKjUdJnbwW4UToGoH6XF2xqC4U9aP/sb1g0FV2GvvaQhcY54n+4UEFlqi/qrlRARrg5M qeadTf1R06HOXECYUaPyK4Bmso+u3FIoI+1W74dona0Q6mCOTvrP9inhGosYikfoQmQVBj iRyiW6VjLcPdilTB/VnVI0C74AkCmSpa1lSQHbujV/bFHoHYyryCHsz7VBU6Gg== 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=LZV1obDgxLjUh+fB0UGnxusAPClwEZEjOfePLcRM4CY=; b=ow3Ju0U442OpvGTyRquk+kpiO9JcBVBKA4KuOBtgjzpU1XqVYfsz/ErW/KslYfgeN6jczZ i1IL6o7tQ1E7L4Bw== 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 Emerald Rapids Cc: Zhang Rui , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230104145831.25498-2-rui.zhang@intel.com> References: <20230104145831.25498-2-rui.zhang@intel.com> MIME-Version: 1.0 Message-ID: <167286290814.4906.5046212985244200585.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?1754104108132359748?= X-GMAIL-MSGID: =?utf-8?q?1754123965730970355?= The following commit has been merged into the perf/urgent branch of tip: Commit-ID: 57512b57dcfaf63c52d8ad2fb35321328cde31b0 Gitweb: https://git.kernel.org/tip/57512b57dcfaf63c52d8ad2fb35321328cde31b0 Author: Zhang Rui AuthorDate: Wed, 04 Jan 2023 22:58:31 +08:00 Committer: Ingo Molnar CommitterDate: Wed, 04 Jan 2023 21:00:29 +01:00 perf/x86/rapl: Add support for Intel Emerald Rapids Emerald Rapids RAPL support is the same as previous Sapphire Rapids. Add Emerald Rapids model for RAPL. Signed-off-by: Zhang Rui Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230104145831.25498-2-rui.zhang@intel.com --- arch/x86/events/rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index 589c688..52e6e7e 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -806,6 +806,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &model_skl), X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N, &model_skl), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &model_spr), + X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &model_spr), 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),