mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
perf/x86/intel: Initialize TFA MSR
[ Upstream commit d7262457e3
]
Stephane reported that the TFA MSR is not initialized by the kernel,
but the TFA bit could set by firmware or as a leftover from a kexec,
which makes the state inconsistent.
Reported-by: Stephane Eranian <eranian@google.com>
Tested-by: Nelson DSouza <nelson.dsouza@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: tonyj@suse.com
Link: https://lkml.kernel.org/r/20190321123849.GN6521@hirez.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
b2977b4a18
commit
bfc371778b
1 changed files with 6 additions and 0 deletions
|
@ -3427,6 +3427,12 @@ static void intel_pmu_cpu_starting(int cpu)
|
||||||
|
|
||||||
cpuc->lbr_sel = NULL;
|
cpuc->lbr_sel = NULL;
|
||||||
|
|
||||||
|
if (x86_pmu.flags & PMU_FL_TFA) {
|
||||||
|
WARN_ON_ONCE(cpuc->tfa_shadow);
|
||||||
|
cpuc->tfa_shadow = ~0ULL;
|
||||||
|
intel_set_tfa(cpuc, false);
|
||||||
|
}
|
||||||
|
|
||||||
if (x86_pmu.version > 1)
|
if (x86_pmu.version > 1)
|
||||||
flip_smm_bit(&x86_pmu.attr_freeze_on_smi);
|
flip_smm_bit(&x86_pmu.attr_freeze_on_smi);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue