Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux (ced255c0) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/thermal/power_allocator.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@ Power allocator governor tunables
	Trip points		Trip points
	-----------		-----------

	The governor requires the following two passive trip points:		The governor works optimally with the following two passive trip points:

	1. "switch on" trip point: temperature above which the governor		1. "switch on" trip point: temperature above which the governor
	control loop starts operating. This is the first passive trip		control loop starts operating. This is the first passive trip

MAINTAINERS

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10338,6 +10338,16 @@ F: include/uapi/linux/thermal.h
	F: include/linux/cpu_cooling.h		F: include/linux/cpu_cooling.h
	F: Documentation/devicetree/bindings/thermal/		F: Documentation/devicetree/bindings/thermal/

			THERMAL/CPU_COOLING
			M: Amit Daniel Kachhap <amit.kachhap@gmail.com>
			M: Viresh Kumar <viresh.kumar@linaro.org>
			M: Javi Merino <javi.merino@arm.com>
			L: linux-pm@vger.kernel.org
			S: Supported
			F: Documentation/thermal/cpu-cooling-api.txt
			F: drivers/thermal/cpu_cooling.c
			F: include/linux/cpu_cooling.h

	THINGM BLINK(1) USB RGB LED DRIVER		THINGM BLINK(1) USB RGB LED DRIVER
	M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>		M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
	S: Maintained		S: Maintained

drivers/thermal/Kconfig

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -163,7 +163,7 @@ config THERMAL_EMULATION

	config HISI_THERMAL		config HISI_THERMAL
	tristate "Hisilicon thermal driver"		tristate "Hisilicon thermal driver"
	depends on ARCH_HISI && CPU_THERMAL && OF		depends on (ARCH_HISI && CPU_THERMAL && OF) \|\| COMPILE_TEST
	help		help
	Enable this to plug hisilicon's thermal sensor driver into the Linux		Enable this to plug hisilicon's thermal sensor driver into the Linux
	thermal framework. cpufreq is used as the cooling device to throttle		thermal framework. cpufreq is used as the cooling device to throttle
	@@ -182,7 +182,7 @@ config IMX_THERMAL

	config SPEAR_THERMAL		config SPEAR_THERMAL
	bool "SPEAr thermal sensor driver"		bool "SPEAr thermal sensor driver"
	depends on PLAT_SPEAR		depends on PLAT_SPEAR \|\| COMPILE_TEST
	depends on OF		depends on OF
	help		help
	Enable this to plug the SPEAr thermal sensor driver into the Linux		Enable this to plug the SPEAr thermal sensor driver into the Linux
	@@ -190,7 +190,7 @@ config SPEAR_THERMAL

	config ROCKCHIP_THERMAL		config ROCKCHIP_THERMAL
	tristate "Rockchip thermal driver"		tristate "Rockchip thermal driver"
	depends on ARCH_ROCKCHIP		depends on ARCH_ROCKCHIP \|\| COMPILE_TEST
	depends on RESET_CONTROLLER		depends on RESET_CONTROLLER
	help		help
	Rockchip thermal driver provides support for Temperature sensor		Rockchip thermal driver provides support for Temperature sensor
	@@ -208,7 +208,7 @@ config RCAR_THERMAL

	config KIRKWOOD_THERMAL		config KIRKWOOD_THERMAL
	tristate "Temperature sensor on Marvell Kirkwood SoCs"		tristate "Temperature sensor on Marvell Kirkwood SoCs"
	depends on MACH_KIRKWOOD		depends on MACH_KIRKWOOD \|\| COMPILE_TEST
	depends on OF		depends on OF
	help		help
	Support for the Kirkwood thermal sensor driver into the Linux thermal		Support for the Kirkwood thermal sensor driver into the Linux thermal
	@@ -216,7 +216,7 @@ config KIRKWOOD_THERMAL

	config DOVE_THERMAL		config DOVE_THERMAL
	tristate "Temperature sensor on Marvell Dove SoCs"		tristate "Temperature sensor on Marvell Dove SoCs"
	depends on ARCH_DOVE \|\| MACH_DOVE		depends on ARCH_DOVE \|\| MACH_DOVE \|\| COMPILE_TEST
	depends on OF		depends on OF
	help		help
	Support for the Dove thermal sensor driver in the Linux thermal		Support for the Dove thermal sensor driver in the Linux thermal
	@@ -234,7 +234,7 @@ config DB8500_THERMAL

	config ARMADA_THERMAL		config ARMADA_THERMAL
	tristate "Armada 370/XP thermal management"		tristate "Armada 370/XP thermal management"
	depends on ARCH_MVEBU		depends on ARCH_MVEBU \|\| COMPILE_TEST
	depends on OF		depends on OF
	help		help
	Enable this option if you want to have support for thermal management		Enable this option if you want to have support for thermal management
	@@ -349,11 +349,12 @@ config INTEL_PCH_THERMAL
	programmable trip points and other information.		programmable trip points and other information.

	menu "Texas Instruments thermal drivers"		menu "Texas Instruments thermal drivers"
			depends on ARCH_HAS_BANDGAP \|\| COMPILE_TEST
	source "drivers/thermal/ti-soc-thermal/Kconfig"		source "drivers/thermal/ti-soc-thermal/Kconfig"
	endmenu		endmenu

	menu "Samsung thermal drivers"		menu "Samsung thermal drivers"
	depends on ARCH_EXYNOS		depends on ARCH_EXYNOS \|\| COMPILE_TEST
	source "drivers/thermal/samsung/Kconfig"		source "drivers/thermal/samsung/Kconfig"
	endmenu		endmenu

	@@ -364,7 +365,7 @@ endmenu

	config QCOM_SPMI_TEMP_ALARM		config QCOM_SPMI_TEMP_ALARM
	tristate "Qualcomm SPMI PMIC Temperature Alarm"		tristate "Qualcomm SPMI PMIC Temperature Alarm"
	depends on OF && SPMI && IIO		depends on OF && (SPMI \|\| COMPILE_TEST) && IIO
	select REGMAP_SPMI		select REGMAP_SPMI
	help		help
	This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)		This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)

