Commit 6c5502fd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jia, Yingbao
Browse files

cpufreq: intel_pstate: Wait for canceled delayed work to complete 

mainline inclusion
from mainline-v6.10
commit 432acb219af4edecdd11d360f30b7cc643524db8
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QC4
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=432acb219af4edecdd11d360f30b7cc643524db8



-------------------------------------------------

Intel-SIG: commit 432acb219af4 cpufreq: intel_pstate: Wait for canceled delayed work to complete.
Backport intel_pstate driver update for 6.6 from 6.11

Make intel_pstate_disable_hwp_interrupt() wait for canceled delayed work
to complete to avoid leftover work items running when it returns which
may be during driver unregistration and may confuse things going forward.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 1294481c

drivers/cpufreq/intel_pstate.c

+5 −2
Original line number Diff line number Diff line
@@ -1679,6 +1679,7 @@ void notify_hwp_interrupt(void) 
static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata)

{

	unsigned long flags;

	bool cancel_work;



	if (!boot_cpu_has(X86_FEATURE_HWP_NOTIFY))

		return;
@@ -1687,9 +1688,11 @@ static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata) 
	wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00);



	raw_spin_lock_irqsave(&hwp_notify_lock, flags);

	if (cpumask_test_and_clear_cpu(cpudata->cpu, &hwp_intr_enable_mask))

		cancel_delayed_work(&cpudata->hwp_notify_work);

	cancel_work = cpumask_test_and_clear_cpu(cpudata->cpu, &hwp_intr_enable_mask);

	raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);



	if (cancel_work)

		cancel_delayed_work_sync(&cpudata->hwp_notify_work);

}



static void intel_pstate_enable_hwp_interrupt(struct cpudata *cpudata)