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

Commit 80a26a5c authored by Zhang Rui's avatar Zhang Rui
Browse files

Thermal: build thermal governors into thermal_sys module 



The thermal governors are part of the thermal framework,
rather than a seperate feature/module.
Because the generic thermal layer can not work without
thermal governors, and it must load the thermal governors
during its initialization.

Build them into one module in this patch.

This also fix a problem that the generic thermal layer does not
work when CONFIG_THERMAL=m and CONFIG_THERMAL_GOV_XXX=y.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Acked-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
Acked-by: default avatarDurgadoss R <durgadoss.r@intel.com>
parent 5fc024ab

Documentation/thermal/sysfs-api.txt

+0 −8
Original line number Diff line number Diff line
@@ -379,11 +379,3 @@ platform data is provided, this uses the step_wise throttling policy. 
This function serves as an arbitrator to set the state of a cooling

device. It sets the cooling device to the deepest cooling state if

possible.
 


5.5:thermal_register_governor:

This function lets the various thermal governors to register themselves

with the Thermal framework. At run time, depending on a zone's platform

data, a particular governor is used for throttling.



5.6:thermal_unregister_governor:

This function unregisters a governor from the thermal framework.

drivers/thermal/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ obj-$(CONFIG_THERMAL) += thermal_sys.o 
thermal_sys-y			+= thermal_core.o



# governors

obj-$(CONFIG_THERMAL_GOV_FAIR_SHARE)	+= fair_share.o

obj-$(CONFIG_THERMAL_GOV_STEP_WISE)	+= step_wise.o

obj-$(CONFIG_THERMAL_GOV_USER_SPACE)	+= user_space.o

thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE)	+= fair_share.o

thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE)	+= step_wise.o

thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE)	+= user_space.o



# cpufreq cooling

obj-$(CONFIG_CPU_THERMAL)	+= cpu_cooling.o

drivers/thermal/fair_share.c

+2 −13
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/thermal.h>



#include "thermal_core.h"
@@ -111,23 +108,15 @@ static int fair_share_throttle(struct thermal_zone_device *tz, int trip) 
static struct thermal_governor thermal_gov_fair_share = {

	.name		= "fair_share",

	.throttle	= fair_share_throttle,

	.owner		= THIS_MODULE,

};



static int __init thermal_gov_fair_share_init(void)

int thermal_gov_fair_share_register(void)

{

	return thermal_register_governor(&thermal_gov_fair_share);

}



static void __exit thermal_gov_fair_share_exit(void)

void thermal_gov_fair_share_unregister(void)

{

	thermal_unregister_governor(&thermal_gov_fair_share);

}

/* This should load after thermal framework */

fs_initcall(thermal_gov_fair_share_init);

module_exit(thermal_gov_fair_share_exit);



MODULE_AUTHOR("Durgadoss R");

MODULE_DESCRIPTION("A simple weight based thermal throttling governor");

MODULE_LICENSE("GPL");

drivers/thermal/step_wise.c

+2 −14
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/thermal.h>



#include "thermal_core.h"
@@ -186,23 +183,14 @@ static int step_wise_throttle(struct thermal_zone_device *tz, int trip) 
static struct thermal_governor thermal_gov_step_wise = {

	.name		= "step_wise",

	.throttle	= step_wise_throttle,

	.owner		= THIS_MODULE,

};



static int __init thermal_gov_step_wise_init(void)

int thermal_gov_step_wise_register(void)

{

	return thermal_register_governor(&thermal_gov_step_wise);

}



static void __exit thermal_gov_step_wise_exit(void)

void thermal_gov_step_wise_unregister(void)

{

	thermal_unregister_governor(&thermal_gov_step_wise);

}
 


/* This should load after thermal framework */

fs_initcall(thermal_gov_step_wise_init);

module_exit(thermal_gov_step_wise_exit);



MODULE_AUTHOR("Durgadoss R");

MODULE_DESCRIPTION("A step-by-step thermal throttling governor");

MODULE_LICENSE("GPL");

drivers/thermal/thermal_core.c

+48 −11
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ int thermal_register_governor(struct thermal_governor *governor) 


	return err;

}

EXPORT_SYMBOL_GPL(thermal_register_governor);



void thermal_unregister_governor(struct thermal_governor *governor)

{
@@ -127,7 +126,6 @@ exit: 
	mutex_unlock(&thermal_governor_lock);

	return;

}

EXPORT_SYMBOL_GPL(thermal_unregister_governor);



static int get_idr(struct idr *idr, struct mutex *lock, int *id)

{
@@ -1858,30 +1856,69 @@ static inline int genetlink_init(void) { return 0; } 
static inline void genetlink_exit(void) {}

#endif /* !CONFIG_NET */



static int __init thermal_register_governors(void)

{

	int result;



	result = thermal_gov_step_wise_register();

	if (result)

		return result;



	result = thermal_gov_fair_share_register();

	if (result)

		return result;



	return thermal_gov_user_space_register();

}



static void thermal_unregister_governors(void)

{

	thermal_gov_step_wise_unregister();

	thermal_gov_fair_share_unregister();

	thermal_gov_user_space_unregister();

}



static int __init thermal_init(void)

{

	int result = 0;

	int result;



	result = thermal_register_governors();

	if (result)

		goto error;



	result = class_register(&thermal_class);

	if (result) {

	if (result)

		goto unregister_governors;



	result = genetlink_init();

	if (result)

		goto unregister_class;



	return 0;



unregister_governors:

	thermal_unregister_governors();

unregister_class:

	class_unregister(&thermal_class);

error:

	idr_destroy(&thermal_tz_idr);

	idr_destroy(&thermal_cdev_idr);

	mutex_destroy(&thermal_idr_lock);

	mutex_destroy(&thermal_list_lock);

		return result;

	}

	result = genetlink_init();

	mutex_destroy(&thermal_governor_lock);

	return result;

}



static void __exit thermal_exit(void)

{

	genetlink_exit();

	class_unregister(&thermal_class);

	thermal_unregister_governors();

	idr_destroy(&thermal_tz_idr);

	idr_destroy(&thermal_cdev_idr);

	mutex_destroy(&thermal_idr_lock);

	mutex_destroy(&thermal_list_lock);

	genetlink_exit();

	mutex_destroy(&thermal_governor_lock);

}



fs_initcall(thermal_init);