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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A636C432BE for ; Mon, 30 Aug 2021 12:01:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5DC3060E77 for ; Mon, 30 Aug 2021 12:01:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237155AbhH3MCT (ORCPT ); Mon, 30 Aug 2021 08:02:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:50210 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236972AbhH3MBm (ORCPT ); Mon, 30 Aug 2021 08:01:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6361C60232; Mon, 30 Aug 2021 12:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630324849; bh=3kytqInYdaIIpA3k8cdBnOFVmrir0kc23ypTP2INWoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j0N8dnBzgx3jWATwoghfGWsmkXbCZzfeDTgK7UbOMzH/v7Q8fvBfERI6atbz9zyNY 8thUASrbz5uqHU3hNoQoD+30Ze8dbth8KV4k83afd+N7wV3ZDRmCEP3rctLOCmf7mM M4GfD6R7C3Nm3NXhZktFeZziCC3vT3CxcFgXlFVJf5g/m8JQIZG+L9062hTsZ8cDvH bNgUQ5Ib7ReU3stPKHGB7J9blcI7OTCqUBXfZfhEIcV2UuKEOVcsOfRTPNFis4J8To 8d/pjJg+Rb4su4KKEAkJl1KfZdvTdbBzqWKQWyXFk66ivAvlp/g809vBcfg38NGc6E BN2OWWMb2OyLA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiaoyao Li , Peter Zijlstra , Alexander Shishkin , Sasha Levin , linux-perf-users@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 4/7] perf/x86/intel/pt: Fix mask of num_address_ranges Date: Mon, 30 Aug 2021 08:00:40 -0400 Message-Id: <20210830120043.1018096-4-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210830120043.1018096-1-sashal@kernel.org> References: <20210830120043.1018096-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiaoyao Li [ Upstream commit c53c6b7409f4cd9e542991b53d597fbe2751d7db ] Per SDM, bit 2:0 of CPUID(0x14,1).EAX[2:0] reports the number of configurable address ranges for filtering, not bit 1:0. Signed-off-by: Xiaoyao Li Signed-off-by: Peter Zijlstra (Intel) Acked-by: Alexander Shishkin Link: https://lkml.kernel.org/r/20210824040622.4081502-1-xiaoyao.li@intel.com Signed-off-by: Sasha Levin --- arch/x86/events/intel/pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c index 0661227d935c..990ca9614b23 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c @@ -69,7 +69,7 @@ static struct pt_cap_desc { PT_CAP(topa_multiple_entries, 0, CPUID_ECX, BIT(1)), PT_CAP(single_range_output, 0, CPUID_ECX, BIT(2)), PT_CAP(payloads_lip, 0, CPUID_ECX, BIT(31)), - PT_CAP(num_address_ranges, 1, CPUID_EAX, 0x3), + PT_CAP(num_address_ranges, 1, CPUID_EAX, 0x7), PT_CAP(mtc_periods, 1, CPUID_EAX, 0xffff0000), PT_CAP(cycle_thresholds, 1, CPUID_EBX, 0xffff), PT_CAP(psb_periods, 1, CPUID_EBX, 0xffff0000), -- 2.30.2