drivers/thermal/cpu_cooling.c

+31 −21

Original line number	Original line	Diff line number	Diff line
	@@ -262,7 +262,9 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb,
	* efficiently. Power is stored in mW, frequency in KHz. The		* efficiently. Power is stored in mW, frequency in KHz. The
	* resulting table is in ascending order.		* resulting table is in ascending order.
	*		*
	* Return: 0 on success, -E* on error.		* Return: 0 on success, -EINVAL if there are no OPPs for any CPUs,
			* -ENOMEM if we run out of memory or -EAGAIN if an OPP was
			* added/enabled while the function was executing.
	*/		*/
	static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_device,		static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_device,
	u32 capacitance)		u32 capacitance)
	@@ -273,8 +275,6 @@ static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_device,
	int num_opps = 0, cpu, i, ret = 0;		int num_opps = 0, cpu, i, ret = 0;
	unsigned long freq;		unsigned long freq;

	rcu_read_lock();

	for_each_cpu(cpu, &cpufreq_device->allowed_cpus) {		for_each_cpu(cpu, &cpufreq_device->allowed_cpus) {
	dev = get_cpu_device(cpu);		dev = get_cpu_device(cpu);
	if (!dev) {		if (!dev) {
	@@ -284,24 +284,20 @@ static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_device,
	}		}

	num_opps = dev_pm_opp_get_opp_count(dev);		num_opps = dev_pm_opp_get_opp_count(dev);
	if (num_opps > 0) {		if (num_opps > 0)
	break;		break;
	} else if (num_opps < 0) {		else if (num_opps < 0)
	ret = num_opps;		return num_opps;
	goto unlock;
	}
	}		}

	if (num_opps == 0) {		if (num_opps == 0)
	ret = -EINVAL;		return -EINVAL;
	goto unlock;
	}

	power_table = kcalloc(num_opps, sizeof(*power_table), GFP_KERNEL);		power_table = kcalloc(num_opps, sizeof(*power_table), GFP_KERNEL);
	if (!power_table) {		if (!power_table)
	ret = -ENOMEM;		return -ENOMEM;
	goto unlock;
	}		rcu_read_lock();

	for (freq = 0, i = 0;		for (freq = 0, i = 0;
	opp = dev_pm_opp_find_freq_ceil(dev, &freq), !IS_ERR(opp);		opp = dev_pm_opp_find_freq_ceil(dev, &freq), !IS_ERR(opp);
	@@ -309,6 +305,12 @@ static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_device,
	u32 freq_mhz, voltage_mv;		u32 freq_mhz, voltage_mv;
	u64 power;		u64 power;

			if (i >= num_opps) {
			rcu_read_unlock();
			ret = -EAGAIN;
			goto free_power_table;
			}

	freq_mhz = freq / 1000000;		freq_mhz = freq / 1000000;
	voltage_mv = dev_pm_opp_get_voltage(opp) / 1000;		voltage_mv = dev_pm_opp_get_voltage(opp) / 1000;

	@@ -326,17 +328,22 @@ static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_device,
	power_table[i].power = power;		power_table[i].power = power;
	}		}

	if (i == 0) {		rcu_read_unlock();

			if (i != num_opps) {
	ret = PTR_ERR(opp);		ret = PTR_ERR(opp);
	goto unlock;		goto free_power_table;
	}		}

	cpufreq_device->cpu_dev = dev;		cpufreq_device->cpu_dev = dev;
	cpufreq_device->dyn_power_table = power_table;		cpufreq_device->dyn_power_table = power_table;
	cpufreq_device->dyn_power_table_entries = i;		cpufreq_device->dyn_power_table_entries = i;

	unlock:		return 0;
	rcu_read_unlock();
			free_power_table:
			kfree(power_table);

	return ret;		return ret;
	}		}

	@@ -847,7 +854,7 @@ __cpufreq_cooling_register(struct device_node *np,
	ret = get_idr(&cpufreq_idr, &cpufreq_dev->id);		ret = get_idr(&cpufreq_idr, &cpufreq_dev->id);
	if (ret) {		if (ret) {
	cool_dev = ERR_PTR(ret);		cool_dev = ERR_PTR(ret);
	goto free_table;		goto free_power_table;
	}		}

	snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",		snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
	@@ -889,6 +896,8 @@ __cpufreq_cooling_register(struct device_node *np,

	remove_idr:		remove_idr:
	release_idr(&cpufreq_idr, cpufreq_dev->id);		release_idr(&cpufreq_idr, cpufreq_dev->id);
			free_power_table:
			kfree(cpufreq_dev->dyn_power_table);
	free_table:		free_table:
	kfree(cpufreq_dev->freq_table);		kfree(cpufreq_dev->freq_table);
	free_time_in_idle_timestamp:		free_time_in_idle_timestamp:
	@@ -1039,6 +1048,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)

	thermal_cooling_device_unregister(cpufreq_dev->cool_dev);		thermal_cooling_device_unregister(cpufreq_dev->cool_dev);
	release_idr(&cpufreq_idr, cpufreq_dev->id);		release_idr(&cpufreq_idr, cpufreq_dev->id);
			kfree(cpufreq_dev->dyn_power_table);
	kfree(cpufreq_dev->time_in_idle_timestamp);		kfree(cpufreq_dev->time_in_idle_timestamp);
	kfree(cpufreq_dev->time_in_idle);		kfree(cpufreq_dev->time_in_idle);
	kfree(cpufreq_dev->freq_table);		kfree(cpufreq_dev->freq_table);

drivers/thermal/db8500_cpufreq_cooling.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,7 @@ static const struct of_device_id db8500_cpufreq_cooling_match[] = {
	{ .compatible = "stericsson,db8500-cpufreq-cooling" },		{ .compatible = "stericsson,db8500-cpufreq-cooling" },
	{},		{},
	};		};
			MODULE_DEVICE_TABLE(of, db8500_cpufreq_cooling_match);
	#endif		#endif

	static struct platform_driver db8500_cpufreq_cooling_driver = {		static struct platform_driver db8500_cpufreq_cooling_driver = {