Commit 5a4e5b78 authored by Quentin Perret's avatar Quentin Perret Committed by Daniel Lezcano
Browse files

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



The core CPU cooling infrastructure has power-related functions
that have only one client: IPA. Since there can be no user of those
functions if IPA is not compiled in, make sure to guard them with
checks on CONFIG_THERMAL_GOV_POWER_ALLOCATOR to not waste space
unnecessarily.

Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Suggested-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20191030151451.7961-4-qperret@google.com
parent 27a47e42

drivers/thermal/cpu_cooling.c

+81 −85
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ 
 */

struct freq_table {

	u32 frequency;

#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR

	u32 power;

#endif

};



/**
@@ -95,8 +97,7 @@ 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 */



#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
@@ -265,76 +266,6 @@ 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;



	/* 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;



	cpufreq_cdev->cpufreq_state = state;



	return freq_qos_update_request(&cpufreq_cdev->qos_req,

				cpufreq_cdev->freq_table[state].frequency);

}



/**

 * cpufreq_get_requested_power() - get the current power

 * @cdev:	&thermal_cooling_device pointer
@@ -478,6 +409,77 @@ 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;



	/* 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;



	cpufreq_cdev->cpufreq_state = state;



	return freq_qos_update_request(&cpufreq_cdev->qos_req,

				cpufreq_cdev->freq_table[state].frequency);

}



/* Bind cpufreq callbacks to thermal cooling device ops */
@@ -487,15 +489,6 @@ 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,

};



static unsigned int find_next_max(struct cpufreq_frequency_table *table,

				  unsigned int prev_max)

{
@@ -603,17 +596,20 @@ __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 = &cpufreq_power_cooling_ops;

	} else {

		cooling_ops = &cpufreq_cooling_ops;

		cooling_ops->get_requested_power = cpufreq_get_requested_power;

		cooling_ops->state2power = cpufreq_state2power;

		cooling_ops->power2state = cpufreq_power2state;

	}

#endif



	ret = freq_qos_add_request(&policy->constraints,

				   &cpufreq_cdev->qos_req, FREQ_QOS_MAX,

CRA Git | Maintained and supported by SUSTech CRA and CCSE