File tree Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -6015,7 +6015,13 @@ __init int intel_pmu_init(void)
6015
6015
tsx_attr = hsw_tsx_events_attrs ;
6016
6016
intel_pmu_pebs_data_source_skl (pmem );
6017
6017
6018
- if (boot_cpu_has (X86_FEATURE_TSX_FORCE_ABORT )) {
6018
+ /*
6019
+ * Processors with CPUID.RTM_ALWAYS_ABORT have TSX deprecated by default.
6020
+ * TSX force abort hooks are not required on these systems. Only deploy
6021
+ * workaround when microcode has not enabled X86_FEATURE_RTM_ALWAYS_ABORT.
6022
+ */
6023
+ if (boot_cpu_has (X86_FEATURE_TSX_FORCE_ABORT ) &&
6024
+ !boot_cpu_has (X86_FEATURE_RTM_ALWAYS_ABORT )) {
6019
6025
x86_pmu .flags |= PMU_FL_TFA ;
6020
6026
x86_pmu .get_event_constraints = tfa_get_event_constraints ;
6021
6027
x86_pmu .enable_all = intel_tfa_pmu_enable_all ;
You can’t perform that action at this time.
0 commit comments