Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3803021c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Alistair Delva
Browse files

Revert "FROMLIST: thermal: cpu_cooling: Make the power-related code depend on IPA" 



This reverts commit e5c4fc9d.

We want to back-out the eas-dev merge that happened in the tree after
5.3-rc1 as those patches "should" all be in Linus's tree now.

This is done to handle the merge conflicts with 5.4-rc1.

Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I601699aa4165dfe927b024c022fae72223f34d4a
parent eadba2a3

drivers/thermal/cpu_cooling.c

+110 −104
Original line number Diff line number Diff line
@@ -46,9 +46,7 @@ 
 */

struct freq_table {

	u32 frequency;

#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR

	u32 power;

#endif

};



/**
@@ -98,6 +96,28 @@ static DEFINE_IDA(cpufreq_ida); 
static DEFINE_MUTEX(cooling_list_lock);

static LIST_HEAD(cpufreq_cdev_list);



/* Below code defines functions to be used for cpufreq as cooling device */



/**

 * get_level: Find the level for a particular frequency

 * @cpufreq_cdev: cpufreq_cdev for which the property is required

 * @freq: Frequency

 *

 * Return: level corresponding to the frequency.

 */

static unsigned long get_level(struct cpufreq_cooling_device *cpufreq_cdev,

			       unsigned int freq)

{

	struct freq_table *freq_table = cpufreq_cdev->freq_table;

	unsigned long level;



	for (level = 1; level <= cpufreq_cdev->max_level; level++)

		if (freq > freq_table[level].frequency)

			break;



	return level - 1;

}



/**

 * cpufreq_thermal_notifier - notifier callback for cpufreq policy change.

 * @nb:	struct notifier_block * with callback info.
@@ -151,27 +171,6 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb, 
	return NOTIFY_OK;

}



#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR

/**

 * get_level: Find the level for a particular frequency

 * @cpufreq_cdev: cpufreq_cdev for which the property is required

 * @freq: Frequency

 *

 * Return: level corresponding to the frequency.

 */

static unsigned long get_level(struct cpufreq_cooling_device *cpufreq_cdev,

			       unsigned int freq)

{

	struct freq_table *freq_table = cpufreq_cdev->freq_table;

	unsigned long level;



	for (level = 1; level <= cpufreq_cdev->max_level; level++)

		if (freq > freq_table[level].frequency)

			break;



	return level - 1;

}



/**

 * update_freq_table() - Update the freq table with power numbers

 * @cpufreq_cdev:	the cpufreq cooling device in which to update the table
@@ -320,6 +319,80 @@ static u32 get_dynamic_power(struct cpufreq_cooling_device *cpufreq_cdev, 
	return (raw_cpu_power * cpufreq_cdev->last_load) / 100;

}



/* cpufreq cooling device callback functions are defined below */



/**

 * cpufreq_get_max_state - callback function to get the max cooling state.

 * @cdev: thermal cooling device pointer.

 * @state: fill this variable with the max cooling state.

 *

 * Callback for the thermal cooling device to return the cpufreq

 * max cooling state.

 *

 * Return: 0 on success, an error code otherwise.

 */

static int cpufreq_get_max_state(struct thermal_cooling_device *cdev,

				 unsigned long *state)

{

	struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;



	*state = cpufreq_cdev->max_level;

	return 0;

}



/**

 * cpufreq_get_cur_state - callback function to get the current cooling state.

 * @cdev: thermal cooling device pointer.

 * @state: fill this variable with the current cooling state.

 *

 * Callback for the thermal cooling device to return the cpufreq

 * current cooling state.

 *

 * Return: 0 on success, an error code otherwise.

 */

static int cpufreq_get_cur_state(struct thermal_cooling_device *cdev,

				 unsigned long *state)

{

	struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;



	*state = cpufreq_cdev->cpufreq_state;



	return 0;

}



/**

 * cpufreq_set_cur_state - callback function to set the current cooling state.

 * @cdev: thermal cooling device pointer.

 * @state: set this variable to the current cooling state.

 *

 * Callback for the thermal cooling device to change the cpufreq

 * current cooling state.

 *

 * Return: 0 on success, an error code otherwise.

 */

static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev,

				 unsigned long state)

