Commit 6ef74676 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-4.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more power management updates from Rafael Wysocki:
 "These remove a questionable heuristic from the menu cpuidle governor,
  fix a recent build regression in the intel_pstate driver, clean up ARM
  big-Little support in cpufreq and fix up hung task watchdog's
  interaction with system-wide power management transitions.

  Specifics:

   - Fix build regression in the intel_pstate driver that doesn't build
     without CONFIG_ACPI after recent changes (Dominik Brodowski).

   - One of the heuristics in the menu cpuidle governor is based on a
     function returning 0 most of the time, so drop it and clean up the
     scheduler code related to it (Daniel Lezcano).

   - Prevent the arm_big_little cpufreq driver from being used on ARM64
     which is not suitable for it and drop the arm_big_little_dt driver
     that is not used any more (Sudeep Holla).

   - Prevent the hung task watchdog from triggering during resume from
     system-wide sleep states by disabling it before freezing tasks and
     enabling it again after they have been thawed (Vitaly Kuznetsov)"

* tag 'pm-4.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  kernel: hung_task.c: disable on suspend
  cpufreq: remove unused arm_big_little_dt driver
  cpufreq: drop ARM_BIG_LITTLE_CPUFREQ support for ARM64
  cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
  cpuidle: menu: Remove get_loadavg() from the performance multiplier
  sched: Factor out nr_iowait and nr_iowait_cpu
parents 85b5d4bc c4ac6889

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -3823,7 +3823,6 @@ W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php 
S:	Maintained

F:	drivers/cpufreq/arm_big_little.h

F:	drivers/cpufreq/arm_big_little.c

F:	drivers/cpufreq/arm_big_little_dt.c



CPU POWER MONITORING SUBSYSTEM

M:	Thomas Renninger <trenn@suse.com>

drivers/cpufreq/Kconfig.arm

+1 −8
Original line number Diff line number Diff line
@@ -28,20 +28,13 @@ config ARM_ARMADA_37XX_CPUFREQ 
# big LITTLE core layer and glue drivers

config ARM_BIG_LITTLE_CPUFREQ

	tristate "Generic ARM big LITTLE CPUfreq driver"

	depends on (ARM_CPU_TOPOLOGY || ARM64) && HAVE_CLK

	depends on ARM_CPU_TOPOLOGY && HAVE_CLK

	# if CPU_THERMAL is on and THERMAL=m, ARM_BIT_LITTLE_CPUFREQ cannot be =y

	depends on !CPU_THERMAL || THERMAL

	select PM_OPP

	help

	  This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.



config ARM_DT_BL_CPUFREQ

	tristate "Generic probing via DT for ARM big LITTLE CPUfreq driver"

	depends on ARM_BIG_LITTLE_CPUFREQ && OF

	help

	  This enables probing via DT for Generic CPUfreq driver for ARM

	  big.LITTLE platform. This gets frequency tables from DT.



config ARM_SCPI_CPUFREQ

	tristate "SCPI based CPUfreq driver"

	depends on ARM_SCPI_PROTOCOL && COMMON_CLK_SCPI

drivers/cpufreq/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ obj-$(CONFIG_X86_SFI_CPUFREQ) += sfi-cpufreq.o 
##################################################################################

# ARM SoC drivers

obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ)	+= arm_big_little.o

# big LITTLE per platform glues. Keep DT_BL_CPUFREQ as the last entry in all big

# LITTLE drivers, so that it is probed last.

obj-$(CONFIG_ARM_DT_BL_CPUFREQ)		+= arm_big_little_dt.o



obj-$(CONFIG_ARM_ARMADA_37XX_CPUFREQ)	+= armada-37xx-cpufreq.o

obj-$(CONFIG_ARM_BRCMSTB_AVS_CPUFREQ)	+= brcmstb-avs-cpufreq.o

drivers/cpufreq/arm_big_little_dt.c

deleted100644 → 0
+0 −100
Original line number Diff line number Diff line 
/*

 * Generic big.LITTLE CPUFreq Interface driver

 *

 * It provides necessary ops to arm_big_little cpufreq driver and gets

 * Frequency information from Device Tree. Freq table in DT must be in KHz.

 *

 * Copyright (C) 2013 Linaro.

 * Viresh Kumar <viresh.kumar@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/cpufreq.h>

#include <linux/device.h>

#include <linux/export.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/pm_opp.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/types.h>

#include "arm_big_little.h"



/* get cpu node with valid operating-points */

static struct device_node *get_cpu_node_with_valid_op(int cpu)

{

	struct device_node *np = of_cpu_device_node_get(cpu);



	if (!of_get_property(np, "operating-points", NULL)) {

		of_node_put(np);

		np = NULL;

	}



	return np;

}



static int dt_get_transition_latency(struct device *cpu_dev)

{

	struct device_node *np;

	u32 transition_latency = CPUFREQ_ETERNAL;



	np = of_node_get(cpu_dev->of_node);

	if (!np) {

		pr_info("Failed to find cpu node. Use CPUFREQ_ETERNAL transition latency\n");

		return CPUFREQ_ETERNAL;

	}



	of_property_read_u32(np, "clock-latency", &transition_latency);

	of_node_put(np);



	pr_debug("%s: clock-latency: %d\n", __func__, transition_latency);

	return transition_latency;

}



static const struct cpufreq_arm_bL_ops dt_bL_ops = {

	.name	= "dt-bl",

	.get_transition_latency = dt_get_transition_latency,

	.init_opp_table = dev_pm_opp_of_cpumask_add_table,

	.free_opp_table = dev_pm_opp_of_cpumask_remove_table,

};



static int generic_bL_probe(struct platform_device *pdev)

{

	struct device_node *np;



	np = get_cpu_node_with_valid_op(0);

	if (!np)

		return -ENODEV;



	of_node_put(np);

	return bL_cpufreq_register(&dt_bL_ops);

}



static int generic_bL_remove(struct platform_device *pdev)

{

	bL_cpufreq_unregister(&dt_bL_ops);

	return 0;

}



static struct platform_driver generic_bL_platdrv = {

	.driver = {

		.name	= "arm-bL-cpufreq-dt",

	},

	.probe		= generic_bL_probe,

	.remove		= generic_bL_remove,

};

module_platform_driver(generic_bL_platdrv);



MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>");

MODULE_DESCRIPTION("Generic ARM big LITTLE cpufreq driver via DT");

MODULE_LICENSE("GPL v2");

drivers/cpufreq/intel_pstate.c

+11 −9
Original line number Diff line number Diff line
@@ -386,16 +386,11 @@ static int intel_pstate_get_cppc_guranteed(int cpu) 
	return cppc_perf.guaranteed_perf;

}



#else

#else /* CONFIG_ACPI_CPPC_LIB */

static void intel_pstate_set_itmt_prio(int cpu)

{

}



static int intel_pstate_get_cppc_guranteed(int cpu)

{

	return -ENOTSUPP;

}

#endif

#endif /* CONFIG_ACPI_CPPC_LIB */



static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)

{
@@ -477,7 +472,7 @@ static void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy) 


	acpi_processor_unregister_performance(policy->cpu);

}

#else

#else /* CONFIG_ACPI */

static inline void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)

{

}
@@ -490,7 +485,14 @@ static inline bool intel_pstate_acpi_pm_profile_server(void) 
{

	return false;

}

#endif

#endif /* CONFIG_ACPI */



#ifndef CONFIG_ACPI_CPPC_LIB

static int intel_pstate_get_cppc_guranteed(int cpu)

{

	return -ENOTSUPP;

}

#endif /* CONFIG_ACPI_CPPC_LIB */



static inline void update_turbo_state(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE