]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
perf/x86/intel/uncore: Fix Intel SPR CHA event constraints
authorKan Liang <kan.liang@linux.intel.com>
Thu, 26 Aug 2021 15:32:40 +0000 (08:32 -0700)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 7 Dec 2021 06:32:50 +0000 (07:32 +0100)
BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit 9d756e408e080d40e7916484b00c802026e6d1ad ]

SPR CHA events have the exact same event constraints as SKX, so add the
constraints.

Fixes: 949b11381f81 ("perf/x86/intel/uncore: Add Sapphire Rapids server CHA support")
Reported-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/1629991963-102621-5-git-send-email-kan.liang@linux.intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
arch/x86/events/intel/uncore_snbep.c

index d941854e4efaa4fa6ea89e1bd0cd2c3003dccbe9..ce85ee5f60f97cf386a5efbf3827bf5df06bfee0 100644 (file)
@@ -5649,6 +5649,7 @@ static struct intel_uncore_type spr_uncore_chabox = {
        .event_mask             = SPR_CHA_PMON_EVENT_MASK,
        .event_mask_ext         = SPR_RAW_EVENT_MASK_EXT,
        .num_shared_regs        = 1,
+       .constraints            = skx_uncore_chabox_constraints,
        .ops                    = &spr_uncore_chabox_ops,
        .format_group           = &spr_uncore_chabox_format_group,
        .attr_update            = uncore_alias_groups,