cpufreq: intel_pstate: Wait for canceled delayed work to complete

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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index c0abf77c56ba0fa2f897882e6a10c56c484cbeae..b702430dac29f179946a649c93cde99f42a8b2c4 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1682,6 +1682,8 @@ ack_intr:
 
 static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata)
 {
+       bool cancel_work;
+
        if (!boot_cpu_has(X86_FEATURE_HWP_NOTIFY))
                return;
 
@@ -1689,9 +1691,11 @@ static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata)
        wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00);
 
        spin_lock_irq(&hwp_notify_lock);
-       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);
        spin_unlock_irq(&hwp_notify_lock);
+
+       if (cancel_work)
+               cancel_delayed_work_sync(&cpudata->hwp_notify_work);
 }
 
 static void intel_pstate_enable_hwp_interrupt(struct cpudata *cpudata)