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

Merge back cpufreq material for 6.12

parents 15d75184 3ca2a3d1

drivers/cpufreq/cpufreq.c

+4 −23
Original line number Diff line number Diff line
@@ -575,30 +575,11 @@ unsigned int cpufreq_policy_transition_delay_us(struct cpufreq_policy *policy) 
		return policy->transition_delay_us;



	latency = policy->cpuinfo.transition_latency / NSEC_PER_USEC;

	if (latency) {

		unsigned int max_delay_us = 2 * MSEC_PER_SEC;

	if (latency)

		/* Give a 50% breathing room between updates */

		return latency + (latency >> 1);



		/*

		 * If the platform already has high transition_latency, use it

		 * as-is.

		 */

		if (latency > max_delay_us)

			return latency;



		/*

		 * For platforms that can change the frequency very fast (< 2

		 * us), the above formula gives a decent transition delay. But

		 * for platforms where transition_latency is in milliseconds, it

		 * ends up giving unrealistic values.

		 *

		 * Cap the default transition delay to 2 ms, which seems to be

		 * a reasonable amount of time after which we should reevaluate

		 * the frequency.

		 */

		return min(latency * LATENCY_MULTIPLIER, max_delay_us);

	}



	return LATENCY_MULTIPLIER;

	return USEC_PER_MSEC;

}

EXPORT_SYMBOL_GPL(cpufreq_policy_transition_delay_us);

drivers/cpufreq/intel_pstate.c

+4 −0
Original line number Diff line number Diff line
@@ -2425,6 +2425,10 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { 
	X86_MATCH(INTEL_ICELAKE_X,		core_funcs),

	X86_MATCH(INTEL_SAPPHIRERAPIDS_X,	core_funcs),

	X86_MATCH(INTEL_EMERALDRAPIDS_X,	core_funcs),

	X86_MATCH(INTEL_GRANITERAPIDS_D,	core_funcs),

	X86_MATCH(INTEL_GRANITERAPIDS_X,	core_funcs),

	X86_MATCH(INTEL_ATOM_CRESTMONT,		core_funcs),

	X86_MATCH(INTEL_ATOM_CRESTMONT_X,	core_funcs),

	{}

};

#endif

drivers/cpufreq/maple-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -238,4 +238,5 @@ static int __init maple_cpufreq_init(void) 
module_init(maple_cpufreq_init);





MODULE_DESCRIPTION("cpufreq driver for Maple 970FX/970MP boards");

MODULE_LICENSE("GPL");

drivers/cpufreq/pasemi-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -269,5 +269,6 @@ static void __exit pas_cpufreq_exit(void) 
module_init(pas_cpufreq_init);

module_exit(pas_cpufreq_exit);



MODULE_DESCRIPTION("cpufreq driver for PA Semi PWRficient");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>, Olof Johansson <olof@lixom.net>");

drivers/cpufreq/pmac64-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -671,4 +671,5 @@ static int __init g5_cpufreq_init(void) 
module_init(g5_cpufreq_init);





MODULE_DESCRIPTION("cpufreq driver for SMU & 970FX based G5 Macs");

MODULE_LICENSE("GPL");