Commit db06391e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq' and 'pm-cpuidle' 

* pm-cpufreq:
  cpufreq: schedutil: restore cached freq when next_f is not changed
  acpi-cpufreq: Honor _PSD table setting on new AMD CPUs
  cpufreq: intel_pstate: Delete intel_pstate sysfs if failed to register the driver
  cpufreq: Improve code around unlisted freq check

* pm-cpuidle:
  intel_idle: Ignore _CST if control cannot be taken from the platform
  cpuidle: Remove pointless stub
  intel_idle: mention assumption that WBINVD is not needed
  MAINTAINERS: Add section for cpuidle-psci PM domain
parents 330e3932 0070ea29 75af76d0

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -4588,6 +4588,14 @@ L: linux-arm-kernel@lists.infradead.org 
S:	Supported

F:	drivers/cpuidle/cpuidle-psci.c









CPUIDLE DRIVER - ARM PSCI PM DOMAIN









M:	Ulf Hansson <ulf.hansson@linaro.org>









L:	linux-pm@vger.kernel.org









L:	linux-arm-kernel@lists.infradead.org









S:	Supported









F:	drivers/cpuidle/cpuidle-psci.h









F:	drivers/cpuidle/cpuidle-psci-domain.c

















CRAMFS FILESYSTEM









M:	Nicolas Pitre <nico@fluxnic.net>









S:	Maintained
































drivers/cpufreq/acpi-cpufreq.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -691,7 +691,8 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)







		cpumask_copy(policy->cpus, topology_core_cpumask(cpu));









	}



















	if (check_amd_hwpstate_cpu(cpu) && !acpi_pstate_strict) {









	if (check_amd_hwpstate_cpu(cpu) && boot_cpu_data.x86 < 0x19 &&









	    !acpi_pstate_strict) {









		cpumask_clear(policy->cpus);









		cpumask_set_cpu(cpu, policy->cpus);









		cpumask_copy(data->freqdomain_cpus,
































drivers/cpufreq/cpufreq.c



+7
−8






























Original line number
Diff line number
Diff line







@@ -1454,13 +1454,12 @@ static int cpufreq_online(unsigned int cpu)







	 */









	if ((cpufreq_driver->flags & CPUFREQ_NEED_INITIAL_FREQ_CHECK)









	    && has_target()) {









		unsigned int old_freq = policy->cur;



















		/* Are we running at unknown frequency ? */









		ret = cpufreq_frequency_table_get_index(policy, policy->cur);









		ret = cpufreq_frequency_table_get_index(policy, old_freq);









		if (ret == -EINVAL) {









			/* Warn user and fix it */









			pr_warn("%s: CPU%d: Running at unlisted freq: %u KHz\n",









				__func__, policy->cpu, policy->cur);









			ret = __cpufreq_driver_target(policy, policy->cur - 1,









			ret = __cpufreq_driver_target(policy, old_freq - 1,









						      CPUFREQ_RELATION_L);



















			/*








@@ -1469,8 +1468,8 @@ static int cpufreq_online(unsigned int cpu)







			 * frequency for longer duration. Hence, a BUG_ON().









			 */









			BUG_ON(ret);









			pr_warn("%s: CPU%d: Unlisted initial frequency changed to: %u KHz\n",









				__func__, policy->cpu, policy->cur);









			pr_info("%s: CPU%d: Running at unlisted initial frequency: %u KHz, changing to: %u KHz\n",









				__func__, policy->cpu, old_freq, policy->cur);









		}









	}










































drivers/cpufreq/intel_pstate.c



+21
−1






























Original line number
Diff line number
Diff line







@@ -1420,6 +1420,24 @@ static void __init intel_pstate_sysfs_expose_params(void)







	}









}



















static void __init intel_pstate_sysfs_remove(void)









{









	if (!intel_pstate_kobject)









		return;



















	sysfs_remove_group(intel_pstate_kobject, &intel_pstate_attr_group);



















	if (!per_cpu_limits) {









		sysfs_remove_file(intel_pstate_kobject, &max_perf_pct.attr);









		sysfs_remove_file(intel_pstate_kobject, &min_perf_pct.attr);



















		if (x86_match_cpu(intel_pstate_cpu_ee_disable_ids))









			sysfs_remove_file(intel_pstate_kobject, &energy_efficiency.attr);









	}



















	kobject_put(intel_pstate_kobject);









}



















static void intel_pstate_sysfs_expose_hwp_dynamic_boost(void)









{









	int rc;








@@ -3063,8 +3081,10 @@ hwp_cpu_matched:







	mutex_lock(&intel_pstate_driver_lock);









	rc = intel_pstate_register_driver(default_driver);









	mutex_unlock(&intel_pstate_driver_lock);









	if (rc)









	if (rc) {









		intel_pstate_sysfs_remove();









		return rc;









	}



















	if (hwp_active) {









		const struct x86_cpu_id *id;
































drivers/idle/intel_idle.c



+9
−6






























Original line number
Diff line number
Diff line







@@ -8,7 +8,7 @@







 */



















/*









 * intel_idle is a cpuidle driver that loads on specific Intel processors









 * intel_idle is a cpuidle driver that loads on all Intel CPUs with MWAIT









 * in lieu of the legacy ACPI processor_idle driver.  The intent is to









 * make Linux more efficient on these processors, as intel_idle knows









 * more than ACPI, as well as make Linux more immune to ACPI BIOS bugs.








@@ -20,7 +20,11 @@







 * All CPUs have same idle states as boot CPU









 *









 * Chipset BM_STS (bus master status) bit is a NOP









 *	for preventing entry into deep C-stats









 *	for preventing entry into deep C-states









 *









 * CPU will flush caches as needed when entering a C-state via MWAIT









 *	(in contrast to entering ACPI C3, in which case the WBINVD









 *	instruction needs to be executed to flush the caches)









 */



















/*








@@ -1212,14 +1216,13 @@ static bool __init intel_idle_acpi_cst_extract(void)







		if (!intel_idle_cst_usable())









			continue;



















		if (!acpi_processor_claim_cst_control()) {









			acpi_state_table.count = 0;









			return false;









		}









		if (!acpi_processor_claim_cst_control())









			break;



















		return true;









	}



















	acpi_state_table.count = 0;









	pr_debug("ACPI _CST not found or not usable\n");









	return false;









}








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE