]> xenbits.xensource.com Git - people/aperard/linux.git/commitdiff
perf/x86/amd/core: Avoid register reset when CPU is dead
authorSandipan Das <sandipan.das@amd.com>
Mon, 29 Jan 2024 11:06:26 +0000 (16:36 +0530)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:20:56 +0000 (18:20 -0400)
[ Upstream commit ad8c91282c95f801c37812d59d2d9eba6899b384 ]

When bringing a CPU online, some of the PMC and LBR related registers
are reset. The same is done when a CPU is taken offline although that
is unnecessary. This currently happens in the "cpu_dead" callback which
is also incorrect as the callback runs on a control CPU instead of the
one that is being taken offline. This also affects hibernation and
suspend to RAM on some platforms as reported in the link below.

Fixes: 21d59e3e2c40 ("perf/x86/amd/core: Detect PerfMonV2 support")
Reported-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Sandipan Das <sandipan.das@amd.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/550a026764342cf7e5812680e3e2b91fe662b5ac.1706526029.git.sandipan.das@amd.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/events/amd/core.c

index 04f4b96dec6df74f71a6f8dce2bcd0cfb02ff08e..fd091b9dd706796e8b7bf741a6a70d8d9205edf3 100644 (file)
@@ -604,7 +604,6 @@ static void amd_pmu_cpu_dead(int cpu)
 
        kfree(cpuhw->lbr_sel);
        cpuhw->lbr_sel = NULL;
-       amd_pmu_cpu_reset(cpu);
 
        if (!x86_pmu.amd_nb_constraints)
                return;