From patchwork Fri Jan 6 16:04:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 40181 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp899500wrt; Fri, 6 Jan 2023 08:07:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXt1PbEKwDupApHL1yttw6pZhALF1uzg6ud8VWrDkV4JwHYwjIfP7WKuPmoQyd3oFxnvYplk X-Received: by 2002:a17:902:b609:b0:192:e9cf:93ba with SMTP id b9-20020a170902b60900b00192e9cf93bamr10124830pls.12.1673021254979; Fri, 06 Jan 2023 08:07:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673021254; cv=none; d=google.com; s=arc-20160816; b=tVM8IxMELCk2l4pqeqLc53sVBV4udd1NuvS4JFMxxXts4z4bHVIvckHYVtGo24/vul Or4jBhViTXQO2Mu1Cxg2NDBE+BVoNTQiUw+HV6LvywPCQc1kq51cA+djy0d0SEuMa8Sb ZUmdPnz15cugzhPbtEV/JU/c74w2FLk/ub/qf2enovWriAJzSkjSLDp4K45/wrh1604M zLQNqOxpWrBxa4TLgYBFgwSOgOc6Ind2nJQZJt7P/spCzxdMcDmwad8WEFCpykAePjHA 4wfryhkK37SODyzDaDPhWq+tyA4jwQEBSEBCrS2U0KXcBzNqKKJJjEUH2MA3sFMq5SM7 D3OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=dGvy1q56CMuhD8Ppi0PEl5xCclvDTw+F1cWKhgRw3qM=; b=aVQBDWxR6naUhwpMdgWIM/utT4ZUg3xgMEtnJG50InJNLGlF3ck7pwLcp+urD3YBTR aIQnfnHDgyA9aZ3LlgDOaD6U0SdNDErzvFq/ruY1jcBESxOVsVYXnSLbVsOh37+7/qaX P7fmkKgn9t46HtT9maSCfZX74TAA44GhYdbkLl7J3SE88/qhCAhRKSiaO8qolDuZDzhj JMsqDL1ryei0KPSSLhoi66bCaQZUg6Ait1/Fad46fJvCsPt+Y/pAr9StE9JmgytH59W/ U84U/Dk/tuBL8FclVzEpvQZRsbe7jpNdbIHj0BcNj3Ezld0oUbHdPm0Amc+14nH04KWV zX8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lcGCgygd; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l8-20020a170902f68800b001895b69a8e7si1503377plg.179.2023.01.06.08.07.21; Fri, 06 Jan 2023 08:07:34 -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=@intel.com header.s=Intel header.b=lcGCgygd; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234121AbjAFQFL (ORCPT + 99 others); Fri, 6 Jan 2023 11:05:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232747AbjAFQFI (ORCPT ); Fri, 6 Jan 2023 11:05:08 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BA106A0CE for ; Fri, 6 Jan 2023 08:05:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673021107; x=1704557107; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Ri+4ibZMX3GOsl5AyTBUXhX5n8y+EO6HdQPGGFh1onU=; b=lcGCgygdx/a9fFeH9Q2dE9fdf4q3TrgsKIa3IOqt6CftnnUqItwawo/5 XuMVmFcJFuK0XI1n/HFuBhQ1jecurVgrW5kGPSz+x2n6zG5Jn+NqCta7e kMJJ+S+cHFGr8ecmvh927COIUCZqLCfnM18PTTeYPrurbRJnzrXm7yuF1 o1UdAgC5TL5DauESzSiKyd21p+4P8H2t30ogqc+NyC7G1cZsGCYVyWVy4 hWOEoZxh4VY5NS9DEFnKJJp3gQ7vus/8nWNFaXJqgG5hbWA1lBgxZrldq 04Opt/Se/lLHJK9Z/Cjm9H91tVioDKt/mS4vOoi0EC9d+K8gYKno5rDUt g==; X-IronPort-AV: E=McAfee;i="6500,9779,10582"; a="302199911" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="302199911" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 08:05:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10582"; a="633521613" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="633521613" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orsmga006.jf.intel.com with ESMTP; 06 Jan 2023 08:05:04 -0800 From: kan.liang@linux.intel.com To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org Cc: ak@linux.intel.com, Kan Liang Subject: [PATCH 1/4] perf/x86/intel: Add Emerald Rapids Date: Fri, 6 Jan 2023 08:04:46 -0800 Message-Id: <20230106160449.3566477-1-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE 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?1754289935316219015?= X-GMAIL-MSGID: =?utf-8?q?1754289935316219015?= From: Kan Liang From core PMU's perspective, Emerald Rapids is the same as the Sapphire Rapids. The only difference is the event list, which will be supported in the perf tool later. Signed-off-by: Kan Liang --- arch/x86/events/intel/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 29d2d0411caf..72943243c95c 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -6487,6 +6487,7 @@ __init int intel_pmu_init(void) break; case INTEL_FAM6_SAPPHIRERAPIDS_X: + case INTEL_FAM6_EMERALDRAPIDS_X: pmem = true; x86_pmu.late_ack = true; memcpy(hw_cache_event_ids, spr_hw_cache_event_ids, sizeof(hw_cache_event_ids)); From patchwork Fri Jan 6 16:04:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 40184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp899813wrt; Fri, 6 Jan 2023 08:08:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXtR3HHV2N1DMlBMs5WA6CdIg5CiPQIrDHESucP1DYDTFWgSeQzEdDFXQmGvcwq1oQUi2kS/ X-Received: by 2002:a05:6402:1c8b:b0:485:832:1e46 with SMTP id cy11-20020a0564021c8b00b0048508321e46mr34127793edb.23.1673021290794; Fri, 06 Jan 2023 08:08:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673021290; cv=none; d=google.com; s=arc-20160816; b=sUAkmscrAP5a5k5BCX0IwyhSLccsRG0VZiItFf27Ey+ZlVBQgagF9rrsd8JLPMVNcn Mnv5hiqhFi16eMEOMrJoNx1N1aSO3jfQpvxwBoGI7TEh4nI9S68PzxFXpjUw3mFsw3AO kBQ89e5EDH0U4/3yGMV4McWcZ0I6K3OgX/qmECdrskuCaO38CUybori7sCkBwojg1qtw dvQegwxR0kyFlql3vJqseFpog+n19b3koSULuFeHi9U5HrpRIianORZZPi1D94NS5xEQ MB7Yzy36pq/3ofFhh6Qc1xxLJ1KpgikamhRrUaWvnz/MtCQ/6HMd80go6nESXPBEcr/5 9Wuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hKO4kLTMbaWI3NpRgMQakFF4aUPrCe1Bf7fs60soCa0=; b=kdSc24EfqM8F7oce0VSwdkQEf78kMz23otswCrOoaUdePZ9OymQEUn6JsJFnyqUZKp c9VsmUOWs9LuLDGDn1D3DUV6idZPwOfbRekqvDeTwUKdUUnLZxUIjabcDE30MRncODb8 CDrnwBS6LE4qmEOEokVvEhilpiTeFH2BLbzEl0oEgnT4Z3UpqA8yLnUZA7iOc17mCq1Q rKqq4CHlK55B7IPUaExBEVeALHWtGLV+k/Bvy9AMPGjwTlUlh7yYVWAR44B/2k8EvELU abKRXMixwUksDJErFFrXB5yUUa7k+fLh783wMn+WSzqC5aiNCzINnezhLV68TJ7iGcfs gQfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=knqbR736; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d3-20020a056402400300b004520e27e5b9si2019646eda.626.2023.01.06.08.07.46; Fri, 06 Jan 2023 08:08:10 -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=@intel.com header.s=Intel header.b=knqbR736; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234509AbjAFQFT (ORCPT + 99 others); Fri, 6 Jan 2023 11:05:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233792AbjAFQFL (ORCPT ); Fri, 6 Jan 2023 11:05:11 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F4C1687A9 for ; Fri, 6 Jan 2023 08:05:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673021108; x=1704557108; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=N8BQmJW/oAXm+bI1+nTFQqfIbGA9USYM1aRY8ZY3K88=; b=knqbR736+8S7iV9dozv+Gu0tSqFyCIAnYtjkDPzf0LAlcly8xFYRr+9V kF7R0F8frZOD3YUON/OGfsytiMisxPKE8YpfJ1m03eMZwIhbThofoetLp Z1l/aBQRPlniwXGheptG4UvHiY8pTMJdhmBMgkBI68yWWwjmj7NBqpvvD vjr8baIWcad2oJC+nKYzoZIO/jONAGVslJNY31U5kd+CkrjFCtRpfOAHR FkuD9aj78vm4/QN4SwrskjNIZkGMjviC+wKcNOb1H5n3HLvuqVvYKq+mV 11itdKJgF+dculM3esUMe0lUvGwKleEN26nwhtdzJhXFlNltNtQqHqHzy Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10582"; a="302199915" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="302199915" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 08:05:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10582"; a="633521615" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="633521615" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orsmga006.jf.intel.com with ESMTP; 06 Jan 2023 08:05:04 -0800 From: kan.liang@linux.intel.com To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org Cc: ak@linux.intel.com, Kan Liang Subject: [PATCH 2/4] perf/x86/intel/cstate: Add Emerald Rapids Date: Fri, 6 Jan 2023 08:04:47 -0800 Message-Id: <20230106160449.3566477-2-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230106160449.3566477-1-kan.liang@linux.intel.com> References: <20230106160449.3566477-1-kan.liang@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE 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?1754289973112827390?= X-GMAIL-MSGID: =?utf-8?q?1754289973112827390?= From: Kan Liang From the perspective of Intel cstate residency counters, Emerald Rapids is the same as the Sapphire Rapids and Ice Lake. Add Emerald Rapids model. Signed-off-by: Kan Liang --- arch/x86/events/intel/cstate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c index 3019fb1926e3..551741e79e03 100644 --- a/arch/x86/events/intel/cstate.c +++ b/arch/x86/events/intel/cstate.c @@ -677,6 +677,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &icx_cstates), X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &icx_cstates), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &icx_cstates), + X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &icx_cstates), X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &icl_cstates), X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &icl_cstates), From patchwork Fri Jan 6 16:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 40182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp899551wrt; Fri, 6 Jan 2023 08:07:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXvM8mEHy15+3qJD05GPDW042Ys2P+eSI/7lKmxVLYhK8/yoeffl35MsQ4vGz+UVSK870aOr X-Received: by 2002:a17:902:cf09:b0:191:3e64:a5ff with SMTP id i9-20020a170902cf0900b001913e64a5ffmr77901231plg.68.1673021262943; Fri, 06 Jan 2023 08:07:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673021262; cv=none; d=google.com; s=arc-20160816; b=GDhs0GQ27VmUhLWBN/z8HK/SqKHmPecifC9GJYAWP/FaHzkwsk4G1M/Mo78aQV7md1 7ZewtdZpbXjZUNqaix5WluqGTwhmxYpbpGFLEkgyMM8WoVgzWWEVL6Nr6AOOY3JegN/q mp5PYw1bXk8lcX816KEgR561z+7JwdrRg2/E3j18vDJOeB6noFXNM48YqRI1uyaXrGLx NxHgRCJSkaCjt4KnuzE9TlN8g2wZr/UEP2H6No+rWXeURU5OkuuBFldSl4RYkRiGHex7 8eDM6O0oiZm/u/9Wu9ZIXHOTxEHZ5lo93o0KajU+KyIwJoVLjDPAyJI66hNvb0gwVUG3 EdtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1IXITGWUVFzlcMLU3vTnQur2aTvdhxx8om9lk33g6tE=; b=pV/rm+4Lh0PRwcdrfUuss+kbtTr0AIaO6hG3VAj7YS5XOYSdQUDj1egzZAIVH0K8l+ VfO4pt/nrgs9AXSj1cH6zG6p1mXTg1ghRGveUcnjpsaCJbiaPYO66vp0mzFw8LguLo5W lNMi+xJ621MoZTLPDGzM0up7KHbgbYOzuvAaGH4WnRpLzhnV9lAH3CYuEYD0XTZ7UCo1 voXugXQ/56AchsjI1Uw2RVGmccY5Gwqd2R8+QQE6az/g1iZci7+huDLBrJcfiakRYLwm C3ilyTubw+H51icPxmF7nvhrXL380O4QtU/OF8n4p4TR85MsbChPZjqfFrmFComa0C2s B2fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="DYR/viY1"; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x1-20020a631701000000b0047744510d34si1575161pgl.851.2023.01.06.08.07.28; Fri, 06 Jan 2023 08:07:42 -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=@intel.com header.s=Intel header.b="DYR/viY1"; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234409AbjAFQFP (ORCPT + 99 others); Fri, 6 Jan 2023 11:05:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233812AbjAFQFL (ORCPT ); Fri, 6 Jan 2023 11:05:11 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F8BD6D520 for ; Fri, 6 Jan 2023 08:05:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673021108; x=1704557108; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZT6r8Z7FdRrKJMNDbWnZMZGVh7KJV5wOXfkJiA5ZOLg=; b=DYR/viY1Qd2k21kG2PIQtk76KihqPRS4C4gpkFkXzBrCpK2De3c5jkTb x5PVfXfohVaZz6kSAWlXMXhMz+BEhwuSk/7AXtsPQynE7FQSTtj2rNbma HPv09Uo8ar0Jfsi/Q+XJjdj0UEs5l6bTXr+TmCp6rxHdlXDGYHR4qrKDQ AzfDvlJhy5sdY2IfHZfAc1adhfmZLV5QYuZ5vrI+pEk+LAh3rXEYXaFDF p/s2pz5Xv2vUdqVzxiGrGnySo4ky/TttF/Zc6uzHEAiD6B/AiSi3f7qd0 fFr3L1yoc261D7xIABGjE2XqIrMH3A1tqttTUW0cKUsmksKdUHUATMeuL Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10582"; a="302199919" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="302199919" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 08:05:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10582"; a="633521616" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="633521616" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orsmga006.jf.intel.com with ESMTP; 06 Jan 2023 08:05:05 -0800 From: kan.liang@linux.intel.com To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org Cc: ak@linux.intel.com, Kan Liang Subject: [PATCH 3/4] perf/x86/msr: Add Emerald Rapids Date: Fri, 6 Jan 2023 08:04:48 -0800 Message-Id: <20230106160449.3566477-3-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230106160449.3566477-1-kan.liang@linux.intel.com> References: <20230106160449.3566477-1-kan.liang@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE 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?1754289943978181327?= X-GMAIL-MSGID: =?utf-8?q?1754289943978181327?= From: Kan Liang The same as Sapphire Rapids, the SMI_COUNT MSR is also supported on Emerald Rapids. Add Emerald Rapids model. Signed-off-by: Kan Liang --- arch/x86/events/msr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c index 074150d28fa8..c65d8906cbcf 100644 --- a/arch/x86/events/msr.c +++ b/arch/x86/events/msr.c @@ -69,6 +69,7 @@ static bool test_intel(int idx, void *data) case INTEL_FAM6_BROADWELL_G: case INTEL_FAM6_BROADWELL_X: case INTEL_FAM6_SAPPHIRERAPIDS_X: + case INTEL_FAM6_EMERALDRAPIDS_X: case INTEL_FAM6_ATOM_SILVERMONT: case INTEL_FAM6_ATOM_SILVERMONT_D: From patchwork Fri Jan 6 16:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 40183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp899704wrt; Fri, 6 Jan 2023 08:07:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXtfjrZL9jzPpnGNk/92az1omNTj253zBfWWUXkYjtuTLi9YElEHqwGPievnQqn83MYiu4Jb X-Received: by 2002:a17:90b:4004:b0:226:c966:28a3 with SMTP id ie4-20020a17090b400400b00226c96628a3mr7343296pjb.25.1673021279126; Fri, 06 Jan 2023 08:07:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673021279; cv=none; d=google.com; s=arc-20160816; b=rkqEz2Ns1bGZed3aN/eUuYjNYwp6ABfI2QTLqFWJ8Tn0fNp1u0OcfK5xn+koJLYszf /upbRXTHjqgsXi/dYi6ZjqW9zjitOiU5WAYJnmN8P7ukga8cw+sKYtsXWU4LnkNiZyvk klXUbM12SWUpFwFwKHvJ4kEYoKrARqvLVYedvnjh1pWRggQv3dTZnMuwG5oxHSFer6gr Lp/BLrfe/cRPqSnp+ZSoK92+e+WwKyd8t/qQSSbkHsFOVkPywSKi42COPGIFZYr2hsY2 SAIGppPxTZHksBjAKJ2rQOBVRfic7p5DBO86/NAcvVxAONM05OaTLwnmHa/6DlD+TG8k EEmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ClHMJ3TEKIP+2uZnQNsev3nsEscUPDyK7Fffsv0GvQc=; b=StdUT8U386tCBpuz9LEH7v6/rgvbzHO6gEjBtIs32yYwWFVwVsMoJhbydC376XHUET b5Si1Ra04gRKyRaPQ3bZjcgdJCPy6RBnq+gKNnP7H69YOwy3aBw6ik21ywqUFoXpbXu3 0fdRKWZu/IAuHohgXOed+1bYv8VXX2Jg/0+3s19vnwG2af/fqlLGE9VaWA/kEQqxmTmu fXBgjrSinuKC+bkLKhvUtNpTnUj+8L8b4+xBLimqCOFDuY/kXCv0gFRxUezOgnmF3Mca mXSl5BUiKnKAXr+eX4/E9IWXZNaH9/RW0st0GlTuL9Jm9P+ghooc0wPErdsi0PvCZfwc bRSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MeAojB75; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lk11-20020a17090b33cb00b002265c110dbasi1864295pjb.28.2023.01.06.08.07.46; Fri, 06 Jan 2023 08:07:59 -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=@intel.com header.s=Intel header.b=MeAojB75; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234665AbjAFQFX (ORCPT + 99 others); Fri, 6 Jan 2023 11:05:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234213AbjAFQFO (ORCPT ); Fri, 6 Jan 2023 11:05:14 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EBB3669AA for ; Fri, 6 Jan 2023 08:05:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673021111; x=1704557111; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2wg7R/f93HJ9QU+RJU9BiPKtYMXBYhztY9N+K5G+7Eg=; b=MeAojB75zNOU1uDTYG4XMRLMHVtZtzTW7knd1tSiGkKTl06WmFEWKGjl TGT/SKpwPcQB14nisXcj0HiP51LXotPwUNWq1KCPdRtmDhHRsw8+OqKKV 1vTMfT2s+fWAHHfq2ommdfGjYTy/GYcXyiGMeOmSNCamjSIqtwlIRKufY IaOq9riNwRobHZalO0Nobq2yniWUs6Kl4lEXpkNV0gTxVqj0pjs5wXu/R B8r7TClG+LWZhFs/il8Ic5CjzslI4pfCFZEqBqKd7P7EtWQI/FmQDC7ni 5a+IxQv8SglWSnc5ZUX6+xs3rSlWgsiaFNFnKzs9p0MdVKoZk4dYC92Eq w==; X-IronPort-AV: E=McAfee;i="6500,9779,10582"; a="302199923" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="302199923" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 08:05:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10582"; a="633521618" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="633521618" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orsmga006.jf.intel.com with ESMTP; 06 Jan 2023 08:05:05 -0800 From: kan.liang@linux.intel.com To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org Cc: ak@linux.intel.com, Kan Liang Subject: [PATCH 4/4] perf/x86/intel/uncore: Add Emerald Rapids Date: Fri, 6 Jan 2023 08:04:49 -0800 Message-Id: <20230106160449.3566477-4-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230106160449.3566477-1-kan.liang@linux.intel.com> References: <20230106160449.3566477-1-kan.liang@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE 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?1754289960555329553?= X-GMAIL-MSGID: =?utf-8?q?1754289960555329553?= From: Kan Liang From the perspective of the uncore PMU, the new Emerald Rapids is the same as the Sapphire Rapids. The only difference is the event list, which will be supported in the perf tool later. Signed-off-by: Kan Liang --- arch/x86/events/intel/uncore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 6f1ccc57a692..459b1aafd4d4 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1833,6 +1833,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &spr_uncore_init), + X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {}, };