From patchwork Fri Oct 28 06:41:55 2022 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: 12104 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp659050wru; Thu, 27 Oct 2022 23:44:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Lu7osRaLg+S3EBT59Y9HOfsCIHaYklt3nFJ8SPtod1xGzXfxClKu5pwuUwC9smhzBliXU X-Received: by 2002:a17:902:f684:b0:17f:95cc:af8 with SMTP id l4-20020a170902f68400b0017f95cc0af8mr53416967plg.91.1666939471975; Thu, 27 Oct 2022 23:44:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666939471; cv=none; d=google.com; s=arc-20160816; b=hF5eNpN1JNkOt/toNMHQInibXUcxoWani3xeJIcESXUfxDFeBSEbI/Y2RtsjPyPbeo MBSfcN/8RODjYzrNQTrAJxsU151qFHI2dynLR3JzTflxTYb93fkMXgMV6vwPKAK9M7pf 13jam/Kok9y+x2IF7WPee8k68XntjHPesniOttBqQ6RG8gVtxK5BsDqZOXaQVRMFNdYA PUO1kt2VF5O8zLt99K2xhBcqFuNguN5DjYnYpVWW8tpmmeUozl7Kva8OiXAirsO/yWeU smPSCjPm8MvMKrVb8zDgL/uHwfcNUkEHg0G3+AFf1kKiYr+s5EiIL/dmGZrysOyO9wed 44AA== 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=jAvqYP0TCdz/Bz6UkmQLxlYDhfOaAfeZWA3cDb66y0U=; b=CpG1N/RCsjhow6+llxCosvd4TVaN9VfogK/+akslMUV1FrzQZP+gN3CXQSIppCY0ad hxYH76nfxWGRRdZIYD2oUe6FHF4OS1zkiE16sTmXiXQw9Q0BFXwqrs0tMhS6RspAuQlE lF2UDd19JjhUBULpPwv+s5lP7tFidY8Zcm95WB0p7GY1yrOSuOp59klACURW3OHbQ54K 7O0hYc1nhKcxWZNMiPZHuor4e54UctGVKkqTjY2Qdps7vplzvAsQRQc9ZhF3okQF+NP/ ySMHlMg/ixblz9gUvW7YzFXM5rsA/7wObqcfxMBBw/0yF/WKvO/5l7csO983DvNEdPaQ tylA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=dM2u31vZ; 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 n19-20020a170903405300b00186f1c070fesi2704959pla.181.2022.10.27.23.44.16; Thu, 27 Oct 2022 23:44:31 -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=dM2u31vZ; 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 S229634AbiJ1Gmf (ORCPT + 99 others); Fri, 28 Oct 2022 02:42:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229853AbiJ1GmA (ORCPT ); Fri, 28 Oct 2022 02:42:00 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A2F754C8C; Thu, 27 Oct 2022 23:41:58 -0700 (PDT) Date: Fri, 28 Oct 2022 06:41:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666939316; 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=jAvqYP0TCdz/Bz6UkmQLxlYDhfOaAfeZWA3cDb66y0U=; b=dM2u31vZFm2ca1CcmkOoPPFJ66Ez4oDarwAieT+FkLR25axxkpurtnHuOopgG1bgaoKUoj 71ewee/nLAlCDZ/z8Tdw9mOCVmhntjUvtykh7l2WnfaeiBg26ACK7AN4pz9bvxBXrlN98E itk30DkR6YHt9u/FTxbI0NtjIYrtOCe1vuI/o/+PFjbMXn8VxR5Bv45MaWDKGKXwtuMTD1 lMgY5Okjz2jAtRQkBrE92FVPRU0jbIadCJ31fSmnRC26voviutWb4oeM2HUFP2siTkwpnC o3as4OwiZ2GshMUJja8PJ+yFXSaEVk/wLZ5+PFb/Hpc2MJR2AqAr9aaO+W/DcQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666939316; 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=jAvqYP0TCdz/Bz6UkmQLxlYDhfOaAfeZWA3cDb66y0U=; b=ovWRS4KyHSQ9J81LiYibBV6fbOKelRKVbvRDW3AIzQNwy+NmMlDouF2OWc8va/q6wgaaaB odqcSicAVzuj06AQ== 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 Raptor Lake Cc: Zhang Rui , "Peter Zijlstra (Intel)" , Wang Wendy , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221023125120.2727-2-rui.zhang@intel.com> References: <20221023125120.2727-2-rui.zhang@intel.com> MIME-Version: 1.0 Message-ID: <166693931539.29415.9211825739101668046.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?1747483099326089053?= X-GMAIL-MSGID: =?utf-8?q?1747912723825106478?= The following commit has been merged into the perf/urgent branch of tip: Commit-ID: eff98a7421b3ee73d62268115ffa5bfc0ba94544 Gitweb: https://git.kernel.org/tip/eff98a7421b3ee73d62268115ffa5bfc0ba94544 Author: Zhang Rui AuthorDate: Sun, 23 Oct 2022 20:51:20 +08:00 Committer: Peter Zijlstra CommitterDate: Thu, 27 Oct 2022 10:27:31 +02:00 perf/x86/rapl: Add support for Intel Raptor Lake Raptor Lake RAPL support is the same as previous Sky Lake. Add Raptor Lake model for RAPL. Signed-off-by: Zhang Rui Signed-off-by: Peter Zijlstra (Intel) Tested-by: Wang Wendy Link: https://lkml.kernel.org/r/20221023125120.2727-2-rui.zhang@intel.com --- arch/x86/events/rapl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index 165c506..fea544e 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -808,6 +808,9 @@ 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(RAPTORLAKE, &model_skl), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &model_skl), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &model_skl), {}, }; MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);