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

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (24 commits)
  cpufreq: Fix kobject memleak
  cpufreq: armada-37xx: fix frequency calculation for opp
  cpufreq: centrino: Fix centrino_setpolicy() kerneldoc comment
  cpufreq: qoriq: add support for lx2160a
  cpufreq: qoriq: Add ls1028a chip support
  cpufreq: Move ->get callback check outside of __cpufreq_get()
  cpufreq: Remove needless bios_limit check in show_bios_limit()
  drivers/cpufreq/acpi-cpufreq.c: This fixes the following checkpatch warning
  cpufreq: boost: Remove CONFIG_CPU_FREQ_BOOST_SW Kconfig option
  cpufreq: stats: Use lock by stat to replace global spin lock
  cpufreq: Remove cpufreq_driver check in cpufreq_boost_supported()
  cpufreq: maple: Remove redundant code from maple_cpufreq_init()
  cpufreq: ppc_cbe: fix possible object reference leak
  cpufreq: pmac32: fix possible object reference leak
  cpufreq/pasemi: fix possible object reference leak
  cpufreq: maple: fix possible object reference leak
  cpufreq: kirkwood: fix possible object reference leak
  cpufreq: imx6q: fix possible object reference leak
  cpufreq: ap806: fix possible object reference leak
  drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has()
  ...
parents 4566e2dd 4ebe36c9

drivers/acpi/processor_perflib.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag) 
			acpi_processor_ppc_ost(pr->handle, 0);

	}

	if (ret >= 0)

		cpufreq_update_policy(pr->id);

		cpufreq_update_limits(pr->id);

}



int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)

drivers/cpufreq/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ config CPU_FREQ_GOV_COMMON 
	select IRQ_WORK

	bool



config CPU_FREQ_BOOST_SW

	bool

	depends on THERMAL



config CPU_FREQ_STAT

	bool "CPU frequency transition statistics"

	help

drivers/cpufreq/acpi-cpufreq.c

+9 −10
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static u32 get_cur_val(const struct cpumask *mask, struct acpi_cpufreq_data *dat 


	val = drv_read(data, mask);



	pr_debug("get_cur_val = %u\n", val);

	pr_debug("%s = %u\n", __func__, val);



	return val;

}
@@ -378,7 +378,7 @@ static unsigned int get_cur_freq_on_cpu(unsigned int cpu) 
	unsigned int freq;

	unsigned int cached_freq;



	pr_debug("get_cur_freq_on_cpu (%d)\n", cpu);

	pr_debug("%s (%d)\n", __func__, cpu);



	policy = cpufreq_cpu_get_raw(cpu);

	if (unlikely(!policy))
@@ -458,8 +458,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, 
	if (acpi_pstate_strict) {

		if (!check_freqs(policy, mask,

				 policy->freq_table[index].frequency)) {

			pr_debug("acpi_cpufreq_target failed (%d)\n",

				policy->cpu);

			pr_debug("%s (%d)\n", __func__, policy->cpu);

			result = -EAGAIN;

		}

	}
@@ -573,7 +572,7 @@ static int cpufreq_boost_down_prep(unsigned int cpu) 
static int __init acpi_cpufreq_early_init(void)

{

	unsigned int i;

	pr_debug("acpi_cpufreq_early_init\n");

	pr_debug("%s\n", __func__);



	acpi_perf_data = alloc_percpu(struct acpi_processor_performance);

	if (!acpi_perf_data) {
@@ -657,7 +656,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	static int blacklisted;

#endif



	pr_debug("acpi_cpufreq_cpu_init\n");

	pr_debug("%s\n", __func__);



#ifdef CONFIG_SMP

	if (blacklisted)
@@ -856,7 +855,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy) 
{

	struct acpi_cpufreq_data *data = policy->driver_data;



	pr_debug("acpi_cpufreq_cpu_exit\n");

	pr_debug("%s\n", __func__);



	policy->fast_switch_possible = false;

	policy->driver_data = NULL;
@@ -881,7 +880,7 @@ static int acpi_cpufreq_resume(struct cpufreq_policy *policy) 
{

	struct acpi_cpufreq_data *data = policy->driver_data;



	pr_debug("acpi_cpufreq_resume\n");

	pr_debug("%s\n", __func__);



	data->resume = 1;
@@ -954,7 +953,7 @@ static int __init acpi_cpufreq_init(void) 
	if (cpufreq_get_current_driver())

		return -EEXIST;



	pr_debug("acpi_cpufreq_init\n");

	pr_debug("%s\n", __func__);



	ret = acpi_cpufreq_early_init();

	if (ret)
@@ -991,7 +990,7 @@ static int __init acpi_cpufreq_init(void) 


static void __exit acpi_cpufreq_exit(void)

{

	pr_debug("acpi_cpufreq_exit\n");

	pr_debug("%s\n", __func__);



	acpi_cpufreq_boost_exit();

drivers/cpufreq/amd_freq_sensitivity.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int __init amd_freq_sensitivity_init(void) 
			PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);



	if (!pcidev) {

		if (!static_cpu_has(X86_FEATURE_PROC_FEEDBACK))

		if (!boot_cpu_has(X86_FEATURE_PROC_FEEDBACK))

			return -ENODEV;

	}

drivers/cpufreq/armada-37xx-cpufreq.c

+19 −3
Original line number Diff line number Diff line
@@ -359,11 +359,11 @@ static int __init armada37xx_cpufreq_driver_init(void) 
	struct armada_37xx_dvfs *dvfs;

	struct platform_device *pdev;

	unsigned long freq;

	unsigned int cur_frequency;

	unsigned int cur_frequency, base_frequency;

	struct regmap *nb_pm_base, *avs_base;

	struct device *cpu_dev;

	int load_lvl, ret;

	struct clk *clk;

	struct clk *clk, *parent;



	nb_pm_base =

		syscon_regmap_lookup_by_compatible("marvell,armada-3700-nb-pm");
@@ -399,6 +399,22 @@ static int __init armada37xx_cpufreq_driver_init(void) 
		return PTR_ERR(clk);

	}



	parent = clk_get_parent(clk);

	if (IS_ERR(parent)) {

		dev_err(cpu_dev, "Cannot get parent clock for CPU0\n");

		clk_put(clk);

		return PTR_ERR(parent);

	}



	/* Get parent CPU frequency */

	base_frequency =  clk_get_rate(parent);



	if (!base_frequency) {

		dev_err(cpu_dev, "Failed to get parent clock rate for CPU\n");

		clk_put(clk);

		return -EINVAL;

	}



	/* Get nominal (current) CPU frequency */

	cur_frequency = clk_get_rate(clk);

	if (!cur_frequency) {
@@ -431,7 +447,7 @@ static int __init armada37xx_cpufreq_driver_init(void) 
	for (load_lvl = ARMADA_37XX_DVFS_LOAD_0; load_lvl < LOAD_LEVEL_NR;

	     load_lvl++) {

		unsigned long u_volt = avs_map[dvfs->avs[load_lvl]] * 1000;

		freq = cur_frequency / dvfs->divider[load_lvl];

		freq = base_frequency / dvfs->divider[load_lvl];

		ret = dev_pm_opp_add(cpu_dev, freq, u_volt);

		if (ret)

			goto remove_opp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE