From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B09EC54EAA for ; Mon, 30 Jan 2023 14:02:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236971AbjA3OCO (ORCPT ); Mon, 30 Jan 2023 09:02:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236966AbjA3OB5 (ORCPT ); Mon, 30 Jan 2023 09:01:57 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19D473B0ED for ; Mon, 30 Jan 2023 06:01:47 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AC62961036 for ; Mon, 30 Jan 2023 14:01:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9206C4339B; Mon, 30 Jan 2023 14:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675087306; bh=Srfi0VUrYryvu5LSCeZu3IfvdVJDv6xn3XjqpR9zd+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BJi9GPra25qvrTi5smV3FEF7u5IcnXXCqOpTtymFkMYAyRc+lxJsS4fy20Wj7cFNB Q5UHkE82docu/qDBdwPyj4kxzkoyVwiICnxsv2cB1/txL767ijr2BQ4WRMctJUDq6E aj65Y2ZCAj7/lvsEQg3I6tWy3BAgXr6BDdbxmsyI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kan Liang , Ingo Molnar , Andi Kleen , Sasha Levin Subject: [PATCH 6.1 163/313] perf/x86/msr: Add Meteor Lake support Date: Mon, 30 Jan 2023 14:49:58 +0100 Message-Id: <20230130134344.256278176@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130134336.532886729@linuxfoundation.org> References: <20230130134336.532886729@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kan Liang [ Upstream commit 6887a4d3aede084bf08b70fbc9736c69fce05d7f ] Meteor Lake is Intel's successor to Raptor lake. PPERF and SMI_COUNT MSRs are also supported. Signed-off-by: Kan Liang Signed-off-by: Ingo Molnar Reviewed-by: Andi Kleen Link: https://lore.kernel.org/r/20230104201349.1451191-7-kan.liang@linux.intel.com Signed-off-by: Sasha Levin --- arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c index ecced3a52668..074150d28fa8 100644 --- a/arch/x86/events/msr.c +++ b/arch/x86/events/msr.c @@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data) case INTEL_FAM6_RAPTORLAKE: case INTEL_FAM6_RAPTORLAKE_P: case INTEL_FAM6_RAPTORLAKE_S: + case INTEL_FAM6_METEORLAKE: + case INTEL_FAM6_METEORLAKE_L: if (idx == PERF_MSR_SMI || idx == PERF_MSR_PPERF) return true; break; -- 2.39.0