diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 221e3c1e2e75a3dc22372c0f6d2b1981630a7bfb..1a52f561e3248b9b64ac342422c061a2f8e1a05c 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -953,6 +953,13 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 	if (perf->states[0].core_frequency * 1000 != freq_table[0].frequency)
 		pr_warn(FW_WARN "P-state 0 is not max freq\n");
 
+	/*
+	 * The firmware may have altered boost state while the CPU was offline
+	 * (for example during a suspend-resume cycle).
+	 */
+	if (acpi_cpufreq_driver.set_boost && policy->boost_enabled != boost_state(cpu))
+		set_boost(policy, policy->boost_enabled);
+
 	return result;
 
 err_unreg: