From: "hongbo.zhang" hongbo.zhang@linaro.com
Hi all, This is the ST-Ericsson db8500 thermal dirver, here are some notes of this patch set:
1. 0001-Remove-un-necessary-variable-checking.patch is a trivial update of the thermal framework. 0002-ST-Ericsson-db8500-thermal-dirver.patch is the ST-Ericsson db8500 thermal dirver.
2. Since there is no PRCMU interface to read temperature directly, the PRCMU interrupts are used instead, and a pseudo current temperature is returned, but this works for the thermal management framework. This can be updated when the corresponding PRCMU interface is available.
3. As suggested by Vincent Guittot, the cooling device codes are seperated from thermal zone, this makes it easy to add/remove other cooling devices. CPU frequency limiting is the current cooling device.
4. The driver isn't added into device tree currently, this can be done soon if needed.
hongbo.zhang (2): Remove un-necessary variable checking ST-Ericsson db8500 thermal dirver
arch/arm/configs/u8500_defconfig | 4 + arch/arm/mach-ux500/board-mop500.c | 69 ++++ drivers/thermal/Kconfig | 20 ++ drivers/thermal/Makefile | 4 +- drivers/thermal/cpu_cooling.c | 3 +- drivers/thermal/db8500_cpufreq_cooling.c | 167 +++++++++ drivers/thermal/db8500_thermal.c | 476 ++++++++++++++++++++++++++ include/linux/platform_data/db8500_thermal.h | 39 +++ 8 files changed, 779 insertions(+), 3 deletions(-) create mode 100644 drivers/thermal/db8500_cpufreq_cooling.c create mode 100644 drivers/thermal/db8500_thermal.c create mode 100644 include/linux/platform_data/db8500_thermal.h
From: "hongbo.zhang" hongbo.zhang@linaro.com
Signed-off-by: hongbo.zhang hongbo.zhang@linaro.com --- drivers/thermal/cpu_cooling.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index c40d9a0..a8aa10f 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -399,8 +399,7 @@ struct thermal_cooling_device *cpufreq_cooling_register( /*Verify that all the entries of freq_clip_table are present*/ for (i = 0; i < tab_size; i++) { clip_tab = ((struct freq_clip_table *)&tab_ptr[i]); - if (!clip_tab->freq_clip_max || !clip_tab->mask_val - || !clip_tab->temp_level) { + if (!clip_tab->freq_clip_max || !clip_tab->mask_val) { kfree(cpufreq_dev); return ERR_PTR(-EINVAL); }
From: "hongbo.zhang" hongbo.zhang@stericsson.com
Signed-off-by: hongbo.zhang hongbo.zhang@linaro.com --- arch/arm/configs/u8500_defconfig | 4 + arch/arm/mach-ux500/board-mop500.c | 69 ++++ drivers/thermal/Kconfig | 20 ++ drivers/thermal/Makefile | 4 +- drivers/thermal/db8500_cpufreq_cooling.c | 167 +++++++++ drivers/thermal/db8500_thermal.c | 476 ++++++++++++++++++++++++++ include/linux/platform_data/db8500_thermal.h | 39 +++ 7 files changed, 778 insertions(+), 1 deletion(-) create mode 100644 drivers/thermal/db8500_cpufreq_cooling.c create mode 100644 drivers/thermal/db8500_thermal.c create mode 100644 include/linux/platform_data/db8500_thermal.h
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 036419f..15a455e 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -117,3 +117,7 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_INFO=y # CONFIG_FTRACE is not set CONFIG_DEBUG_USER=y +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_DB8500_THERMAL=y +CONFIG_DB8500_CPUFREQ_COOLING=y diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 1509a3c..77b3fca 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -30,6 +30,8 @@ #include <linux/smsc911x.h> #include <linux/gpio_keys.h> #include <linux/delay.h> +#include <linux/platform_data/db8500_thermal.h> + #include <linux/of.h> #include <linux/of_platform.h> #include <linux/leds.h> @@ -216,6 +218,71 @@ struct platform_device ab8500_device = { };
/* + * Thermal Sensor + */ + +static struct resource db8500_thsens_resources[] = { + { + .name = "IRQ_HOTMON_LOW", + .start = IRQ_PRCMU_HOTMON_LOW, + .end = IRQ_PRCMU_HOTMON_LOW, + .flags = IORESOURCE_IRQ, + }, + { + .name = "IRQ_HOTMON_HIGH", + .start = IRQ_PRCMU_HOTMON_HIGH, + .end = IRQ_PRCMU_HOTMON_HIGH, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct db8500_trip_point db8500_trips_table[] = { + [0] = { + .temp = 70000, + .type = THERMAL_TRIP_ACTIVE, + .cooling_dev_name = { + [0] = "thermal-cpufreq-0", + }, + }, + [1] = { + .temp = 75000, + .type = THERMAL_TRIP_ACTIVE, + .cooling_dev_name = { + [0] = "thermal-cpufreq-1", + }, + }, + [2] = { + .temp = 80000, + .type = THERMAL_TRIP_ACTIVE, + .cooling_dev_name = { + [0] = "thermal-cpufreq-2", + }, + }, + [3] = { + .temp = 85000, + .type = THERMAL_TRIP_CRITICAL, + }, +}; + +static struct db8500_thsens_platform_data db8500_thsens_data = { + .trip_points = db8500_trips_table, + .num_trips = ARRAY_SIZE(db8500_trips_table), +}; + +static struct platform_device u8500_thsens_device = { + .name = "db8500_thermal", + .resource = db8500_thsens_resources, + .num_resources = ARRAY_SIZE(db8500_thsens_resources), + .dev = { + .platform_data = &db8500_thsens_data, + }, +}; + +static struct platform_device u8500_cpufreq_cooling_device = { + .name = "db8500_cpufreq_cooling", +}; + +/* * TPS61052 */
@@ -623,6 +690,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_key_dev, &snowball_sbnet_dev, &ab8500_device, + &u8500_thsens_device, + &u8500_cpufreq_cooling_device, };
static struct platform_device *snowball_of_platform_devs[] __initdata = { diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index d9c529f..5482116 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -30,6 +30,26 @@ config CPU_THERMAL and not the ACPI interface. If you want this support, you should say Y or M here.
+config DB8500_THERMAL + bool "db8500 thermal management" + depends on THERMAL + default y + help + Adds DB8500 thermal management implementation according to the thermal + management framework. A thermal zone with several trip points will be + created. Cooling devices can be binded to the trip points to cool this + thermal zone if trip points reached. + +config DB8500_CPUFREQ_COOLING + tristate "db8500 cpufreq cooling" + depends on CPU_THERMAL + default y + help + Adds DB8500 cpufreq cooling devices, and these cooling devices can be + binded to thermal zone trip points. When a trip point reached, the + binded cpufreq cooling device turns active to set CPU frequency low to + cool down the CPU. + config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on THERMAL diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 30c456c..d146456 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -3,5 +3,7 @@ #
obj-$(CONFIG_THERMAL) += thermal_sys.o -obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o +obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o +obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_DB8500_CPUFREQ_COOLING) +=db8500_cpufreq_cooling.o obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c new file mode 100644 index 0000000..2c2c91b --- /dev/null +++ b/drivers/thermal/db8500_cpufreq_cooling.c @@ -0,0 +1,167 @@ +/* + * db8500_cpufreq_cooling.c - db8500 cpufreq works as cooling device. + * + * Copyright (C) 2012 ST-Ericsson + * Copyright (C) 2012 Linaro Ltd. + * + * Author: Hongbo Zhang hognbo.zhang@stericsson.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/cpufreq.h> +#include <linux/cpu_cooling.h> +#include <linux/err.h> + +static LIST_HEAD(db8500_cpufreq_cdev_list); + +struct db8500_cpufreq_cdev { + struct thermal_cooling_device *cdev; + struct list_head node; +}; + +/* Local function to create cpufreq clip table */ +static int cpufreq_table_create(struct platform_device *pdev, + struct freq_clip_table **freq_tab, int *num_freq) +{ + struct cpufreq_frequency_table *table; + struct freq_clip_table *freq_clip; + unsigned int temp; + int i, j, count = 0; + + table = cpufreq_frequency_get_table(0); + if (!table) + return -ENODATA; + + /* Check number of frequencies */ + for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) { + if (table[i].frequency == CPUFREQ_ENTRY_INVALID) + continue; + count++; + } + + freq_clip = devm_kzalloc(&pdev->dev, + sizeof(struct freq_clip_table) * count, GFP_KERNEL); + + /* Save frequencies */ + count = 0; + for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) { + if (table[i].frequency == CPUFREQ_ENTRY_INVALID) + continue; + freq_clip[count].freq_clip_max = table[i].frequency; + count++; + } + + /* Descending order frequencies */ + for (i = 0; i <= count - 2; i++) + for (j = i + 1; j <= count - 1; j++) + if (freq_clip[i].freq_clip_max < freq_clip[j].freq_clip_max) { + temp = freq_clip[i].freq_clip_max; + freq_clip[i].freq_clip_max = freq_clip[j].freq_clip_max; + freq_clip[j].freq_clip_max = temp; + } + + for (i = 0; i < count; i++) { + freq_clip[i].mask_val = cpu_present_mask; + pr_info("db8500_clip_table.%d: %d\n", i, + freq_clip[i].freq_clip_max); + } + + *freq_tab = freq_clip; + *num_freq = count; + + return 0; +} + +static int __devinit db8500_cpufreq_cooling_probe(struct platform_device *pdev) +{ + struct freq_clip_table *freq_tab = NULL; + struct db8500_cpufreq_cdev *cooling_devs; + int i, ret, num_freq = 0; + + if (cpufreq_table_create(pdev, &freq_tab, &num_freq)) + return -ENODATA; + + if (unlikely(!freq_tab || !num_freq)) + return -ENODATA; + + /* Create one cooling device for each clip frequency */ + for (i = 0; i < num_freq; i++) { + cooling_devs = devm_kzalloc(&pdev->dev, + sizeof(struct db8500_cpufreq_cdev), GFP_KERNEL); + if (!cooling_devs) { + ret = -ENOMEM; + goto exit; + } + + cooling_devs->cdev = cpufreq_cooling_register(&freq_tab[i], 1); + + if (IS_ERR(cooling_devs->cdev)) { + pr_err("Failed to register cpufreq cooling device\n"); + ret = PTR_ERR(cooling_devs->cdev); + goto exit; + } + + list_add_tail(&cooling_devs->node, &db8500_cpufreq_cdev_list); + pr_info("Cooling device regestered: %s\n", + cooling_devs->cdev->type); + } + + return 0; + +exit: + list_for_each_entry(cooling_devs, &db8500_cpufreq_cdev_list, node) + cpufreq_cooling_unregister(cooling_devs->cdev); + + return ret; +} + +static int __devexit db8500_cpufreq_cooling_remove(struct platform_device *pdev) +{ + struct db8500_cpufreq_cdev *cooling_devs; + + list_for_each_entry(cooling_devs, &db8500_cpufreq_cdev_list, node) + cpufreq_cooling_unregister(cooling_devs->cdev); + + return 0; +} + +/* No actions required in suspend/resume, so lack of them */ +static struct platform_driver db8500_cpufreq_cooling_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "db8500_cpufreq_cooling", + }, + .probe = db8500_cpufreq_cooling_probe, + .remove = __devexit_p(db8500_cpufreq_cooling_remove), +}; + +static int __init db8500_cpufreq_cooling_init(void) +{ + return platform_driver_register(&db8500_cpufreq_cooling_driver); +} + +static void __exit db8500_cpufreq_cooling_exit(void) +{ + platform_driver_unregister(&db8500_cpufreq_cooling_driver); +} + +/* Should be later than db8500_cpufreq_register */ +late_initcall(db8500_cpufreq_cooling_init); +module_exit(db8500_cpufreq_cooling_exit); + +MODULE_AUTHOR("Hongbo Zhang hongbo.zhang@stericsson.com"); +MODULE_DESCRIPTION("db8500 cpufreq cooling driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c new file mode 100644 index 0000000..32afaeb --- /dev/null +++ b/drivers/thermal/db8500_thermal.c @@ -0,0 +1,476 @@ +/* + * db8500_thermal.c - db8500 Thermal Management Implementation + * + * Copyright (C) 2012 ST-Ericsson + * Copyright (C) 2012 Linaro Ltd. + * + * Author: Hongbo Zhang hognbo.zhang@stericsson.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/thermal.h> +#include <linux/cpu_cooling.h> +#include <linux/mfd/dbx500-prcmu.h> +#include <linux/platform_data/db8500_thermal.h> + +#define PRCMU_DEFAULT_MEASURE_TIME 0xFFF +#define PRCMU_DEFAULT_LOW_TEMP 0 + +struct db8500_thermal_zone { + struct thermal_zone_device *therm_dev; + struct mutex th_lock; + struct platform_device *thsens_pdev; + struct work_struct therm_work; + struct db8500_thsens_platform_data *trip_tab; + enum thermal_device_mode mode; + unsigned long cur_temp_pseudo; + unsigned int cur_index; + int low_irq; + int high_irq; +}; + +/* Bind callback functions for thermal zone */ +static int db8500_cdev_bind(struct thermal_zone_device *thermal, + struct thermal_cooling_device *cdev) +{ + struct db8500_thermal_zone *pzone; + struct db8500_thsens_platform_data *ptrips; + char *cdev_name; + int i, j, ret; + + pzone = (struct db8500_thermal_zone *)thermal->devdata; + ptrips = pzone->trip_tab; + + if (!cdev->type) + return -EINVAL; + + ret = -ENODEV; + for (i = 0; i < ptrips->num_trips; i++) + for (j = 0; j < COOLING_DEV_MAX; j++) { + cdev_name = ptrips->trip_points[i].cooling_dev_name[j]; + if (!cdev_name) + continue; + + if (strcmp(cdev_name, cdev->type)) + continue; + + ret = thermal_zone_bind_cooling_device(thermal, i, cdev); + if (ret) + pr_err("Error binding cooling device.\n"); + else + pr_info("%s binded to %d.\n", cdev->type, i); + } + + /* Force an update since polling mode is not used */ + schedule_work(&pzone->therm_work); + + return ret; +} + +/* Unbind callback functions for thermal zone */ +static int db8500_cdev_unbind(struct thermal_zone_device *thermal, + struct thermal_cooling_device *cdev) +{ + struct db8500_thermal_zone *pzone; + struct db8500_thsens_platform_data *ptrips; + char *cdev_name; + int i, j, ret; + + pzone = (struct db8500_thermal_zone *)thermal->devdata; + ptrips = pzone->trip_tab; + + if (!cdev->type) + return -EINVAL; + + ret = -ENODEV; + for (i = 0; i < ptrips->num_trips; i++) + for (j = 0; j < COOLING_DEV_MAX; j++) { + cdev_name = ptrips->trip_points[i].cooling_dev_name[j]; + if (!cdev_name) + continue; + + if (strcmp(cdev_name, cdev->type)) + continue; + + /* Invalidate the cooling device before unbinding it */ + if (cdev->ops->set_cur_state) + cdev->ops->set_cur_state(cdev, 0); + + ret = thermal_zone_unbind_cooling_device(thermal, i, cdev); + if (ret) + pr_err("Error unbinding cooling device.\n"); + else + pr_info("%s unbinded from %d.\n", cdev->type, i); + } + + return ret; +} + +/* Get temperature callback functions for thermal zone */ +static int db8500_sys_get_temp(struct thermal_zone_device *thermal, + unsigned long *temp) +{ + struct db8500_thermal_zone *pzone; + + pzone = (struct db8500_thermal_zone *)thermal->devdata; + + /* TODO: There is no PRCMU interface to get temperature data currently, + so a pseudo temperature is returned , it works for the thermal framework + and this will be fixed when the PRCMU interface is available */ + *temp = pzone->cur_temp_pseudo; + + return 0; +} + +/* Get mode callback functions for thermal zone */ +static int db8500_sys_get_mode(struct thermal_zone_device *thermal, + enum thermal_device_mode *mode) +{ + struct db8500_thermal_zone *pzone; + pzone = (struct db8500_thermal_zone *)thermal->devdata; + + mutex_lock(&pzone->th_lock); + *mode = pzone->mode; + mutex_unlock(&pzone->th_lock); + + return 0; +} + +/* Set mode callback functions for thermal zone */ +static int db8500_sys_set_mode(struct thermal_zone_device *thermal, + enum thermal_device_mode mode) +{ + struct db8500_thermal_zone *pzone; + struct thermal_zone_device *pthdev; + + pzone = (struct db8500_thermal_zone *)thermal->devdata; + pthdev = pzone->therm_dev; + + if (!pthdev) { + pr_err("Thermal zone not registered.\n"); + return 0; + } + + mutex_lock(&pzone->th_lock); + if (mode == THERMAL_DEVICE_ENABLED) { + if (pzone->mode == THERMAL_DEVICE_DISABLED) + pr_info("Thermal function started.\n"); + else + pr_info("Thermal function already started.\n"); + } else { + if (pzone->mode == THERMAL_DEVICE_ENABLED) + pr_info("Thermal function stoped.\n"); + else + pr_info("Thermal function already stoped.\n"); + } + pzone->mode = mode; + mutex_unlock(&pzone->th_lock); + + return 0; +} + +/* Get trip type callback function for thermal zone */ +static int db8500_sys_get_trip_type(struct thermal_zone_device *thermal, + int trip, enum thermal_trip_type *type) +{ + struct db8500_thermal_zone *pzone; + struct db8500_thsens_platform_data *ptrips; + + pzone = (struct db8500_thermal_zone *)thermal->devdata; + ptrips = pzone->trip_tab; + + if (trip >= ptrips->num_trips) + return -EINVAL; + + *type = ptrips->trip_points[trip].type; + + return 0; +} + +/* Get trip temperature callback function for thermal zone */ +static int db8500_sys_get_trip_temp(struct thermal_zone_device *thermal, + int trip, unsigned long *temp) +{ + struct db8500_thermal_zone *pzone; + struct db8500_thsens_platform_data *ptrips; + + pzone = (struct db8500_thermal_zone *)thermal->devdata; + ptrips = pzone->trip_tab; + + if (trip >= ptrips->num_trips) + return -EINVAL; + + *temp = ptrips->trip_points[trip].temp; + + return 0; +} + +/* Get critical temperature callback function for thermal zone */ +static int db8500_sys_get_crit_temp(struct thermal_zone_device *thermal, + unsigned long *temp) +{ + struct db8500_thermal_zone *pzone; + struct db8500_thsens_platform_data *ptrips; + int i; + + pzone = (struct db8500_thermal_zone *)thermal->devdata; + ptrips = pzone->trip_tab; + + for (i = (ptrips->num_trips - 1) ; i > 0 ; i--) { + if (ptrips->trip_points[i].type == THERMAL_TRIP_CRITICAL) { + *temp = ptrips->trip_points[i].temp; + return 0; + } + } + + return -EINVAL; +} + +static struct thermal_zone_device_ops thdev_ops = { + .bind = db8500_cdev_bind, + .unbind = db8500_cdev_unbind, + .get_temp = db8500_sys_get_temp, + .get_mode = db8500_sys_get_mode, + .set_mode = db8500_sys_set_mode, + .get_trip_type = db8500_sys_get_trip_type, + .get_trip_temp = db8500_sys_get_trip_temp, + .get_crit_temp = db8500_sys_get_crit_temp, +}; + +static irqreturn_t prcmu_low_irq_handler(int irq, void *irq_data) +{ + struct db8500_thermal_zone *pzone = irq_data; + struct db8500_thsens_platform_data *ptrips; + unsigned long next_low, next_high; + unsigned int idx; + + ptrips = pzone->trip_tab; + idx = pzone->cur_index; + if (unlikely(idx == 0)) + /* Meaningless for thermal management, ignoring it */ + return IRQ_HANDLED; + + if (idx == 1) { + next_high = ptrips->trip_points[0].temp; + next_low = PRCMU_DEFAULT_LOW_TEMP; + } else { + next_high = ptrips->trip_points[idx-1].temp; + next_low = ptrips->trip_points[idx-2].temp; + } + + pzone->cur_index -= 1; + pzone->cur_temp_pseudo = (next_high + next_low)/2; + + prcmu_stop_temp_sense(); + prcmu_config_hotmon((u8)(next_low/1000), (u8)(next_high/1000)); + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); + + pr_debug("PRCMU set max %ld, set min %ld\n", next_high, next_low); + + schedule_work(&pzone->therm_work); + + return IRQ_HANDLED; +} + +static irqreturn_t prcmu_high_irq_handler(int irq, void *irq_data) +{ + struct db8500_thermal_zone *pzone = irq_data; + struct db8500_thsens_platform_data *ptrips; + unsigned long next_low, next_high; + unsigned int idx; + + ptrips = pzone->trip_tab; + idx = pzone->cur_index; + + if (idx < ptrips->num_trips - 1) { + next_high = ptrips->trip_points[idx+1].temp; + next_low = ptrips->trip_points[idx].temp; + + pzone->cur_index += 1; + pzone->cur_temp_pseudo = (next_high + next_low)/2; + + prcmu_stop_temp_sense(); + prcmu_config_hotmon((u8)(next_low/1000), (u8)(next_high/1000)); + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); + + pr_debug("PRCMU set max %ld, min %ld\n", next_high, next_low); + } + + if (idx == ptrips->num_trips - 1) + pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1; + + schedule_work(&pzone->therm_work); + + return IRQ_HANDLED; +} + +static void db8500_thermal_work(struct work_struct *work) +{ + enum thermal_device_mode cur_mode; + struct db8500_thermal_zone *pzone; + + pzone = container_of(work, struct db8500_thermal_zone, therm_work); + + mutex_lock(&pzone->th_lock); + cur_mode = pzone->mode; + mutex_unlock(&pzone->th_lock); + + if (cur_mode == THERMAL_DEVICE_DISABLED) { + pr_warn("Warning: thermal function disabled.\n"); + return; + } + + thermal_zone_device_update(pzone->therm_dev); + pr_debug("db8500_thermal_work finished.\n"); +} + +static int __devinit db8500_thermal_probe(struct platform_device *pdev) +{ + struct db8500_thermal_zone *pzone = NULL; + struct db8500_thsens_platform_data *ptrips; + int low_irq, high_irq, ret = 0; + unsigned long dft_low, dft_high; + + pr_info("Function db8500_thermal_probe.\n"); + + pzone = devm_kzalloc(&pdev->dev, + sizeof(struct db8500_thermal_zone), GFP_KERNEL); + if (!pzone) + return -ENOMEM; + + pzone->thsens_pdev = pdev; + + low_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_LOW"); + if (low_irq < 0) { + pr_err("Get IRQ_HOTMON_LOW failed.\n"); + return low_irq; + } + + ret = devm_request_threaded_irq(&pdev->dev, low_irq, NULL, + prcmu_low_irq_handler, + IRQF_NO_SUSPEND | IRQF_ONESHOT, "dbx500_temp_low", pzone); + if (ret < 0) { + pr_err("Failed to allocate temp low irq.\n"); + return ret; + } + + high_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_HIGH"); + if (high_irq < 0) { + pr_err("Get IRQ_HOTMON_HIGH failed.\n"); + return high_irq; + } + + ret = devm_request_threaded_irq(&pdev->dev, high_irq, NULL, + prcmu_high_irq_handler, + IRQF_NO_SUSPEND | IRQF_ONESHOT, "dbx500_temp_high", pzone); + if (ret < 0) { + pr_err("Failed to allocate temp high irq.\n"); + return ret; + } + + pzone->low_irq = low_irq; + pzone->high_irq = high_irq; + + pzone->mode = THERMAL_DEVICE_DISABLED; + + mutex_init(&pzone->th_lock); + + INIT_WORK(&pzone->therm_work, db8500_thermal_work); + + ptrips = pdev->dev.platform_data; + pzone->trip_tab = ptrips; + + pzone->therm_dev = thermal_zone_device_register("db8500_thermal_zone", + ptrips->num_trips, pzone, &thdev_ops, 0, 0, 0, 0); + + if (IS_ERR(pzone->therm_dev)) { + pr_err("Failed to register thermal zone device\n"); + return PTR_ERR(pzone->therm_dev); + } + + dft_low = PRCMU_DEFAULT_LOW_TEMP; + dft_high = ptrips->trip_points[0].temp; + + prcmu_stop_temp_sense(); + prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000)); + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); + + pzone->cur_index = 0; + pzone->cur_temp_pseudo = (dft_low + dft_high)/2; + + pzone->mode = THERMAL_DEVICE_ENABLED; + + platform_set_drvdata(pdev, pzone); + + return 0; +} + +static int __devexit db8500_thermal_remove(struct platform_device *pdev) +{ + struct db8500_thermal_zone *pzone; + pzone = platform_get_drvdata(pdev); + + cancel_work_sync(&pzone->therm_work); + + if (pzone->therm_dev) + thermal_zone_device_unregister(pzone->therm_dev); + + return 0; +} + +static int db8500_thermal_suspend(struct platform_device *pdev, + pm_message_t state) +{ + struct db8500_thermal_zone *pzone; + pzone = platform_get_drvdata(pdev); + + flush_work_sync(&pzone->therm_work); + return 0; +} + +static int db8500_thermal_resume(struct platform_device *pdev) +{ + return 0; +} + +static struct platform_driver db8500_thermal_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "db8500_thermal" + }, + .probe = db8500_thermal_probe, + .suspend = db8500_thermal_suspend, + .resume = db8500_thermal_resume, + .remove = __devexit_p(db8500_thermal_remove), +}; + +static int __init db8500_thermal_init(void) +{ + return platform_driver_register(&db8500_thermal_driver); +} + +static void __exit db8500_thermal_exit(void) +{ + platform_driver_unregister(&db8500_thermal_driver); +} + +module_init(db8500_thermal_init); +module_exit(db8500_thermal_exit); + +MODULE_AUTHOR("Hongbo Zhang hongbo.zhang@stericsson.com"); +MODULE_DESCRIPTION("db8500 thermal driver"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/platform_data/db8500_thermal.h b/include/linux/platform_data/db8500_thermal.h new file mode 100644 index 0000000..0b6d164 --- /dev/null +++ b/include/linux/platform_data/db8500_thermal.h @@ -0,0 +1,39 @@ +/* + * db8500_thermal.h - db8500 Thermal Management Implementation + * + * Copyright (C) 2012 ST-Ericsson + * Copyright (C) 2012 Linaro Ltd. + * + * Author: Hongbo Zhang hognbo.zhang@stericsson.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#ifndef _DB8500_THERMAL_H_ +#define _DB8500_THERMAL_H_ + +#include <linux/thermal.h> + +#define COOLING_DEV_MAX 8 + +struct db8500_trip_point { + unsigned long temp; + enum thermal_trip_type type; + char *cooling_dev_name[COOLING_DEV_MAX]; +}; + +struct db8500_thsens_platform_data { + struct db8500_trip_point *trip_points; + int num_trips; +}; + +#endif /* _DB8500_THERMAL_H_ */
There are 5 line over 80 characters, is this acceptable or should I obey the checkpatch.pl strictly?
for example this line: [tab] [tab] [tab] ret = thermal_zone_bind_cooling_device(thermal, i, cdev);
I think keeping this code in one line seems neatly.
On 13 July 2012 15:51, hongbo.zhang hongbo.zhang@linaro.org wrote:
From: "hongbo.zhang" hongbo.zhang@stericsson.com
Signed-off-by: hongbo.zhang hongbo.zhang@linaro.com
arch/arm/configs/u8500_defconfig | 4 + arch/arm/mach-ux500/board-mop500.c | 69 ++++ drivers/thermal/Kconfig | 20 ++ drivers/thermal/Makefile | 4 +- drivers/thermal/db8500_cpufreq_cooling.c | 167 +++++++++ drivers/thermal/db8500_thermal.c | 476 ++++++++++++++++++++++++++ include/linux/platform_data/db8500_thermal.h | 39 +++ 7 files changed, 778 insertions(+), 1 deletion(-) create mode 100644 drivers/thermal/db8500_cpufreq_cooling.c create mode 100644 drivers/thermal/db8500_thermal.c create mode 100644 include/linux/platform_data/db8500_thermal.h
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 036419f..15a455e 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -117,3 +117,7 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_INFO=y # CONFIG_FTRACE is not set CONFIG_DEBUG_USER=y +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_DB8500_THERMAL=y +CONFIG_DB8500_CPUFREQ_COOLING=y diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 1509a3c..77b3fca 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -30,6 +30,8 @@ #include <linux/smsc911x.h> #include <linux/gpio_keys.h> #include <linux/delay.h> +#include <linux/platform_data/db8500_thermal.h>
#include <linux/of.h> #include <linux/of_platform.h> #include <linux/leds.h> @@ -216,6 +218,71 @@ struct platform_device ab8500_device = { };
/*
- Thermal Sensor
- */
+static struct resource db8500_thsens_resources[] = {
{.name = "IRQ_HOTMON_LOW",.start = IRQ_PRCMU_HOTMON_LOW,.end = IRQ_PRCMU_HOTMON_LOW,.flags = IORESOURCE_IRQ,},{.name = "IRQ_HOTMON_HIGH",.start = IRQ_PRCMU_HOTMON_HIGH,.end = IRQ_PRCMU_HOTMON_HIGH,.flags = IORESOURCE_IRQ,},+};
+static struct db8500_trip_point db8500_trips_table[] = {
[0] = {.temp = 70000,.type = THERMAL_TRIP_ACTIVE,.cooling_dev_name = {[0] = "thermal-cpufreq-0",},},[1] = {.temp = 75000,.type = THERMAL_TRIP_ACTIVE,.cooling_dev_name = {[0] = "thermal-cpufreq-1",},},[2] = {.temp = 80000,.type = THERMAL_TRIP_ACTIVE,.cooling_dev_name = {[0] = "thermal-cpufreq-2",},},[3] = {.temp = 85000,.type = THERMAL_TRIP_CRITICAL,},+};
+static struct db8500_thsens_platform_data db8500_thsens_data = {
.trip_points = db8500_trips_table,.num_trips = ARRAY_SIZE(db8500_trips_table),+};
+static struct platform_device u8500_thsens_device = {
.name = "db8500_thermal",.resource = db8500_thsens_resources,.num_resources = ARRAY_SIZE(db8500_thsens_resources),.dev = {.platform_data = &db8500_thsens_data,},+};
+static struct platform_device u8500_cpufreq_cooling_device = {
.name = "db8500_cpufreq_cooling",+};
+/*
- TPS61052
*/
@@ -623,6 +690,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_key_dev, &snowball_sbnet_dev, &ab8500_device,
&u8500_thsens_device,&u8500_cpufreq_cooling_device,};
static struct platform_device *snowball_of_platform_devs[] __initdata = { diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index d9c529f..5482116 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -30,6 +30,26 @@ config CPU_THERMAL and not the ACPI interface. If you want this support, you should say Y or M here.
+config DB8500_THERMAL
bool "db8500 thermal management"depends on THERMALdefault yhelpAdds DB8500 thermal management implementation according to thethermal
management framework. A thermal zone with several trip pointswill be
created. Cooling devices can be binded to the trip points tocool this
thermal zone if trip points reached.+config DB8500_CPUFREQ_COOLING
tristate "db8500 cpufreq cooling"depends on CPU_THERMALdefault yhelpAdds DB8500 cpufreq cooling devices, and these cooling devicescan be
binded to thermal zone trip points. When a trip point reached,the
binded cpufreq cooling device turns active to set CPU frequencylow to
cool down the CPU.config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on THERMAL diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 30c456c..d146456 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -3,5 +3,7 @@ #
obj-$(CONFIG_THERMAL) += thermal_sys.o -obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o +obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o +obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_DB8500_CPUFREQ_COOLING) +=db8500_cpufreq_cooling.o obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c new file mode 100644 index 0000000..2c2c91b --- /dev/null +++ b/drivers/thermal/db8500_cpufreq_cooling.c @@ -0,0 +1,167 @@ +/*
- db8500_cpufreq_cooling.c - db8500 cpufreq works as cooling device.
- Copyright (C) 2012 ST-Ericsson
- Copyright (C) 2012 Linaro Ltd.
- Author: Hongbo Zhang hognbo.zhang@stericsson.com
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- */
+#include <linux/slab.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/cpufreq.h> +#include <linux/cpu_cooling.h> +#include <linux/err.h>
+static LIST_HEAD(db8500_cpufreq_cdev_list);
+struct db8500_cpufreq_cdev {
struct thermal_cooling_device *cdev;struct list_head node;+};
+/* Local function to create cpufreq clip table */ +static int cpufreq_table_create(struct platform_device *pdev,
struct freq_clip_table **freq_tab, int *num_freq)+{
struct cpufreq_frequency_table *table;struct freq_clip_table *freq_clip;unsigned int temp;int i, j, count = 0;table = cpufreq_frequency_get_table(0);if (!table)return -ENODATA;/* Check number of frequencies */for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {if (table[i].frequency == CPUFREQ_ENTRY_INVALID)continue;count++;}freq_clip = devm_kzalloc(&pdev->dev,sizeof(struct freq_clip_table) * count,GFP_KERNEL);
/* Save frequencies */count = 0;for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {if (table[i].frequency == CPUFREQ_ENTRY_INVALID)continue;freq_clip[count].freq_clip_max = table[i].frequency;count++;}/* Descending order frequencies */for (i = 0; i <= count - 2; i++)for (j = i + 1; j <= count - 1; j++)if (freq_clip[i].freq_clip_max <freq_clip[j].freq_clip_max) {
temp = freq_clip[i].freq_clip_max;freq_clip[i].freq_clip_max =freq_clip[j].freq_clip_max;
freq_clip[j].freq_clip_max = temp;}for (i = 0; i < count; i++) {freq_clip[i].mask_val = cpu_present_mask;pr_info("db8500_clip_table.%d: %d\n", i,freq_clip[i].freq_clip_max);}*freq_tab = freq_clip;*num_freq = count;return 0;+}
+static int __devinit db8500_cpufreq_cooling_probe(struct platform_device *pdev) +{
struct freq_clip_table *freq_tab = NULL;struct db8500_cpufreq_cdev *cooling_devs;int i, ret, num_freq = 0;if (cpufreq_table_create(pdev, &freq_tab, &num_freq))return -ENODATA;if (unlikely(!freq_tab || !num_freq))return -ENODATA;/* Create one cooling device for each clip frequency */for (i = 0; i < num_freq; i++) {cooling_devs = devm_kzalloc(&pdev->dev,sizeof(struct db8500_cpufreq_cdev),GFP_KERNEL);
if (!cooling_devs) {ret = -ENOMEM;goto exit;}cooling_devs->cdev =cpufreq_cooling_register(&freq_tab[i], 1);
if (IS_ERR(cooling_devs->cdev)) {pr_err("Failed to register cpufreq coolingdevice\n");
ret = PTR_ERR(cooling_devs->cdev);goto exit;}list_add_tail(&cooling_devs->node,&db8500_cpufreq_cdev_list);
pr_info("Cooling device regestered: %s\n",cooling_devs->cdev->type);}return 0;+exit:
list_for_each_entry(cooling_devs, &db8500_cpufreq_cdev_list, node)cpufreq_cooling_unregister(cooling_devs->cdev);return ret;+}
+static int __devexit db8500_cpufreq_cooling_remove(struct platform_device *pdev) +{
struct db8500_cpufreq_cdev *cooling_devs;list_for_each_entry(cooling_devs, &db8500_cpufreq_cdev_list, node)cpufreq_cooling_unregister(cooling_devs->cdev);return 0;+}
+/* No actions required in suspend/resume, so lack of them */ +static struct platform_driver db8500_cpufreq_cooling_driver = {
.driver = {.owner = THIS_MODULE,.name = "db8500_cpufreq_cooling",},.probe = db8500_cpufreq_cooling_probe,.remove = __devexit_p(db8500_cpufreq_cooling_remove),+};
+static int __init db8500_cpufreq_cooling_init(void) +{
return platform_driver_register(&db8500_cpufreq_cooling_driver);+}
+static void __exit db8500_cpufreq_cooling_exit(void) +{
platform_driver_unregister(&db8500_cpufreq_cooling_driver);+}
+/* Should be later than db8500_cpufreq_register */ +late_initcall(db8500_cpufreq_cooling_init); +module_exit(db8500_cpufreq_cooling_exit);
+MODULE_AUTHOR("Hongbo Zhang hongbo.zhang@stericsson.com"); +MODULE_DESCRIPTION("db8500 cpufreq cooling driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c new file mode 100644 index 0000000..32afaeb --- /dev/null +++ b/drivers/thermal/db8500_thermal.c @@ -0,0 +1,476 @@ +/*
- db8500_thermal.c - db8500 Thermal Management Implementation
- Copyright (C) 2012 ST-Ericsson
- Copyright (C) 2012 Linaro Ltd.
- Author: Hongbo Zhang hognbo.zhang@stericsson.com
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- */
+#include <linux/module.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/thermal.h> +#include <linux/cpu_cooling.h> +#include <linux/mfd/dbx500-prcmu.h> +#include <linux/platform_data/db8500_thermal.h>
+#define PRCMU_DEFAULT_MEASURE_TIME 0xFFF +#define PRCMU_DEFAULT_LOW_TEMP 0
+struct db8500_thermal_zone {
struct thermal_zone_device *therm_dev;struct mutex th_lock;struct platform_device *thsens_pdev;struct work_struct therm_work;struct db8500_thsens_platform_data *trip_tab;enum thermal_device_mode mode;unsigned long cur_temp_pseudo;unsigned int cur_index;int low_irq;int high_irq;+};
+/* Bind callback functions for thermal zone */ +static int db8500_cdev_bind(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;char *cdev_name;int i, j, ret;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;if (!cdev->type)return -EINVAL;ret = -ENODEV;for (i = 0; i < ptrips->num_trips; i++)for (j = 0; j < COOLING_DEV_MAX; j++) {cdev_name =ptrips->trip_points[i].cooling_dev_name[j];
if (!cdev_name)continue;if (strcmp(cdev_name, cdev->type))continue;ret = thermal_zone_bind_cooling_device(thermal, i,cdev);
if (ret)pr_err("Error binding cooling device.\n");elsepr_info("%s binded to %d.\n", cdev->type,i);
}/* Force an update since polling mode is not used */schedule_work(&pzone->therm_work);return ret;+}
+/* Unbind callback functions for thermal zone */ +static int db8500_cdev_unbind(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;char *cdev_name;int i, j, ret;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;if (!cdev->type)return -EINVAL;ret = -ENODEV;for (i = 0; i < ptrips->num_trips; i++)for (j = 0; j < COOLING_DEV_MAX; j++) {cdev_name =ptrips->trip_points[i].cooling_dev_name[j];
if (!cdev_name)continue;if (strcmp(cdev_name, cdev->type))continue;/* Invalidate the cooling device before unbindingit */
if (cdev->ops->set_cur_state)cdev->ops->set_cur_state(cdev, 0);ret = thermal_zone_unbind_cooling_device(thermal,i, cdev);
if (ret)pr_err("Error unbinding coolingdevice.\n");
elsepr_info("%s unbinded from %d.\n",cdev->type, i);
}return ret;+}
+/* Get temperature callback functions for thermal zone */ +static int db8500_sys_get_temp(struct thermal_zone_device *thermal,
unsigned long *temp)+{
struct db8500_thermal_zone *pzone;pzone = (struct db8500_thermal_zone *)thermal->devdata;/* TODO: There is no PRCMU interface to get temperature datacurrently,
so a pseudo temperature is returned , it works for the thermalframework
and this will be fixed when the PRCMU interface is available */*temp = pzone->cur_temp_pseudo;return 0;+}
+/* Get mode callback functions for thermal zone */ +static int db8500_sys_get_mode(struct thermal_zone_device *thermal,
enum thermal_device_mode *mode)+{
struct db8500_thermal_zone *pzone;pzone = (struct db8500_thermal_zone *)thermal->devdata;mutex_lock(&pzone->th_lock);*mode = pzone->mode;mutex_unlock(&pzone->th_lock);return 0;+}
+/* Set mode callback functions for thermal zone */ +static int db8500_sys_set_mode(struct thermal_zone_device *thermal,
enum thermal_device_mode mode)+{
struct db8500_thermal_zone *pzone;struct thermal_zone_device *pthdev;pzone = (struct db8500_thermal_zone *)thermal->devdata;pthdev = pzone->therm_dev;if (!pthdev) {pr_err("Thermal zone not registered.\n");return 0;}mutex_lock(&pzone->th_lock);if (mode == THERMAL_DEVICE_ENABLED) {if (pzone->mode == THERMAL_DEVICE_DISABLED)pr_info("Thermal function started.\n");elsepr_info("Thermal function already started.\n");} else {if (pzone->mode == THERMAL_DEVICE_ENABLED)pr_info("Thermal function stoped.\n");elsepr_info("Thermal function already stoped.\n");}pzone->mode = mode;mutex_unlock(&pzone->th_lock);return 0;+}
+/* Get trip type callback function for thermal zone */ +static int db8500_sys_get_trip_type(struct thermal_zone_device *thermal,
int trip, enum thermal_trip_type *type)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;if (trip >= ptrips->num_trips)return -EINVAL;*type = ptrips->trip_points[trip].type;return 0;+}
+/* Get trip temperature callback function for thermal zone */ +static int db8500_sys_get_trip_temp(struct thermal_zone_device *thermal,
int trip, unsigned long *temp)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;if (trip >= ptrips->num_trips)return -EINVAL;*temp = ptrips->trip_points[trip].temp;return 0;+}
+/* Get critical temperature callback function for thermal zone */ +static int db8500_sys_get_crit_temp(struct thermal_zone_device *thermal,
unsigned long *temp)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;int i;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;for (i = (ptrips->num_trips - 1) ; i > 0 ; i--) {if (ptrips->trip_points[i].type == THERMAL_TRIP_CRITICAL) {*temp = ptrips->trip_points[i].temp;return 0;}}return -EINVAL;+}
+static struct thermal_zone_device_ops thdev_ops = {
.bind = db8500_cdev_bind,.unbind = db8500_cdev_unbind,.get_temp = db8500_sys_get_temp,.get_mode = db8500_sys_get_mode,.set_mode = db8500_sys_set_mode,.get_trip_type = db8500_sys_get_trip_type,.get_trip_temp = db8500_sys_get_trip_temp,.get_crit_temp = db8500_sys_get_crit_temp,+};
+static irqreturn_t prcmu_low_irq_handler(int irq, void *irq_data) +{
struct db8500_thermal_zone *pzone = irq_data;struct db8500_thsens_platform_data *ptrips;unsigned long next_low, next_high;unsigned int idx;ptrips = pzone->trip_tab;idx = pzone->cur_index;if (unlikely(idx == 0))/* Meaningless for thermal management, ignoring it */return IRQ_HANDLED;if (idx == 1) {next_high = ptrips->trip_points[0].temp;next_low = PRCMU_DEFAULT_LOW_TEMP;} else {next_high = ptrips->trip_points[idx-1].temp;next_low = ptrips->trip_points[idx-2].temp;}pzone->cur_index -= 1;pzone->cur_temp_pseudo = (next_high + next_low)/2;prcmu_stop_temp_sense();prcmu_config_hotmon((u8)(next_low/1000), (u8)(next_high/1000));prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME);pr_debug("PRCMU set max %ld, set min %ld\n", next_high, next_low);schedule_work(&pzone->therm_work);return IRQ_HANDLED;+}
+static irqreturn_t prcmu_high_irq_handler(int irq, void *irq_data) +{
struct db8500_thermal_zone *pzone = irq_data;struct db8500_thsens_platform_data *ptrips;unsigned long next_low, next_high;unsigned int idx;ptrips = pzone->trip_tab;idx = pzone->cur_index;if (idx < ptrips->num_trips - 1) {next_high = ptrips->trip_points[idx+1].temp;next_low = ptrips->trip_points[idx].temp;pzone->cur_index += 1;pzone->cur_temp_pseudo = (next_high + next_low)/2;prcmu_stop_temp_sense();prcmu_config_hotmon((u8)(next_low/1000),(u8)(next_high/1000));
prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME);pr_debug("PRCMU set max %ld, min %ld\n", next_high,next_low);
}if (idx == ptrips->num_trips - 1)pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1;schedule_work(&pzone->therm_work);return IRQ_HANDLED;+}
+static void db8500_thermal_work(struct work_struct *work) +{
enum thermal_device_mode cur_mode;struct db8500_thermal_zone *pzone;pzone = container_of(work, struct db8500_thermal_zone, therm_work);mutex_lock(&pzone->th_lock);cur_mode = pzone->mode;mutex_unlock(&pzone->th_lock);if (cur_mode == THERMAL_DEVICE_DISABLED) {pr_warn("Warning: thermal function disabled.\n");return;}thermal_zone_device_update(pzone->therm_dev);pr_debug("db8500_thermal_work finished.\n");+}
+static int __devinit db8500_thermal_probe(struct platform_device *pdev) +{
struct db8500_thermal_zone *pzone = NULL;struct db8500_thsens_platform_data *ptrips;int low_irq, high_irq, ret = 0;unsigned long dft_low, dft_high;pr_info("Function db8500_thermal_probe.\n");pzone = devm_kzalloc(&pdev->dev,sizeof(struct db8500_thermal_zone), GFP_KERNEL);if (!pzone)return -ENOMEM;pzone->thsens_pdev = pdev;low_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_LOW");if (low_irq < 0) {pr_err("Get IRQ_HOTMON_LOW failed.\n");return low_irq;}ret = devm_request_threaded_irq(&pdev->dev, low_irq, NULL,prcmu_low_irq_handler,IRQF_NO_SUSPEND | IRQF_ONESHOT, "dbx500_temp_low", pzone);if (ret < 0) {pr_err("Failed to allocate temp low irq.\n");return ret;}high_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_HIGH");if (high_irq < 0) {pr_err("Get IRQ_HOTMON_HIGH failed.\n");return high_irq;}ret = devm_request_threaded_irq(&pdev->dev, high_irq, NULL,prcmu_high_irq_handler,IRQF_NO_SUSPEND | IRQF_ONESHOT, "dbx500_temp_high", pzone);if (ret < 0) {pr_err("Failed to allocate temp high irq.\n");return ret;}pzone->low_irq = low_irq;pzone->high_irq = high_irq;pzone->mode = THERMAL_DEVICE_DISABLED;mutex_init(&pzone->th_lock);INIT_WORK(&pzone->therm_work, db8500_thermal_work);ptrips = pdev->dev.platform_data;pzone->trip_tab = ptrips;pzone->therm_dev =thermal_zone_device_register("db8500_thermal_zone",
ptrips->num_trips, pzone, &thdev_ops, 0, 0, 0, 0);if (IS_ERR(pzone->therm_dev)) {pr_err("Failed to register thermal zone device\n");return PTR_ERR(pzone->therm_dev);}dft_low = PRCMU_DEFAULT_LOW_TEMP;dft_high = ptrips->trip_points[0].temp;prcmu_stop_temp_sense();prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000));prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME);pzone->cur_index = 0;pzone->cur_temp_pseudo = (dft_low + dft_high)/2;pzone->mode = THERMAL_DEVICE_ENABLED;platform_set_drvdata(pdev, pzone);return 0;+}
+static int __devexit db8500_thermal_remove(struct platform_device *pdev) +{
struct db8500_thermal_zone *pzone;pzone = platform_get_drvdata(pdev);cancel_work_sync(&pzone->therm_work);if (pzone->therm_dev)thermal_zone_device_unregister(pzone->therm_dev);return 0;+}
+static int db8500_thermal_suspend(struct platform_device *pdev,
pm_message_t state)+{
struct db8500_thermal_zone *pzone;pzone = platform_get_drvdata(pdev);flush_work_sync(&pzone->therm_work);return 0;+}
+static int db8500_thermal_resume(struct platform_device *pdev) +{
return 0;+}
+static struct platform_driver db8500_thermal_driver = {
.driver = {.owner = THIS_MODULE,.name = "db8500_thermal"},.probe = db8500_thermal_probe,.suspend = db8500_thermal_suspend,.resume = db8500_thermal_resume,.remove = __devexit_p(db8500_thermal_remove),+};
+static int __init db8500_thermal_init(void) +{
return platform_driver_register(&db8500_thermal_driver);+}
+static void __exit db8500_thermal_exit(void) +{
platform_driver_unregister(&db8500_thermal_driver);+}
+module_init(db8500_thermal_init); +module_exit(db8500_thermal_exit);
+MODULE_AUTHOR("Hongbo Zhang hongbo.zhang@stericsson.com"); +MODULE_DESCRIPTION("db8500 thermal driver"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/platform_data/db8500_thermal.h b/include/linux/platform_data/db8500_thermal.h new file mode 100644 index 0000000..0b6d164 --- /dev/null +++ b/include/linux/platform_data/db8500_thermal.h @@ -0,0 +1,39 @@ +/*
- db8500_thermal.h - db8500 Thermal Management Implementation
- Copyright (C) 2012 ST-Ericsson
- Copyright (C) 2012 Linaro Ltd.
- Author: Hongbo Zhang hognbo.zhang@stericsson.com
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- */
+#ifndef _DB8500_THERMAL_H_ +#define _DB8500_THERMAL_H_
+#include <linux/thermal.h>
+#define COOLING_DEV_MAX 8
+struct db8500_trip_point {
unsigned long temp;enum thermal_trip_type type;char *cooling_dev_name[COOLING_DEV_MAX];+};
+struct db8500_thsens_platform_data {
struct db8500_trip_point *trip_points;int num_trips;+};
+#endif /* _DB8500_THERMAL_H_ */
1.7.10
I have update it to remove "over 80 characters" warming, so no warnings from checkpatch.pl at last.
git repo: http://git.linaro.org/gitweb?p=people/hongbozhang/kernel.git%3Ba=summary
branch: ste_thermal_v3.5_rc6
On 13 July 2012 16:37, Hongbo Zhang hongbo.zhang@linaro.org wrote:
There are 5 line over 80 characters, is this acceptable or should I obey the checkpatch.pl strictly?
for example this line: [tab] [tab] [tab] ret = thermal_zone_bind_cooling_device(thermal, i, cdev);
I think keeping this code in one line seems neatly.
On 13 July 2012 15:51, hongbo.zhang hongbo.zhang@linaro.org wrote:
From: "hongbo.zhang" hongbo.zhang@stericsson.com
Signed-off-by: hongbo.zhang hongbo.zhang@linaro.com
arch/arm/configs/u8500_defconfig | 4 + arch/arm/mach-ux500/board-mop500.c | 69 ++++ drivers/thermal/Kconfig | 20 ++ drivers/thermal/Makefile | 4 +- drivers/thermal/db8500_cpufreq_cooling.c | 167 +++++++++ drivers/thermal/db8500_thermal.c | 476 ++++++++++++++++++++++++++ include/linux/platform_data/db8500_thermal.h | 39 +++ 7 files changed, 778 insertions(+), 1 deletion(-) create mode 100644 drivers/thermal/db8500_cpufreq_cooling.c create mode 100644 drivers/thermal/db8500_thermal.c create mode 100644 include/linux/platform_data/db8500_thermal.h
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 036419f..15a455e 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -117,3 +117,7 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_INFO=y # CONFIG_FTRACE is not set CONFIG_DEBUG_USER=y +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_DB8500_THERMAL=y +CONFIG_DB8500_CPUFREQ_COOLING=y diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 1509a3c..77b3fca 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -30,6 +30,8 @@ #include <linux/smsc911x.h> #include <linux/gpio_keys.h> #include <linux/delay.h> +#include <linux/platform_data/db8500_thermal.h>
#include <linux/of.h> #include <linux/of_platform.h> #include <linux/leds.h> @@ -216,6 +218,71 @@ struct platform_device ab8500_device = { };
/*
- Thermal Sensor
- */
+static struct resource db8500_thsens_resources[] = {
{.name = "IRQ_HOTMON_LOW",.start = IRQ_PRCMU_HOTMON_LOW,.end = IRQ_PRCMU_HOTMON_LOW,.flags = IORESOURCE_IRQ,},{.name = "IRQ_HOTMON_HIGH",.start = IRQ_PRCMU_HOTMON_HIGH,.end = IRQ_PRCMU_HOTMON_HIGH,.flags = IORESOURCE_IRQ,},+};
+static struct db8500_trip_point db8500_trips_table[] = {
[0] = {.temp = 70000,.type = THERMAL_TRIP_ACTIVE,.cooling_dev_name = {[0] = "thermal-cpufreq-0",},},[1] = {.temp = 75000,.type = THERMAL_TRIP_ACTIVE,.cooling_dev_name = {[0] = "thermal-cpufreq-1",},},[2] = {.temp = 80000,.type = THERMAL_TRIP_ACTIVE,.cooling_dev_name = {[0] = "thermal-cpufreq-2",},},[3] = {.temp = 85000,.type = THERMAL_TRIP_CRITICAL,},+};
+static struct db8500_thsens_platform_data db8500_thsens_data = {
.trip_points = db8500_trips_table,.num_trips = ARRAY_SIZE(db8500_trips_table),+};
+static struct platform_device u8500_thsens_device = {
.name = "db8500_thermal",.resource = db8500_thsens_resources,.num_resources = ARRAY_SIZE(db8500_thsens_resources),.dev = {.platform_data = &db8500_thsens_data,},+};
+static struct platform_device u8500_cpufreq_cooling_device = {
.name = "db8500_cpufreq_cooling",+};
+/*
- TPS61052
*/
@@ -623,6 +690,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_key_dev, &snowball_sbnet_dev, &ab8500_device,
&u8500_thsens_device,&u8500_cpufreq_cooling_device,};
static struct platform_device *snowball_of_platform_devs[] __initdata = { diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index d9c529f..5482116 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -30,6 +30,26 @@ config CPU_THERMAL and not the ACPI interface. If you want this support, you should say Y or M here.
+config DB8500_THERMAL
bool "db8500 thermal management"depends on THERMALdefault yhelpAdds DB8500 thermal management implementation according to thethermal
management framework. A thermal zone with several trip pointswill be
created. Cooling devices can be binded to the trip points tocool this
thermal zone if trip points reached.+config DB8500_CPUFREQ_COOLING
tristate "db8500 cpufreq cooling"depends on CPU_THERMALdefault yhelpAdds DB8500 cpufreq cooling devices, and these cooling devicescan be
binded to thermal zone trip points. When a trip point reached,the
binded cpufreq cooling device turns active to set CPU frequencylow to
cool down the CPU.config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on THERMAL diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 30c456c..d146456 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -3,5 +3,7 @@ #
obj-$(CONFIG_THERMAL) += thermal_sys.o -obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o +obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o +obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_DB8500_CPUFREQ_COOLING) +=db8500_cpufreq_cooling.o obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c new file mode 100644 index 0000000..2c2c91b --- /dev/null +++ b/drivers/thermal/db8500_cpufreq_cooling.c @@ -0,0 +1,167 @@ +/*
- db8500_cpufreq_cooling.c - db8500 cpufreq works as cooling device.
- Copyright (C) 2012 ST-Ericsson
- Copyright (C) 2012 Linaro Ltd.
- Author: Hongbo Zhang hognbo.zhang@stericsson.com
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- */
+#include <linux/slab.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/cpufreq.h> +#include <linux/cpu_cooling.h> +#include <linux/err.h>
+static LIST_HEAD(db8500_cpufreq_cdev_list);
+struct db8500_cpufreq_cdev {
struct thermal_cooling_device *cdev;struct list_head node;+};
+/* Local function to create cpufreq clip table */ +static int cpufreq_table_create(struct platform_device *pdev,
struct freq_clip_table **freq_tab, int *num_freq)+{
struct cpufreq_frequency_table *table;struct freq_clip_table *freq_clip;unsigned int temp;int i, j, count = 0;table = cpufreq_frequency_get_table(0);if (!table)return -ENODATA;/* Check number of frequencies */for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {if (table[i].frequency == CPUFREQ_ENTRY_INVALID)continue;count++;}freq_clip = devm_kzalloc(&pdev->dev,sizeof(struct freq_clip_table) * count,GFP_KERNEL);
/* Save frequencies */count = 0;for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {if (table[i].frequency == CPUFREQ_ENTRY_INVALID)continue;freq_clip[count].freq_clip_max = table[i].frequency;count++;}/* Descending order frequencies */for (i = 0; i <= count - 2; i++)for (j = i + 1; j <= count - 1; j++)if (freq_clip[i].freq_clip_max <freq_clip[j].freq_clip_max) {
temp = freq_clip[i].freq_clip_max;freq_clip[i].freq_clip_max =freq_clip[j].freq_clip_max;
freq_clip[j].freq_clip_max = temp;}for (i = 0; i < count; i++) {freq_clip[i].mask_val = cpu_present_mask;pr_info("db8500_clip_table.%d: %d\n", i,freq_clip[i].freq_clip_max);}*freq_tab = freq_clip;*num_freq = count;return 0;+}
+static int __devinit db8500_cpufreq_cooling_probe(struct platform_device *pdev) +{
struct freq_clip_table *freq_tab = NULL;struct db8500_cpufreq_cdev *cooling_devs;int i, ret, num_freq = 0;if (cpufreq_table_create(pdev, &freq_tab, &num_freq))return -ENODATA;if (unlikely(!freq_tab || !num_freq))return -ENODATA;/* Create one cooling device for each clip frequency */for (i = 0; i < num_freq; i++) {cooling_devs = devm_kzalloc(&pdev->dev,sizeof(struct db8500_cpufreq_cdev),GFP_KERNEL);
if (!cooling_devs) {ret = -ENOMEM;goto exit;}cooling_devs->cdev =cpufreq_cooling_register(&freq_tab[i], 1);
if (IS_ERR(cooling_devs->cdev)) {pr_err("Failed to register cpufreq coolingdevice\n");
ret = PTR_ERR(cooling_devs->cdev);goto exit;}list_add_tail(&cooling_devs->node,&db8500_cpufreq_cdev_list);
pr_info("Cooling device regestered: %s\n",cooling_devs->cdev->type);}return 0;+exit:
list_for_each_entry(cooling_devs, &db8500_cpufreq_cdev_list, node)cpufreq_cooling_unregister(cooling_devs->cdev);return ret;+}
+static int __devexit db8500_cpufreq_cooling_remove(struct platform_device *pdev) +{
struct db8500_cpufreq_cdev *cooling_devs;list_for_each_entry(cooling_devs, &db8500_cpufreq_cdev_list, node)cpufreq_cooling_unregister(cooling_devs->cdev);return 0;+}
+/* No actions required in suspend/resume, so lack of them */ +static struct platform_driver db8500_cpufreq_cooling_driver = {
.driver = {.owner = THIS_MODULE,.name = "db8500_cpufreq_cooling",},.probe = db8500_cpufreq_cooling_probe,.remove = __devexit_p(db8500_cpufreq_cooling_remove),+};
+static int __init db8500_cpufreq_cooling_init(void) +{
return platform_driver_register(&db8500_cpufreq_cooling_driver);+}
+static void __exit db8500_cpufreq_cooling_exit(void) +{
platform_driver_unregister(&db8500_cpufreq_cooling_driver);+}
+/* Should be later than db8500_cpufreq_register */ +late_initcall(db8500_cpufreq_cooling_init); +module_exit(db8500_cpufreq_cooling_exit);
+MODULE_AUTHOR("Hongbo Zhang hongbo.zhang@stericsson.com"); +MODULE_DESCRIPTION("db8500 cpufreq cooling driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c new file mode 100644 index 0000000..32afaeb --- /dev/null +++ b/drivers/thermal/db8500_thermal.c @@ -0,0 +1,476 @@ +/*
- db8500_thermal.c - db8500 Thermal Management Implementation
- Copyright (C) 2012 ST-Ericsson
- Copyright (C) 2012 Linaro Ltd.
- Author: Hongbo Zhang hognbo.zhang@stericsson.com
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- */
+#include <linux/module.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/thermal.h> +#include <linux/cpu_cooling.h> +#include <linux/mfd/dbx500-prcmu.h> +#include <linux/platform_data/db8500_thermal.h>
+#define PRCMU_DEFAULT_MEASURE_TIME 0xFFF +#define PRCMU_DEFAULT_LOW_TEMP 0
+struct db8500_thermal_zone {
struct thermal_zone_device *therm_dev;struct mutex th_lock;struct platform_device *thsens_pdev;struct work_struct therm_work;struct db8500_thsens_platform_data *trip_tab;enum thermal_device_mode mode;unsigned long cur_temp_pseudo;unsigned int cur_index;int low_irq;int high_irq;+};
+/* Bind callback functions for thermal zone */ +static int db8500_cdev_bind(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;char *cdev_name;int i, j, ret;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;if (!cdev->type)return -EINVAL;ret = -ENODEV;for (i = 0; i < ptrips->num_trips; i++)for (j = 0; j < COOLING_DEV_MAX; j++) {cdev_name =ptrips->trip_points[i].cooling_dev_name[j];
if (!cdev_name)continue;if (strcmp(cdev_name, cdev->type))continue;ret = thermal_zone_bind_cooling_device(thermal,i, cdev);
if (ret)pr_err("Error binding cooling device.\n");elsepr_info("%s binded to %d.\n", cdev->type,i);
}/* Force an update since polling mode is not used */schedule_work(&pzone->therm_work);return ret;+}
+/* Unbind callback functions for thermal zone */ +static int db8500_cdev_unbind(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;char *cdev_name;int i, j, ret;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;if (!cdev->type)return -EINVAL;ret = -ENODEV;for (i = 0; i < ptrips->num_trips; i++)for (j = 0; j < COOLING_DEV_MAX; j++) {cdev_name =ptrips->trip_points[i].cooling_dev_name[j];
if (!cdev_name)continue;if (strcmp(cdev_name, cdev->type))continue;/* Invalidate the cooling device before unbindingit */
if (cdev->ops->set_cur_state)cdev->ops->set_cur_state(cdev, 0);ret = thermal_zone_unbind_cooling_device(thermal,i, cdev);
if (ret)pr_err("Error unbinding coolingdevice.\n");
elsepr_info("%s unbinded from %d.\n",cdev->type, i);
}return ret;+}
+/* Get temperature callback functions for thermal zone */ +static int db8500_sys_get_temp(struct thermal_zone_device *thermal,
unsigned long *temp)+{
struct db8500_thermal_zone *pzone;pzone = (struct db8500_thermal_zone *)thermal->devdata;/* TODO: There is no PRCMU interface to get temperature datacurrently,
so a pseudo temperature is returned , it works for the thermalframework
and this will be fixed when the PRCMU interface is available */*temp = pzone->cur_temp_pseudo;return 0;+}
+/* Get mode callback functions for thermal zone */ +static int db8500_sys_get_mode(struct thermal_zone_device *thermal,
enum thermal_device_mode *mode)+{
struct db8500_thermal_zone *pzone;pzone = (struct db8500_thermal_zone *)thermal->devdata;mutex_lock(&pzone->th_lock);*mode = pzone->mode;mutex_unlock(&pzone->th_lock);return 0;+}
+/* Set mode callback functions for thermal zone */ +static int db8500_sys_set_mode(struct thermal_zone_device *thermal,
enum thermal_device_mode mode)+{
struct db8500_thermal_zone *pzone;struct thermal_zone_device *pthdev;pzone = (struct db8500_thermal_zone *)thermal->devdata;pthdev = pzone->therm_dev;if (!pthdev) {pr_err("Thermal zone not registered.\n");return 0;}mutex_lock(&pzone->th_lock);if (mode == THERMAL_DEVICE_ENABLED) {if (pzone->mode == THERMAL_DEVICE_DISABLED)pr_info("Thermal function started.\n");elsepr_info("Thermal function already started.\n");} else {if (pzone->mode == THERMAL_DEVICE_ENABLED)pr_info("Thermal function stoped.\n");elsepr_info("Thermal function already stoped.\n");}pzone->mode = mode;mutex_unlock(&pzone->th_lock);return 0;+}
+/* Get trip type callback function for thermal zone */ +static int db8500_sys_get_trip_type(struct thermal_zone_device *thermal,
int trip, enum thermal_trip_type *type)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;if (trip >= ptrips->num_trips)return -EINVAL;*type = ptrips->trip_points[trip].type;return 0;+}
+/* Get trip temperature callback function for thermal zone */ +static int db8500_sys_get_trip_temp(struct thermal_zone_device *thermal,
int trip, unsigned long *temp)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;if (trip >= ptrips->num_trips)return -EINVAL;*temp = ptrips->trip_points[trip].temp;return 0;+}
+/* Get critical temperature callback function for thermal zone */ +static int db8500_sys_get_crit_temp(struct thermal_zone_device *thermal,
unsigned long *temp)+{
struct db8500_thermal_zone *pzone;struct db8500_thsens_platform_data *ptrips;int i;pzone = (struct db8500_thermal_zone *)thermal->devdata;ptrips = pzone->trip_tab;for (i = (ptrips->num_trips - 1) ; i > 0 ; i--) {if (ptrips->trip_points[i].type == THERMAL_TRIP_CRITICAL){
*temp = ptrips->trip_points[i].temp;return 0;}}return -EINVAL;+}
+static struct thermal_zone_device_ops thdev_ops = {
.bind = db8500_cdev_bind,.unbind = db8500_cdev_unbind,.get_temp = db8500_sys_get_temp,.get_mode = db8500_sys_get_mode,.set_mode = db8500_sys_set_mode,.get_trip_type = db8500_sys_get_trip_type,.get_trip_temp = db8500_sys_get_trip_temp,.get_crit_temp = db8500_sys_get_crit_temp,+};
+static irqreturn_t prcmu_low_irq_handler(int irq, void *irq_data) +{
struct db8500_thermal_zone *pzone = irq_data;struct db8500_thsens_platform_data *ptrips;unsigned long next_low, next_high;unsigned int idx;ptrips = pzone->trip_tab;idx = pzone->cur_index;if (unlikely(idx == 0))/* Meaningless for thermal management, ignoring it */return IRQ_HANDLED;if (idx == 1) {next_high = ptrips->trip_points[0].temp;next_low = PRCMU_DEFAULT_LOW_TEMP;} else {next_high = ptrips->trip_points[idx-1].temp;next_low = ptrips->trip_points[idx-2].temp;}pzone->cur_index -= 1;pzone->cur_temp_pseudo = (next_high + next_low)/2;prcmu_stop_temp_sense();prcmu_config_hotmon((u8)(next_low/1000), (u8)(next_high/1000));prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME);pr_debug("PRCMU set max %ld, set min %ld\n", next_high, next_low);schedule_work(&pzone->therm_work);return IRQ_HANDLED;+}
+static irqreturn_t prcmu_high_irq_handler(int irq, void *irq_data) +{
struct db8500_thermal_zone *pzone = irq_data;struct db8500_thsens_platform_data *ptrips;unsigned long next_low, next_high;unsigned int idx;ptrips = pzone->trip_tab;idx = pzone->cur_index;if (idx < ptrips->num_trips - 1) {next_high = ptrips->trip_points[idx+1].temp;next_low = ptrips->trip_points[idx].temp;pzone->cur_index += 1;pzone->cur_temp_pseudo = (next_high + next_low)/2;prcmu_stop_temp_sense();prcmu_config_hotmon((u8)(next_low/1000),(u8)(next_high/1000));
prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME);pr_debug("PRCMU set max %ld, min %ld\n", next_high,next_low);
}if (idx == ptrips->num_trips - 1)pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp +1;
schedule_work(&pzone->therm_work);return IRQ_HANDLED;+}
+static void db8500_thermal_work(struct work_struct *work) +{
enum thermal_device_mode cur_mode;struct db8500_thermal_zone *pzone;pzone = container_of(work, struct db8500_thermal_zone,therm_work);
mutex_lock(&pzone->th_lock);cur_mode = pzone->mode;mutex_unlock(&pzone->th_lock);if (cur_mode == THERMAL_DEVICE_DISABLED) {pr_warn("Warning: thermal function disabled.\n");return;}thermal_zone_device_update(pzone->therm_dev);pr_debug("db8500_thermal_work finished.\n");+}
+static int __devinit db8500_thermal_probe(struct platform_device *pdev) +{
struct db8500_thermal_zone *pzone = NULL;struct db8500_thsens_platform_data *ptrips;int low_irq, high_irq, ret = 0;unsigned long dft_low, dft_high;pr_info("Function db8500_thermal_probe.\n");pzone = devm_kzalloc(&pdev->dev,sizeof(struct db8500_thermal_zone), GFP_KERNEL);if (!pzone)return -ENOMEM;pzone->thsens_pdev = pdev;low_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_LOW");if (low_irq < 0) {pr_err("Get IRQ_HOTMON_LOW failed.\n");return low_irq;}ret = devm_request_threaded_irq(&pdev->dev, low_irq, NULL,prcmu_low_irq_handler,IRQF_NO_SUSPEND | IRQF_ONESHOT, "dbx500_temp_low", pzone);if (ret < 0) {pr_err("Failed to allocate temp low irq.\n");return ret;}high_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_HIGH");if (high_irq < 0) {pr_err("Get IRQ_HOTMON_HIGH failed.\n");return high_irq;}ret = devm_request_threaded_irq(&pdev->dev, high_irq, NULL,prcmu_high_irq_handler,IRQF_NO_SUSPEND | IRQF_ONESHOT, "dbx500_temp_high",pzone);
if (ret < 0) {pr_err("Failed to allocate temp high irq.\n");return ret;}pzone->low_irq = low_irq;pzone->high_irq = high_irq;pzone->mode = THERMAL_DEVICE_DISABLED;mutex_init(&pzone->th_lock);INIT_WORK(&pzone->therm_work, db8500_thermal_work);ptrips = pdev->dev.platform_data;pzone->trip_tab = ptrips;pzone->therm_dev =thermal_zone_device_register("db8500_thermal_zone",
ptrips->num_trips, pzone, &thdev_ops, 0, 0, 0, 0);if (IS_ERR(pzone->therm_dev)) {pr_err("Failed to register thermal zone device\n");return PTR_ERR(pzone->therm_dev);}dft_low = PRCMU_DEFAULT_LOW_TEMP;dft_high = ptrips->trip_points[0].temp;prcmu_stop_temp_sense();prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000));prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME);pzone->cur_index = 0;pzone->cur_temp_pseudo = (dft_low + dft_high)/2;pzone->mode = THERMAL_DEVICE_ENABLED;platform_set_drvdata(pdev, pzone);return 0;+}
+static int __devexit db8500_thermal_remove(struct platform_device *pdev) +{
struct db8500_thermal_zone *pzone;pzone = platform_get_drvdata(pdev);cancel_work_sync(&pzone->therm_work);if (pzone->therm_dev)thermal_zone_device_unregister(pzone->therm_dev);return 0;+}
+static int db8500_thermal_suspend(struct platform_device *pdev,
pm_message_t state)+{
struct db8500_thermal_zone *pzone;pzone = platform_get_drvdata(pdev);flush_work_sync(&pzone->therm_work);return 0;+}
+static int db8500_thermal_resume(struct platform_device *pdev) +{
return 0;+}
+static struct platform_driver db8500_thermal_driver = {
.driver = {.owner = THIS_MODULE,.name = "db8500_thermal"},.probe = db8500_thermal_probe,.suspend = db8500_thermal_suspend,.resume = db8500_thermal_resume,.remove = __devexit_p(db8500_thermal_remove),+};
+static int __init db8500_thermal_init(void) +{
return platform_driver_register(&db8500_thermal_driver);+}
+static void __exit db8500_thermal_exit(void) +{
platform_driver_unregister(&db8500_thermal_driver);+}
+module_init(db8500_thermal_init); +module_exit(db8500_thermal_exit);
+MODULE_AUTHOR("Hongbo Zhang hongbo.zhang@stericsson.com"); +MODULE_DESCRIPTION("db8500 thermal driver"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/platform_data/db8500_thermal.h b/include/linux/platform_data/db8500_thermal.h new file mode 100644 index 0000000..0b6d164 --- /dev/null +++ b/include/linux/platform_data/db8500_thermal.h @@ -0,0 +1,39 @@ +/*
- db8500_thermal.h - db8500 Thermal Management Implementation
- Copyright (C) 2012 ST-Ericsson
- Copyright (C) 2012 Linaro Ltd.
- Author: Hongbo Zhang hognbo.zhang@stericsson.com
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- */
+#ifndef _DB8500_THERMAL_H_ +#define _DB8500_THERMAL_H_
+#include <linux/thermal.h>
+#define COOLING_DEV_MAX 8
+struct db8500_trip_point {
unsigned long temp;enum thermal_trip_type type;char *cooling_dev_name[COOLING_DEV_MAX];+};
+struct db8500_thsens_platform_data {
struct db8500_trip_point *trip_points;int num_trips;+};
+#endif /* _DB8500_THERMAL_H_ */
1.7.10
On Fri, Jul 13, 2012 at 10:37 AM, Hongbo Zhang hongbo.zhang@linaro.org wrote:
There are 5 line over 80 characters, is this acceptable or should I obey the checkpatch.pl strictly?
The 80 chars warning is more of a recommendation than a rule.
For example: never linebreak error messages, since people may grep for them.
Yours, Linus Walleij
On Fri, Jul 13, 2012 at 9:51 AM, hongbo.zhang hongbo.zhang@linaro.org wrote:
From: "hongbo.zhang" hongbo.zhang@stericsson.com
Signed-off-by: hongbo.zhang hongbo.zhang@linaro.com
A zero-line commit message for an entire new driver is *very* thin. Take this opportunity to describe the hardware and what it can do on a high level and some words on how you implemented it.
Apart from that it's looking vert good to me!
Yours, Linus Walleij
Linus, Thanks for your suggestion, I will follow this when I back to work next Monday.
On 15 July 2012 05:47, Linus Walleij linus.walleij@linaro.org wrote:
On Fri, Jul 13, 2012 at 9:51 AM, hongbo.zhang hongbo.zhang@linaro.org wrote:
From: "hongbo.zhang" hongbo.zhang@stericsson.com
Signed-off-by: hongbo.zhang hongbo.zhang@linaro.com
A zero-line commit message for an entire new driver is *very* thin. Take this opportunity to describe the hardware and what it can do on a high level and some words on how you implemented it.
Apart from that it's looking vert good to me!
Yours, Linus Walleij
-
Hongbo Zhang -
hongbo.zhang
-
Linus Walleij