Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp3333259rwb; Mon, 16 Jan 2023 06:46:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfpkIr5XwzCZP/fOvkqcxqTGelfAKj+ZUKNh22vrmWuAS6loSzyAEPa27Y3/FQq806ZvSZ X-Received: by 2002:a17:90a:fe01:b0:229:180a:a18c with SMTP id ck1-20020a17090afe0100b00229180aa18cmr15557155pjb.38.1673880404651; Mon, 16 Jan 2023 06:46:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673880404; cv=none; d=google.com; s=arc-20160816; b=Ua/eJJJskKrGxMsIypqBOm1rPGmmPUoRg15Q7U7ovqMIXveF0Y2dcT4NTLfaZgMv1c tZy49Jeh4CUa5AXvleLZuWcGGcAIVhrP/pBduXYB+7YIEr9vJzfG5dfbPRI8LJE+F3cf 0lBuCV0cnBepkDAOiUNUeoiaQhR9/Cq8i0xx/8JDwQmCqA1eSokVMqDM3wha1DiZATwS L59ZDVBXYBB2PXuDO6ZQ3xAISJ8e15IoIAIW0SKL4H4lBJ996S4NPPKaym4JWncNaqrD o7qxRa86hFIYz1N1BDNehhPECRMWWutZsCegP+j8CAO5y2/w9xOmclSBTQn9VbsxB2aS 9Bpw== 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=rL7mfB2JP1B+02OnaYQPP8K6oyxg5D/WAmMpAlMtHwI=; b=t1i9SCT0r6n6dBlCoHJyYEXLnBwkgmxjWMQSvrlQO5hjrU4NUCb8tzoTwAUQI0LQvO R2AwTGeYEWj6eW2qB5zdDFvWkO6wXKtGY1iymiJoxf1xE/l8a8fIDppX0/uvG4sPix22 jZ1LQoclmvESwp03IPsDLlXx6PrA165VvSLR7TNkmy19O2dQAkgWuJJk6CYCKkAssBBp bjKwb/pqc+13wURBobhu9aei1PJXjZl88Y9S6tgFttEFlRsdvSdF31XEuNyzTwc1vj72 yRwKkdCC0m0tx9baeAICqX29KcybhOdoIkaknZm1satoUV6CRsswT3tr7DmN+CQaEEkh IR8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=de2BgwoK; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id il11-20020a17090b164b00b0020a66fc1398si7602157pjb.91.2023.01.16.06.46.38; Mon, 16 Jan 2023 06:46:44 -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=@kernel.org header.s=k20201202 header.b=de2BgwoK; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231761AbjAPOFU (ORCPT + 50 others); Mon, 16 Jan 2023 09:05:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231775AbjAPOEW (ORCPT ); Mon, 16 Jan 2023 09:04:22 -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 18F3B22783; Mon, 16 Jan 2023 06:03:05 -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 161D160FD4; Mon, 16 Jan 2023 14:03:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36131C433F0; Mon, 16 Jan 2023 14:03:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673877784; bh=5Cxd53xslv2jhhtxfE3tjYtYEG/w3zgEtb7F0rv8y/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=de2BgwoKZQnPgLgB7c/9H6Y8f1rRiV13YFWFWkr2SJcrnEwWwu3NOhAgvXWcmjHRj Ioi93SEaw19qgfike0JvQ3Z620SmhB7v1MjFgB64lw4pXxrbBxtY0P+lmeZErmVD62 ltUbF+Nkf2Rn9JHRa7en/XC8UYZAFeZAigX+wQKMlF73nq+WRk+bo7bnrthwPFqsJ9 NJKSUt5tuXGJgcOiaPWZFzaeZH697vUG7VjMHUx86k5Oth3ExzB3tex7bLnsBKnP8P tJGEpbkLCIrY3t5JLffWY9E+FfljTVfcFP4QwZ0Xp16tP9/hNquTy/bgOVkv9uGJkq iRolNbO6oJfjA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kan Liang , Ingo Molnar , Andi Kleen , Sasha Levin , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 23/53] perf/x86/msr: Add Meteor Lake support Date: Mon, 16 Jan 2023 09:01:23 -0500 Message-Id: <20230116140154.114951-23-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116140154.114951-1-sashal@kernel.org> References: <20230116140154.114951-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 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.35.1