From: Ingo Molnar Date: Fri, 2 May 2025 07:43:44 +0000 (+0200) Subject: Merge tag 'v6.15-rc4' into x86/msr, to pick up fixes and resolve conflicts X-Git-Tag: block-6.16-20250606~23^2~25^2~20 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0c7b20b852c75836c15487752e29d8706bb571b2;p=linux-block.git Merge tag 'v6.15-rc4' into x86/msr, to pick up fixes and resolve conflicts Signed-off-by: Ingo Molnar --- 0c7b20b852c75836c15487752e29d8706bb571b2 diff --cc arch/x86/events/intel/core.c index 394fa83b537b,00dfe487bd00..9ef3577d4b35 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@@ -3103,7 -3101,16 +3101,16 @@@ static int handle_pmi_common(struct pt_ * Update the MSR if pebs_enabled is changed. */ if (pebs_enabled != cpuc->pebs_enabled) - wrmsrl(MSR_IA32_PEBS_ENABLE, cpuc->pebs_enabled); + wrmsrq(MSR_IA32_PEBS_ENABLE, cpuc->pebs_enabled); + + /* + * Above PEBS handler (PEBS counters snapshotting) has updated fixed + * counter 3 and perf metrics counts if they are in counter group, + * unnecessary to update again. + */ + if (cpuc->events[INTEL_PMC_IDX_FIXED_SLOTS] && + is_pebs_counter_event_group(cpuc->events[INTEL_PMC_IDX_FIXED_SLOTS])) + status &= ~GLOBAL_STATUS_PERF_METRICS_OVF_BIT; } /* diff --cc drivers/cpufreq/amd-pstate.c index fd1ae77142ad,b961f3a3b580..20f00cffaf13 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@@ -788,19 -791,9 +791,9 @@@ exit_err static void amd_perf_ctl_reset(unsigned int cpu) { - wrmsrl_on_cpu(cpu, MSR_AMD_PERF_CTL, 0); + wrmsrq_on_cpu(cpu, MSR_AMD_PERF_CTL, 0); } - /* - * Set amd-pstate preferred core enable can't be done directly from cpufreq callbacks - * due to locking, so queue the work for later. - */ - static void amd_pstste_sched_prefcore_workfn(struct work_struct *work) - { - sched_set_itmt_support(); - } - static DECLARE_WORK(sched_prefcore_work, amd_pstste_sched_prefcore_workfn); - #define CPPC_MAX_PERF U8_MAX static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)