{

	struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;

	unsigned int clip_freq;



	/* Request state should be less than max_level */

	if (WARN_ON(state > cpufreq_cdev->max_level))

		return -EINVAL;



	/* Check if the old cooling action is same as new cooling action */

	if (cpufreq_cdev->cpufreq_state == state)

		return 0;



	clip_freq = cpufreq_cdev->freq_table[state].frequency;

	cpufreq_cdev->cpufreq_state = state;

	cpufreq_cdev->clipped_freq = clip_freq;



	cpufreq_update_policy(cpufreq_cdev->policy->cpu);



	return 0;

}



/**

 * cpufreq_get_requested_power() - get the current power

 * @cdev:	&thermal_cooling_device pointer
@@ -463,81 +536,6 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev, 
				      power);

	return 0;

}

#endif /* CONFIG_THERMAL_GOV_POWER_ALLOCATOR */



/* cpufreq cooling device callback functions are defined below */



/**

 * cpufreq_get_max_state - callback function to get the max cooling state.

 * @cdev: thermal cooling device pointer.

 * @state: fill this variable with the max cooling state.

 *

 * Callback for the thermal cooling device to return the cpufreq

 * max cooling state.

 *

 * Return: 0 on success, an error code otherwise.

 */

static int cpufreq_get_max_state(struct thermal_cooling_device *cdev,

				 unsigned long *state)

{

	struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;



	*state = cpufreq_cdev->max_level;

	return 0;

}



/**

 * cpufreq_get_cur_state - callback function to get the current cooling state.

 * @cdev: thermal cooling device pointer.

 * @state: fill this variable with the current cooling state.

 *

 * Callback for the thermal cooling device to return the cpufreq

 * current cooling state.

 *

 * Return: 0 on success, an error code otherwise.

 */

static int cpufreq_get_cur_state(struct thermal_cooling_device *cdev,

				 unsigned long *state)

{

	struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;



	*state = cpufreq_cdev->cpufreq_state;



	return 0;

}



/**

 * cpufreq_set_cur_state - callback function to set the current cooling state.

 * @cdev: thermal cooling device pointer.

 * @state: set this variable to the current cooling state.

 *

 * Callback for the thermal cooling device to change the cpufreq

 * current cooling state.

 *

 * Return: 0 on success, an error code otherwise.

 */

static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev,

				 unsigned long state)

{

	struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;

	unsigned int clip_freq;



	/* Request state should be less than max_level */

	if (WARN_ON(state > cpufreq_cdev->max_level))

		return -EINVAL;



	/* Check if the old cooling action is same as new cooling action */

	if (cpufreq_cdev->cpufreq_state == state)

		return 0;



	clip_freq = cpufreq_cdev->freq_table[state].frequency;

	cpufreq_cdev->cpufreq_state = state;

	cpufreq_cdev->clipped_freq = clip_freq;



	cpufreq_update_policy(cpufreq_cdev->policy->cpu);



	return 0;

}



/* Bind cpufreq callbacks to thermal cooling device ops */
@@ -547,6 +545,15 @@ static struct thermal_cooling_device_ops cpufreq_cooling_ops = { 
	.set_cur_state = cpufreq_set_cur_state,

};



static struct thermal_cooling_device_ops cpufreq_power_cooling_ops = {

	.get_max_state		= cpufreq_get_max_state,

	.get_cur_state		= cpufreq_get_cur_state,

	.set_cur_state		= cpufreq_set_cur_state,

	.get_requested_power	= cpufreq_get_requested_power,

	.state2power		= cpufreq_state2power,

	.power2state		= cpufreq_power2state,

};



/* Notifier for cpufreq policy change */

static struct notifier_block thermal_cpufreq_notifier_block = {

	.notifier_call = cpufreq_thermal_notifier,
@@ -652,19 +659,18 @@ __cpufreq_cooling_register(struct device_node *np, 
			pr_debug("%s: freq:%u KHz\n", __func__, freq);

	}



	cooling_ops = &cpufreq_cooling_ops;

#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR

	if (capacitance) {

		ret = update_freq_table(cpufreq_cdev, capacitance);

		if (ret) {

			cdev = ERR_PTR(ret);

			goto remove_ida;

		}

		cooling_ops->get_requested_power = cpufreq_get_requested_power;

		cooling_ops->state2power = cpufreq_state2power;

		cooling_ops->power2state = cpufreq_power2state;



		cooling_ops = &cpufreq_power_cooling_ops;

	} else {

		cooling_ops = &cpufreq_cooling_ops;

	}

#endif



	cdev = thermal_of_cooling_device_register(np, dev_name, cpufreq_cdev,

						  cooling_ops);

	if (IS_ERR(cdev))