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

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq: tegra186: don't pass GFP_DMA32 to dma_alloc_coherent()
  cpufreq: conservative: Take limits changes into account properly
  Documentation: intel_pstate: Add base_frequency information
  cpufreq: intel_pstate: Add base_frequency attribute
  ACPI / CPPC: Add support for guaranteed performance
  cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull
  cpufreq: dt-platdev: allow RK3399 to have separate tunables per cluster
  cpufreq / CPPC: Mark acpi_ids as used
  cpufreq: dt: Add support for r8a7744
  cpufreq: Convert to using %pOFn instead of device_node.name
  cpufreq: remove unnecessary unlikely()
parents 41fd838c a3ade38d

Documentation/admin-guide/pm/intel_pstate.rst

+7 −0
Original line number Diff line number Diff line
@@ -465,6 +465,13 @@ Next, the following policy attributes have special meaning if 
	policy for the time interval between the last two invocations of the

	driver's utilization update callback by the CPU scheduler for that CPU.



One more policy attribute is present if the `HWP feature is enabled in the

processor <Active Mode With HWP_>`_:



``base_frequency``

	Shows the base frequency of the CPU. Any frequency above this will be

	in the turbo frequency range.



The meaning of these attributes in the `passive mode <Passive Mode_>`_ is the

same as for other scaling drivers.

drivers/acpi/cppc_acpi.c

+6 −2
Original line number Diff line number Diff line
@@ -1061,9 +1061,9 @@ int cppc_get_perf_caps(int cpunum, struct cppc_perf_caps *perf_caps) 
{

	struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpunum);

	struct cpc_register_resource *highest_reg, *lowest_reg,

		*lowest_non_linear_reg, *nominal_reg,

		*lowest_non_linear_reg, *nominal_reg, *guaranteed_reg,

		*low_freq_reg = NULL, *nom_freq_reg = NULL;

	u64 high, low, nom, min_nonlinear, low_f = 0, nom_f = 0;

	u64 high, low, guaranteed, nom, min_nonlinear, low_f = 0, nom_f = 0;

	int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpunum);

	struct cppc_pcc_data *pcc_ss_data = NULL;

	int ret = 0, regs_in_pcc = 0;
@@ -1079,6 +1079,7 @@ int cppc_get_perf_caps(int cpunum, struct cppc_perf_caps *perf_caps) 
	nominal_reg = &cpc_desc->cpc_regs[NOMINAL_PERF];

	low_freq_reg = &cpc_desc->cpc_regs[LOWEST_FREQ];

	nom_freq_reg = &cpc_desc->cpc_regs[NOMINAL_FREQ];

	guaranteed_reg = &cpc_desc->cpc_regs[GUARANTEED_PERF];



	/* Are any of the regs PCC ?*/

	if (CPC_IN_PCC(highest_reg) || CPC_IN_PCC(lowest_reg) ||
@@ -1107,6 +1108,9 @@ int cppc_get_perf_caps(int cpunum, struct cppc_perf_caps *perf_caps) 
	cpc_read(cpunum, nominal_reg, &nom);

	perf_caps->nominal_perf = nom;



	cpc_read(cpunum, guaranteed_reg, &guaranteed);

	perf_caps->guaranteed_perf = guaranteed;



	cpc_read(cpunum, lowest_non_linear_reg, &min_nonlinear);

	perf_caps->lowest_nonlinear_perf = min_nonlinear;

drivers/cpufreq/cppc_cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ MODULE_LICENSE("GPL"); 


late_initcall(cppc_cpufreq_init);



static const struct acpi_device_id cppc_acpi_ids[] = {

static const struct acpi_device_id cppc_acpi_ids[] __used = {

	{ACPI_PROCESSOR_DEVICE_HID, },

	{}

};

drivers/cpufreq/cpufreq-dt-platdev.c

+5 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static const struct of_device_id whitelist[] __initconst = { 
	{ .compatible = "renesas,r8a73a4", },

	{ .compatible = "renesas,r8a7740", },

	{ .compatible = "renesas,r8a7743", },

	{ .compatible = "renesas,r8a7744", },

	{ .compatible = "renesas,r8a7745", },

	{ .compatible = "renesas,r8a7778", },

	{ .compatible = "renesas,r8a7779", },
@@ -78,7 +79,10 @@ static const struct of_device_id whitelist[] __initconst = { 
	{ .compatible = "rockchip,rk3328", },

	{ .compatible = "rockchip,rk3366", },

	{ .compatible = "rockchip,rk3368", },

	{ .compatible = "rockchip,rk3399", },

	{ .compatible = "rockchip,rk3399",

	  .data = &(struct cpufreq_dt_platform_data)

		{ .have_governor_per_policy = true, },

	},



	{ .compatible = "st-ericsson,u8500", },

	{ .compatible = "st-ericsson,u8540", },

drivers/cpufreq/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_transition_begin); 
void cpufreq_freq_transition_end(struct cpufreq_policy *policy,

		struct cpufreq_freqs *freqs, int transition_failed)

{

	if (unlikely(WARN_ON(!policy->transition_ongoing)))

	if (WARN_ON(!policy->transition_ongoing))

		return;



	cpufreq_notify_post_transition(policy, freqs, transition_failed);