| Message ID | 1350387889-15324-6-git-send-email-hongbo.zhang@linaro.com |
|---|---|
| State | New |
| Headers | show |
On 16 October 2012 17:14, hongbo.zhang <hongbo.zhang@linaro.org> wrote: > From: "hongbo.zhang" <hongbo.zhang@linaro.com> > > This diver is based on the thermal management framework in thermal_sys.c. > A thermal zone device is created with the trip points to which cooling > devices can be bound, the current cooling device is cpufreq, e.g. CPU > frequency is clipped down to cool the CPU, and other cooling devices can > be added and bound to the trip points dynamically. > The platform specific PRCMU interrupts are used to active thermal update > when trip points are reached. I am not sure if you have entered a "ENTER" command after each line (to make it 80 columns aligned) or vim did it for you. There is a very good way by which you can do it automatically. Select all lines in vim and press gq. > Signed-off-by: hongbo.zhang <hongbo.zhang@linaro.com> > --- > arch/arm/boot/dts/dbx5x0.dtsi | 11 + > arch/arm/configs/u8500_defconfig | 4 + > arch/arm/mach-ux500/board-mop500.c | 73 ++++ > drivers/thermal/Kconfig | 20 ++ > drivers/thermal/Makefile | 2 + > drivers/thermal/db8500_cpufreq_cooling.c | 118 +++++++ > drivers/thermal/db8500_thermal.c | 507 +++++++++++++++++++++++++++ > include/linux/platform_data/db8500_thermal.h | 39 +++ It would be better to split platform and driver parts into separate patches. > diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi > index 748ba7a..795d7ee 100644 > --- a/arch/arm/boot/dts/dbx5x0.dtsi > +++ b/arch/arm/boot/dts/dbx5x0.dtsi > @@ -174,6 +174,10 @@ > compatible = "stericsson,nmk_pinctrl"; > }; > > + cpufreq-cooling { > + compatible = "stericsson,db8500-cpufreq-cooling"; > + }; > + > usb@a03e0000 { > compatible = "stericsson,db8500-musb", > "mentor,musb"; > @@ -203,6 +207,13 @@ > reg = <0x80157450 0xC>; > }; > > + thermal@801573c0 { > + compatible = "stericsson,db8500-thermal"; > + reg = <0x801573c0 0x40>; > + interrupts = <21 0x4>, <22 0x4>; > + interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; > + }; It is considered better to mark devices disabled in dtsi files and actually mark them OK or Okay in board's dts file. > diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c > @@ -33,6 +33,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> > @@ -229,6 +231,71 @@ static struct ab8500_platform_data ab8500_platdata = { > }; > > /* > + * 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", If i am not wrong length of cooling_dev_name can't be greater than 8 > + }, > + }, > + [1] = { > + .temp = 75000, > + .type = THERMAL_TRIP_ACTIVE, > + .cooling_dev_name = { > + [0] = "thermal-cpufreq-0", > + }, > + }, > + [2] = { > + .temp = 80000, > + .type = THERMAL_TRIP_ACTIVE, > + .cooling_dev_name = { > + [0] = "thermal-cpufreq-0", > + }, > + }, > + [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 > */ > > @@ -583,6 +650,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = { > &snowball_key_dev, > &snowball_sbnet_dev, > &snowball_gpio_en_3v3_regulator_dev, > + &u8500_thsens_device, > + &u8500_cpufreq_cooling_device, > }; > > static void __init mop500_init_machine(void) > @@ -765,6 +834,10 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { > "ux500-msp-i2s.2", &msp2_platform_data), > OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, > "ux500-msp-i2s.3", &msp3_platform_data), > + OF_DEV_AUXDATA("stericsson,db8500-thermal", 0x801573c0, > + "db8500-thermal", &db8500_thsens_data), > + OF_DEV_AUXDATA("stericsson,db8500-cpufreq-cooling", 0, > + "db8500-cpufreq-cooling", NULL), > {}, > }; Because i am not well aware of this file, May i know what are we doing here. Are we supporting two boards here? one with DT other without it? Whatever the case, at-least we should pass data via DT for u8500_auxdata_lookup[]. As you are adding the driver for the first time here, it must be able to parse data via DT. > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig > index edfd67d..6607cba 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 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 bound 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 Shouldn't this depend on DB8500_THERMAL instead? > + default y > + help > + Adds DB8500 cpufreq cooling devices, and these cooling devices can be > + bound to thermal zone trip points. When a trip point reached, the > + bound 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 885550d..c7a8dab 100644 > --- a/drivers/thermal/Makefile > +++ b/drivers/thermal/Makefile > @@ -7,3 +7,5 @@ obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o > obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o > obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o > obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o > +obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o > +obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o > diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c > +/* > + * 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> should be in alphabetical order > +static LIST_HEAD(db8500_cpufreq_cdev_list); > + > +struct db8500_cpufreq_cdev { > + struct thermal_cooling_device *cdev; > + struct list_head node; > +}; > + > +static int __devinit db8500_cpufreq_cooling_probe(struct platform_device *pdev) > +{ > + struct db8500_cpufreq_cdev *cooling_devs; cooling_dev would be more appropriate? > + struct cpumask mask_val; > + > + cooling_devs = devm_kzalloc(&pdev->dev, > + sizeof(struct db8500_cpufreq_cdev), GFP_KERNEL); sizeof(*cooling_devs) > + if (!cooling_devs) > + return -ENOMEM; > + > + cpumask_set_cpu(0, &mask_val); > + cooling_devs->cdev = cpufreq_cooling_register(&mask_val); > + > + if (IS_ERR(cooling_devs->cdev)) { IS_ERR_OR_NULL? > + pr_err("Failed to register cpufreq cooling device\n"); dev_err? > + return PTR_ERR(cooling_devs->cdev); > + } > + > + list_add_tail(&cooling_devs->node, &db8500_cpufreq_cdev_list); > + pr_info("Cooling device registered: %s\n", dev_info? > + cooling_devs->cdev->type); > + > + return 0; > +} > + > +static int __devexit db8500_cpufreq_cooling_remove(struct platform_device *pdev) > +{ > + struct db8500_cpufreq_cdev *cooling_devs; cooling_dev? > + list_for_each_entry(cooling_devs, &db8500_cpufreq_cdev_list, node) > + cpufreq_cooling_unregister(cooling_devs->cdev); If there are multiple calls to probe, then there must be multiple calls to remove also. Why do you remove everything for the first device here? > + > + return 0; > +} > + > +static int db8500_cpufreq_cooling_suspend(struct platform_device *pdev, > + pm_message_t state) > +{ > + return -ENOSYS; > +} > + > +static int db8500_cpufreq_cooling_resume(struct platform_device *pdev) > +{ > + return -ENOSYS; > +} Do you need these? Wouldn't it be same if you don't define them? > +#ifdef CONFIG_OF > +static const struct of_device_id db8500_cpufreq_cooling_match[] = { > + { .compatible = "stericsson,db8500-cpufreq-cooling" }, > + {}, > +}; > +#else > +#define db8500_cpufreq_cooling_match NULL > +#endif > + > +static struct platform_driver db8500_cpufreq_cooling_driver = { > + .driver = { > + .owner = THIS_MODULE, > + .name = "db8500-cpufreq-cooling", > + .of_match_table = db8500_cpufreq_cooling_match, > + }, > + .probe = db8500_cpufreq_cooling_probe, __devinit > + .suspend = db8500_cpufreq_cooling_suspend, > + .resume = db8500_cpufreq_cooling_resume, > + .remove = __devexit_p(db8500_cpufreq_cooling_remove), __devexit > +}; > + > +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..34dcc52 > --- /dev/null > +++ b/drivers/thermal/db8500_thermal.c > @@ -0,0 +1,507 @@ > +/* > + * 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> alphabetical order :) > +#define PRCMU_DEFAULT_MEASURE_TIME 0xFFF > +#define PRCMU_DEFAULT_LOW_TEMP 0 Can we align macro values with tabs.. makes it more readable. > +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; > + enum thermal_trend trend; > + unsigned long cur_temp_pseudo; > + unsigned int cur_index; > + int low_irq; > + int high_irq; > +}; > + > +/* Callback to bind cooling device to 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; > + unsigned long max_state, upper, lower; > + int i, j, ret; > + > + pzone = (struct db8500_thermal_zone *)thermal->devdata; should work without cast. > + ptrips = pzone->trip_tab; > + > + if (!cdev->type) > + return -EINVAL; > + > + ret = -ENODEV; would be better to merge with definition of ret > + 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; > + > + cdev->ops->get_max_state(cdev, &max_state); > + upper = (i > max_state) ? max_state : i; > + lower = (i > max_state) ? max_state : i; > + > + ret = thermal_zone_bind_cooling_device(thermal, i, > + cdev, upper, lower); > + if (ret) > + pr_err("Error binding cooling device.\n"); > + else > + pr_info("Cdev %s bound.\n", cdev->type); dev_info, dev_err? > + } > + > + return ret; > +} > + > +/* Callback to unbind cooling device from 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; cast not required. > + ptrips = pzone->trip_tab; > + > + if (!cdev->type) > + return -EINVAL; > + > + ret = -ENODEV; same. > + 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_unbind_cooling_device( > + thermal, i, cdev); > + if (ret) > + pr_err("Error unbinding cooling device.\n"); > + else > + pr_info("Cdev %s unbound.\n", cdev->type); > + } > + > + return ret; > +} Can you try to take common part of above two routines into another one? They are pretty much similar. > +/* Callback to get current temperature */ > +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; cast not required. Also merge above two lines. > + > + /* 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 */ Should Comment style be like: /* * ... */ > + *temp = pzone->cur_temp_pseudo; > + > + return 0; > +} > + > +/* Callback to get temperature changing trend */ > +static int db8500_sys_get_trend(struct thermal_zone_device *thermal, > + int trip, enum thermal_trend *trend) > +{ > + struct db8500_thermal_zone *pzone; > + pzone = (struct db8500_thermal_zone *)thermal->devdata; :( > + > + *trend = pzone->trend; > + > + return 0; > +} > + > +/* Callback to get thermal zone mode */ > +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; check everywhere :) > + mutex_lock(&pzone->th_lock); > + *mode = pzone->mode; > + mutex_unlock(&pzone->th_lock); > + > + return 0; > +} > + > +/* Callback to set thermal zone mode */ > +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"); dev_err > + return 0; > + } > + > + mutex_lock(&pzone->th_lock); > + > + pzone->mode = mode; > + > + if (mode == THERMAL_DEVICE_ENABLED) > + schedule_work(&pzone->therm_work); > + > + mutex_unlock(&pzone->th_lock); > + > + return 0; > +} > + > +/* Callback to get trip point type */ > +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; > +} > + > +/* Callback to get trip point temperature */ > +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; > +} > + > +/* Callback to get critical trip point temperature */ > +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_trend = db8500_sys_get_trend, > + .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); > + > + pzone->trend = THERMAL_TREND_DROPPING; > + 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); please check all these too.. dev_debug > + } > + > + if (idx == ptrips->num_trips - 1) > + pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1; > + > + pzone->trend = THERMAL_TREND_RAISING; > + 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; > + > + pzone = devm_kzalloc(&pdev->dev, > + sizeof(struct db8500_thermal_zone), GFP_KERNEL); sizeof(*pzone) > + 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); can you try these lines with gq i suggested earlier? > + 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, 0, pzone, &thdev_ops, 0, 0); > + > + if (IS_ERR(pzone->therm_dev)) { IS_ERR_OR_NULL? > + pr_err("Failed to register thermal zone device\n"); dev_err > + 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->trend = THERMAL_TREND_STABLE; > + 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) Can this be false? If you were not able to register a thermal_zone dev then you return error from probe and so remove wouldn't be called. > + 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); > + prcmu_stop_temp_sense(); > + > + return 0; > +} > + > +static int db8500_thermal_resume(struct platform_device *pdev) > +{ > + struct db8500_thermal_zone *pzone; > + struct db8500_thsens_platform_data *ptrips; > + unsigned long dft_low, dft_high; > + > + pzone = platform_get_drvdata(pdev); > + ptrips = pzone->trip_tab; > + dft_low = PRCMU_DEFAULT_LOW_TEMP; > + dft_high = ptrips->trip_points[0].temp; > + > + prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000)); > + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); > + > + return 0; > +} > + > +#ifdef CONFIG_OF > +static const struct of_device_id db8500_thermal_match[] = { > + { .compatible = "stericsson,db8500-thermal" }, > + {}, > +}; > +#else > +#define db8500_thermal_match NULL > +#endif > + > +static struct platform_driver db8500_thermal_driver = { > + .driver = { > + .owner = THIS_MODULE, > + .name = "db8500-thermal", > + .of_match_table = db8500_thermal_match, > + }, > + .probe = db8500_thermal_probe, __devinit > + .suspend = db8500_thermal_suspend, > + .resume = db8500_thermal_resume, > + .remove = __devexit_p(db8500_thermal_remove), __devexit > +}; > + > +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); Use module_platform_driver(). -- viresh
On Wed, 2012-10-17 at 20:53 +0530, Viresh Kumar wrote: > On 16 October 2012 17:14, hongbo.zhang <hongbo.zhang@linaro.org> wrote: [] > > diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c [] > > +#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> > > should be in alphabetical order There's no agreed kernel convention here. Some prefer christmas tree (shortest to longest length)
On 17 October 2012 22:28, Joe Perches <joe@perches.com> wrote: >> > +#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> >> >> should be in alphabetical order > > There's no agreed kernel convention here. > Some prefer christmas tree (shortest to longest length) :) I have seen a number of times this happening, because the list isn't in alphabetical order people aren't able to easily read if an #include ... is already there or not. And so one header file is included multiple times. Because git diff only shows few lines above and below a change, even people can't catch it in reviews. That's why they must always be in alphabetical order. -- viresh
Viresh, thanks a lot for all of your comments. I accept them _by_default_ if no comment from me under them. On 17 October 2012 23:23, Viresh Kumar <viresh.kumar@linaro.org> wrote: > On 16 October 2012 17:14, hongbo.zhang <hongbo.zhang@linaro.org> wrote: >> From: "hongbo.zhang" <hongbo.zhang@linaro.com> >> >> This diver is based on the thermal management framework in thermal_sys.c. >> A thermal zone device is created with the trip points to which cooling >> devices can be bound, the current cooling device is cpufreq, e.g. CPU >> frequency is clipped down to cool the CPU, and other cooling devices can >> be added and bound to the trip points dynamically. >> The platform specific PRCMU interrupts are used to active thermal update >> when trip points are reached. > > I am not sure if you have entered a "ENTER" command after each line (to make > it 80 columns aligned) or vim did it for you. > > There is a very good way by which you can do it automatically. > > Select all lines in vim and press gq. Thanks, this is a new and cool command for me. I really used ENTER before :( > >> Signed-off-by: hongbo.zhang <hongbo.zhang@linaro.com> >> --- >> arch/arm/boot/dts/dbx5x0.dtsi | 11 + >> arch/arm/configs/u8500_defconfig | 4 + >> arch/arm/mach-ux500/board-mop500.c | 73 ++++ >> drivers/thermal/Kconfig | 20 ++ >> drivers/thermal/Makefile | 2 + >> drivers/thermal/db8500_cpufreq_cooling.c | 118 +++++++ >> drivers/thermal/db8500_thermal.c | 507 +++++++++++++++++++++++++++ >> include/linux/platform_data/db8500_thermal.h | 39 +++ > > It would be better to split platform and driver parts into separate patches. only board-mop500.c is platform part in this case, is it true? > >> diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi >> index 748ba7a..795d7ee 100644 >> --- a/arch/arm/boot/dts/dbx5x0.dtsi >> +++ b/arch/arm/boot/dts/dbx5x0.dtsi >> @@ -174,6 +174,10 @@ >> compatible = "stericsson,nmk_pinctrl"; >> }; >> >> + cpufreq-cooling { >> + compatible = "stericsson,db8500-cpufreq-cooling"; >> + }; >> + >> usb@a03e0000 { >> compatible = "stericsson,db8500-musb", >> "mentor,musb"; >> @@ -203,6 +207,13 @@ >> reg = <0x80157450 0xC>; >> }; >> >> + thermal@801573c0 { >> + compatible = "stericsson,db8500-thermal"; >> + reg = <0x801573c0 0x40>; >> + interrupts = <21 0x4>, <22 0x4>; >> + interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; >> + }; > > It is considered better to mark devices disabled in dtsi files and actually mark > them OK or Okay in board's dts file. > >> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c >> @@ -33,6 +33,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> >> @@ -229,6 +231,71 @@ static struct ab8500_platform_data ab8500_platdata = { >> }; >> >> /* >> + * 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", > > If i am not wrong length of cooling_dev_name can't be greater than 8 You are wrong this time, it is 20 #define THERMAL_NAME_LENGTH 20 > >> + }, >> + }, >> + [1] = { >> + .temp = 75000, >> + .type = THERMAL_TRIP_ACTIVE, >> + .cooling_dev_name = { >> + [0] = "thermal-cpufreq-0", >> + }, >> + }, >> + [2] = { >> + .temp = 80000, >> + .type = THERMAL_TRIP_ACTIVE, >> + .cooling_dev_name = { >> + [0] = "thermal-cpufreq-0", >> + }, >> + }, >> + [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 >> */ >> >> @@ -583,6 +650,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = { >> &snowball_key_dev, >> &snowball_sbnet_dev, >> &snowball_gpio_en_3v3_regulator_dev, >> + &u8500_thsens_device, >> + &u8500_cpufreq_cooling_device, >> }; >> >> static void __init mop500_init_machine(void) >> @@ -765,6 +834,10 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { >> "ux500-msp-i2s.2", &msp2_platform_data), >> OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, >> "ux500-msp-i2s.3", &msp3_platform_data), >> + OF_DEV_AUXDATA("stericsson,db8500-thermal", 0x801573c0, >> + "db8500-thermal", &db8500_thsens_data), >> + OF_DEV_AUXDATA("stericsson,db8500-cpufreq-cooling", 0, >> + "db8500-cpufreq-cooling", NULL), >> {}, >> }; > > Because i am not well aware of this file, May i know what are we doing here. > Are we supporting two boards here? one with DT other without it? Because DT is not totally supported in all drivers on Snowball, DT is disabled by default. Doing this is to make thermal driver work what ever DT is enabled or not. There are other cases like this, I just follow the current patten. The corresponding maintainer will clean up this part at last. > > Whatever the case, at-least we should pass data via DT for > u8500_auxdata_lookup[]. > As you are adding the driver for the first time here, it must be able to parse > data via DT. Yes, for "db8500-thermal", data &db8500_thsens_data is parsed via DT but there is really no data for "db8500-cpufreq-cooling". > >> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig >> index edfd67d..6607cba 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 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 bound 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 > > Shouldn't this depend on DB8500_THERMAL instead? No, the designed policy is that the cooling device can be added or removed dynamically, cooling device and thermal zone device are separated, they will be bound when match. it does depend on CPU_THERMAL. in another patch from Amit, CPU_THERMAL depends on THERMAL && CPU_FREQ > >> + default y >> + help >> + Adds DB8500 cpufreq cooling devices, and these cooling devices can be >> + bound to thermal zone trip points. When a trip point reached, the >> + bound 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 885550d..c7a8dab 100644 >> --- a/drivers/thermal/Makefile >> +++ b/drivers/thermal/Makefile >> @@ -7,3 +7,5 @@ obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o >> obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o >> obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o >> obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o >> +obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o >> +obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o >> diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c > >> +/* >> + * 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> > > should be in alphabetical order > >> +static LIST_HEAD(db8500_cpufreq_cdev_list); >> + >> +struct db8500_cpufreq_cdev { >> + struct thermal_cooling_device *cdev; >> + struct list_head node; >> +}; >> + >> +static int __devinit db8500_cpufreq_cooling_probe(struct platform_device *pdev) >> +{ >> + struct db8500_cpufreq_cdev *cooling_devs; > > cooling_dev would be more appropriate? Accept. There is a historic reason, it was an array before, but the generic cooling layer changed, so no array here any more, but I forgot renaming it to cooling_devs. > >> + struct cpumask mask_val; >> + >> + cooling_devs = devm_kzalloc(&pdev->dev, >> + sizeof(struct db8500_cpufreq_cdev), GFP_KERNEL); > > sizeof(*cooling_devs) > >> + if (!cooling_devs) >> + return -ENOMEM; >> + >> + cpumask_set_cpu(0, &mask_val); >> + cooling_devs->cdev = cpufreq_cooling_register(&mask_val); >> + >> + if (IS_ERR(cooling_devs->cdev)) { > > IS_ERR_OR_NULL? > >> + pr_err("Failed to register cpufreq cooling device\n"); > > dev_err? Accept dev_* too. There is also some reason, pr_* is used because I try to use uniform style with db8500_thermal.c where pr_* is also used. The reason pr_* is used there is that I found it is a bit redundant to get device pointer which is only used once as input parameter of dev_*. I will use dev_* it is preferred in drivers anyway. > >> + return PTR_ERR(cooling_devs->cdev); >> + } >> + >> + list_add_tail(&cooling_devs->node, &db8500_cpufreq_cdev_list); >> + pr_info("Cooling device registered: %s\n", > > dev_info? > >> + cooling_devs->cdev->type); >> + >> + return 0; >> +} >> + >> +static int __devexit db8500_cpufreq_cooling_remove(struct platform_device *pdev) >> +{ >> + struct db8500_cpufreq_cdev *cooling_devs; > > cooling_dev? > >> + list_for_each_entry(cooling_devs, &db8500_cpufreq_cdev_list, node) >> + cpufreq_cooling_unregister(cooling_devs->cdev); > > If there are multiple calls to probe, then there must be multiple > calls to remove also. > Why do you remove everything for the first device here? OK, there is defect here. I will check the input *pdev, unregister it and remove it from list. > >> + >> + return 0; >> +} >> + >> +static int db8500_cpufreq_cooling_suspend(struct platform_device *pdev, >> + pm_message_t state) >> +{ >> + return -ENOSYS; >> +} >> + >> +static int db8500_cpufreq_cooling_resume(struct platform_device *pdev) >> +{ >> + return -ENOSYS; >> +} > > Do you need these? Wouldn't it be same if you don't define them? There were not such functions before, I added them after reading Documentation/SubmittingDrivers. Is the document too old? should I follow it? > >> +#ifdef CONFIG_OF >> +static const struct of_device_id db8500_cpufreq_cooling_match[] = { >> + { .compatible = "stericsson,db8500-cpufreq-cooling" }, >> + {}, >> +}; >> +#else >> +#define db8500_cpufreq_cooling_match NULL >> +#endif >> + >> +static struct platform_driver db8500_cpufreq_cooling_driver = { >> + .driver = { >> + .owner = THIS_MODULE, >> + .name = "db8500-cpufreq-cooling", >> + .of_match_table = db8500_cpufreq_cooling_match, >> + }, >> + .probe = db8500_cpufreq_cooling_probe, > > __devinit > >> + .suspend = db8500_cpufreq_cooling_suspend, >> + .resume = db8500_cpufreq_cooling_resume, >> + .remove = __devexit_p(db8500_cpufreq_cooling_remove), > > __devexit > >> +}; >> + >> +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..34dcc52 >> --- /dev/null >> +++ b/drivers/thermal/db8500_thermal.c >> @@ -0,0 +1,507 @@ >> +/* >> + * 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> > > alphabetical order :) > >> +#define PRCMU_DEFAULT_MEASURE_TIME 0xFFF >> +#define PRCMU_DEFAULT_LOW_TEMP 0 > > Can we align macro values with tabs.. makes it more readable. > >> +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; >> + enum thermal_trend trend; >> + unsigned long cur_temp_pseudo; >> + unsigned int cur_index; >> + int low_irq; >> + int high_irq; >> +}; >> + >> +/* Callback to bind cooling device to 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; >> + unsigned long max_state, upper, lower; >> + int i, j, ret; >> + >> + pzone = (struct db8500_thermal_zone *)thermal->devdata; > > should work without cast. > >> + ptrips = pzone->trip_tab; >> + >> + if (!cdev->type) >> + return -EINVAL; >> + >> + ret = -ENODEV; > > would be better to merge with definition of ret > >> + 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; >> + >> + cdev->ops->get_max_state(cdev, &max_state); >> + upper = (i > max_state) ? max_state : i; >> + lower = (i > max_state) ? max_state : i; >> + >> + ret = thermal_zone_bind_cooling_device(thermal, i, >> + cdev, upper, lower); >> + if (ret) >> + pr_err("Error binding cooling device.\n"); >> + else >> + pr_info("Cdev %s bound.\n", cdev->type); > > dev_info, dev_err? > >> + } >> + >> + return ret; >> +} >> + >> +/* Callback to unbind cooling device from 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; > > cast not required. > >> + ptrips = pzone->trip_tab; >> + >> + if (!cdev->type) >> + return -EINVAL; >> + >> + ret = -ENODEV; > > same. > >> + 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_unbind_cooling_device( >> + thermal, i, cdev); >> + if (ret) >> + pr_err("Error unbinding cooling device.\n"); >> + else >> + pr_info("Cdev %s unbound.\n", cdev->type); >> + } >> + >> + return ret; >> +} > > Can you try to take common part of above two routines into another > one? They are pretty much similar. > >> +/* Callback to get current temperature */ >> +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; > > cast not required. Also merge above two lines. > >> + >> + /* 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 */ > > Should Comment style be like: > /* > * ... > */ > >> + *temp = pzone->cur_temp_pseudo; >> + >> + return 0; >> +} >> + >> +/* Callback to get temperature changing trend */ >> +static int db8500_sys_get_trend(struct thermal_zone_device *thermal, >> + int trip, enum thermal_trend *trend) >> +{ >> + struct db8500_thermal_zone *pzone; >> + pzone = (struct db8500_thermal_zone *)thermal->devdata; > > :( > >> + >> + *trend = pzone->trend; >> + >> + return 0; >> +} >> + >> +/* Callback to get thermal zone mode */ >> +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; > > check everywhere :) > >> + mutex_lock(&pzone->th_lock); >> + *mode = pzone->mode; >> + mutex_unlock(&pzone->th_lock); >> + >> + return 0; >> +} >> + >> +/* Callback to set thermal zone mode */ >> +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"); > > dev_err > >> + return 0; >> + } >> + >> + mutex_lock(&pzone->th_lock); >> + >> + pzone->mode = mode; >> + >> + if (mode == THERMAL_DEVICE_ENABLED) >> + schedule_work(&pzone->therm_work); >> + >> + mutex_unlock(&pzone->th_lock); >> + >> + return 0; >> +} >> + >> +/* Callback to get trip point type */ >> +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; >> +} >> + >> +/* Callback to get trip point temperature */ >> +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; >> +} >> + >> +/* Callback to get critical trip point temperature */ >> +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_trend = db8500_sys_get_trend, >> + .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); >> + >> + pzone->trend = THERMAL_TREND_DROPPING; >> + 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); > > please check all these too.. dev_debug > >> + } >> + >> + if (idx == ptrips->num_trips - 1) >> + pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1; >> + >> + pzone->trend = THERMAL_TREND_RAISING; >> + 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; >> + >> + pzone = devm_kzalloc(&pdev->dev, >> + sizeof(struct db8500_thermal_zone), GFP_KERNEL); > > sizeof(*pzone) > >> + 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); > > can you try these lines with gq i suggested earlier? > >> + 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, 0, pzone, &thdev_ops, 0, 0); >> + >> + if (IS_ERR(pzone->therm_dev)) { > > IS_ERR_OR_NULL? > >> + pr_err("Failed to register thermal zone device\n"); > > dev_err > >> + 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->trend = THERMAL_TREND_STABLE; >> + 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) > > Can this be false? If you were not able to register a thermal_zone > dev then you return error from probe and so remove wouldn't be called. > >> + 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); >> + prcmu_stop_temp_sense(); >> + >> + return 0; >> +} >> + >> +static int db8500_thermal_resume(struct platform_device *pdev) >> +{ >> + struct db8500_thermal_zone *pzone; >> + struct db8500_thsens_platform_data *ptrips; >> + unsigned long dft_low, dft_high; >> + >> + pzone = platform_get_drvdata(pdev); >> + ptrips = pzone->trip_tab; >> + dft_low = PRCMU_DEFAULT_LOW_TEMP; >> + dft_high = ptrips->trip_points[0].temp; >> + >> + prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000)); >> + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); >> + >> + return 0; >> +} >> + >> +#ifdef CONFIG_OF >> +static const struct of_device_id db8500_thermal_match[] = { >> + { .compatible = "stericsson,db8500-thermal" }, >> + {}, >> +}; >> +#else >> +#define db8500_thermal_match NULL >> +#endif >> + >> +static struct platform_driver db8500_thermal_driver = { >> + .driver = { >> + .owner = THIS_MODULE, >> + .name = "db8500-thermal", >> + .of_match_table = db8500_thermal_match, >> + }, >> + .probe = db8500_thermal_probe, > > __devinit > >> + .suspend = db8500_thermal_suspend, >> + .resume = db8500_thermal_resume, >> + .remove = __devexit_p(db8500_thermal_remove), > > __devexit > >> +}; >> + >> +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); > > Use module_platform_driver(). > > -- > viresh
On 18 October 2012 13:05, Hongbo Zhang <hongbo.zhang@linaro.org> wrote: > On 17 October 2012 23:23, Viresh Kumar <viresh.kumar@linaro.org> wrote: >> On 16 October 2012 17:14, hongbo.zhang <hongbo.zhang@linaro.org> wrote: >>> +static struct db8500_trip_point db8500_trips_table[] = { >>> + [0] = { >>> + .temp = 70000, >>> + .type = THERMAL_TRIP_ACTIVE, >>> + .cooling_dev_name = { >>> + [0] = "thermal-cpufreq-0", >> >> If i am not wrong length of cooling_dev_name can't be greater than 8 > You are wrong this time, it is 20 > #define THERMAL_NAME_LENGTH 20 Ahh.. Its the array size fixed to 8.. not length of each element within. >>> static void __init mop500_init_machine(void) >>> @@ -765,6 +834,10 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { >>> "ux500-msp-i2s.2", &msp2_platform_data), >>> OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, >>> "ux500-msp-i2s.3", &msp3_platform_data), >>> + OF_DEV_AUXDATA("stericsson,db8500-thermal", 0x801573c0, >>> + "db8500-thermal", &db8500_thsens_data), >>> + OF_DEV_AUXDATA("stericsson,db8500-cpufreq-cooling", 0, >>> + "db8500-cpufreq-cooling", NULL), >>> {}, >>> }; >> Whatever the case, at-least we should pass data via DT for >> u8500_auxdata_lookup[]. >> As you are adding the driver for the first time here, it must be able to parse >> data via DT. > Yes, for "db8500-thermal", data &db8500_thsens_data is parsed via DT > but there is really no data for "db8500-cpufreq-cooling". You didn't get my point. You are not parsing pdata via DT here, but setting pdata of device node created due to DT. What i am saying is, you must put in code in thermal driver, which will actually parse data from DT and create a pdata structure at run time. And there you would be required to add another file in Documentation with bindings for this driver. >>> +static int db8500_cpufreq_cooling_suspend(struct platform_device *pdev, >>> + pm_message_t state) >>> +{ >>> + return -ENOSYS; >>> +} >>> + >>> +static int db8500_cpufreq_cooling_resume(struct platform_device *pdev) >>> +{ >>> + return -ENOSYS; >>> +} >> >> Do you need these? Wouldn't it be same if you don't define them? > There were not such functions before, I added them after reading > Documentation/SubmittingDrivers. > Is the document too old? should I follow it? Probably the document is correct and i am not :) -- viresh
On 18 October 2012 16:07, Viresh Kumar <viresh.kumar@linaro.org> wrote: > On 18 October 2012 13:05, Hongbo Zhang <hongbo.zhang@linaro.org> wrote: >> On 17 October 2012 23:23, Viresh Kumar <viresh.kumar@linaro.org> wrote: >>> On 16 October 2012 17:14, hongbo.zhang <hongbo.zhang@linaro.org> wrote: > >>>> +static struct db8500_trip_point db8500_trips_table[] = { >>>> + [0] = { >>>> + .temp = 70000, >>>> + .type = THERMAL_TRIP_ACTIVE, >>>> + .cooling_dev_name = { >>>> + [0] = "thermal-cpufreq-0", >>> >>> If i am not wrong length of cooling_dev_name can't be greater than 8 >> You are wrong this time, it is 20 >> #define THERMAL_NAME_LENGTH 20 > > Ahh.. Its the array size fixed to 8.. not length of each element within. > >>>> static void __init mop500_init_machine(void) >>>> @@ -765,6 +834,10 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { >>>> "ux500-msp-i2s.2", &msp2_platform_data), >>>> OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, >>>> "ux500-msp-i2s.3", &msp3_platform_data), >>>> + OF_DEV_AUXDATA("stericsson,db8500-thermal", 0x801573c0, >>>> + "db8500-thermal", &db8500_thsens_data), >>>> + OF_DEV_AUXDATA("stericsson,db8500-cpufreq-cooling", 0, >>>> + "db8500-cpufreq-cooling", NULL), >>>> {}, >>>> }; > >>> Whatever the case, at-least we should pass data via DT for >>> u8500_auxdata_lookup[]. >>> As you are adding the driver for the first time here, it must be able to parse >>> data via DT. >> Yes, for "db8500-thermal", data &db8500_thsens_data is parsed via DT >> but there is really no data for "db8500-cpufreq-cooling". > > You didn't get my point. You are not parsing pdata via DT here, but setting > pdata of device node created due to DT. > > What i am saying is, you must put in code in thermal driver, which will actually > parse data from DT and create a pdata structure at run time. And there you > would be required to add another file in Documentation with bindings for this > driver. > Get the idea. I will update the DT related codes and sent it out again. Thanks. >>>> +static int db8500_cpufreq_cooling_suspend(struct platform_device *pdev, >>>> + pm_message_t state) >>>> +{ >>>> + return -ENOSYS; >>>> +} >>>> + >>>> +static int db8500_cpufreq_cooling_resume(struct platform_device *pdev) >>>> +{ >>>> + return -ENOSYS; >>>> +} >>> >>> Do you need these? Wouldn't it be same if you don't define them? >> There were not such functions before, I added them after reading >> Documentation/SubmittingDrivers. >> Is the document too old? should I follow it? > > Probably the document is correct and i am not :) > > -- > viresh
On Wed, Oct 17, 2012 at 8:53 PM, Viresh Kumar <viresh.kumar@linaro.org> wrote: > On 16 October 2012 17:14, hongbo.zhang <hongbo.zhang@linaro.org> wrote: >> +static int __devinit db8500_cpufreq_cooling_probe(struct platform_device *pdev) >> +{ >> + struct db8500_cpufreq_cdev *cooling_devs; Hi Hongbo, I saw somebody saying this in another thread: > > __devinit &__devexit will go away sometime soon, so please don't use it in new > > code. commit 45f035a (only in linux-next I think) has some details. -- viresh
Hi Hongbo, On 10/16/2012 01:44 PM, hongbo.zhang wrote: > From: "hongbo.zhang" <hongbo.zhang@linaro.com> > > This diver is based on the thermal management framework in thermal_sys.c. > A thermal zone device is created with the trip points to which cooling > devices can be bound, the current cooling device is cpufreq, e.g. CPU > frequency is clipped down to cool the CPU, and other cooling devices can > be added and bound to the trip points dynamically. > The platform specific PRCMU interrupts are used to active thermal update > when trip points are reached. [...] > diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c > new file mode 100644 > index 0000000..bb065d4 > --- /dev/null > +++ b/drivers/thermal/db8500_cpufreq_cooling.c > @@ -0,0 +1,118 @@ > +/* > + * 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> Your e-mail address is misspelled :) [...] > diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c > new file mode 100644 > index 0000000..34dcc52 > --- /dev/null > +++ b/drivers/thermal/db8500_thermal.c > @@ -0,0 +1,507 @@ > +/* > + * db8500_thermal.c - db8500 Thermal Management Implementation > + * > + * Copyright (C) 2012 ST-Ericsson > + * Copyright (C) 2012 Linaro Ltd. > + * > + * Author: Hongbo Zhang <hognbo.zhang@stericsson.com> Misspelled address > + * > + * 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; This member is set in db8500_thermal_probe(), but is never used. I would suggest removing it. > + struct work_struct therm_work; > + struct db8500_thsens_platform_data *trip_tab; > + enum thermal_device_mode mode; > + enum thermal_trend trend; > + unsigned long cur_temp_pseudo; > + unsigned int cur_index; > + int low_irq; > + int high_irq; Same story as thsens_pdev, low_irq and high_irq are set in db8500_thermal_probe(), but are never used. Should be removed. > +}; > + > +/* Callback to bind cooling device to 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; > + unsigned long max_state, upper, lower; > + int i, j, ret; > + > + pzone = (struct db8500_thermal_zone *)thermal->devdata; > + ptrips = pzone->trip_tab; > + > + if (!cdev->type) > + return -EINVAL; cdev->type is an array, not a simple pointer, so it cannot be NULL. > + > + 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; > + > + cdev->ops->get_max_state(cdev, &max_state); > + upper = (i > max_state) ? max_state : i; > + lower = (i > max_state) ? max_state : i; You may want to merge these two lines: upper = lower = ... > + > + ret = thermal_zone_bind_cooling_device(thermal, i, > + cdev, upper, lower); > + if (ret) > + pr_err("Error binding cooling device.\n"); > + else > + pr_info("Cdev %s bound.\n", cdev->type); > + } > + > + return ret; > +} > + > +/* Callback to unbind cooling device from 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; cdev->type cannot be NULL. > + > + 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_unbind_cooling_device( > + thermal, i, cdev); > + if (ret) > + pr_err("Error unbinding cooling device.\n"); > + else > + pr_info("Cdev %s unbound.\n", cdev->type); > + } > + > + return ret; > +} > + > +/* Callback to get current temperature */ > +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; > +} > + > +/* Callback to get temperature changing trend */ > +static int db8500_sys_get_trend(struct thermal_zone_device *thermal, > + int trip, enum thermal_trend *trend) > +{ > + struct db8500_thermal_zone *pzone; > + pzone = (struct db8500_thermal_zone *)thermal->devdata; > + > + *trend = pzone->trend; > + > + return 0; > +} > + > +/* Callback to get thermal zone mode */ > +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; > +} > + > +/* Callback to set thermal zone mode */ > +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; > + } If this function is called, you are sure the thermal zone has been registered. > + > + mutex_lock(&pzone->th_lock); > + > + pzone->mode = mode; > + > + if (mode == THERMAL_DEVICE_ENABLED) > + schedule_work(&pzone->therm_work); > + > + mutex_unlock(&pzone->th_lock); > + > + return 0; > +} > + > +/* Callback to get trip point type */ > +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; > +} > + > +/* Callback to get trip point temperature */ > +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; > +} > + > +/* Callback to get critical trip point temperature */ > +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_trend = db8500_sys_get_trend, > + .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); > + > + pzone->trend = THERMAL_TREND_DROPPING; > + 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) } else if () > + pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1; > + > + pzone->trend = THERMAL_TREND_RAISING; > + 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; > + > + 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, 0, pzone, &thdev_ops, 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->trend = THERMAL_TREND_STABLE; All the stuff from prcmu_stop_temp_sense() up to this line can race with the irq handlers, I would suggest doing it before requesting the irqs. > + pzone->mode = THERMAL_DEVICE_ENABLED; Shouldn't this be protected by pzone->th_lock? Otherwise it should be set before the thermal zone is registered. > + > + 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; > +} mutex_destroy() should be called on pzone->th_lock > + > +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); > + prcmu_stop_temp_sense(); > + > + return 0; > +} > + > +static int db8500_thermal_resume(struct platform_device *pdev) > +{ > + struct db8500_thermal_zone *pzone; > + struct db8500_thsens_platform_data *ptrips; > + unsigned long dft_low, dft_high; > + > + pzone = platform_get_drvdata(pdev); > + ptrips = pzone->trip_tab; > + dft_low = PRCMU_DEFAULT_LOW_TEMP; > + dft_high = ptrips->trip_points[0].temp; > + > + prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000)); > + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); Shouldn't cur_index and cur_temp_pseudo be updated as well? You may want to define a helper function with all the code shared by irq handlers (both high and low), probe and resume. > + > + return 0; > +} [...] > 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> Misspelled address -- Francesco
On 21 October 2012 23:01, Francesco Lavra <francescolavra.fl@gmail.com> wrote: > Hi Hongbo, Hi Francesco, Thanks for your review, I will accept all the comments except the ones I have some comments under them. > > On 10/16/2012 01:44 PM, hongbo.zhang wrote: >> From: "hongbo.zhang" <hongbo.zhang@linaro.com> >> >> This diver is based on the thermal management framework in thermal_sys.c. >> A thermal zone device is created with the trip points to which cooling >> devices can be bound, the current cooling device is cpufreq, e.g. CPU >> frequency is clipped down to cool the CPU, and other cooling devices can >> be added and bound to the trip points dynamically. >> The platform specific PRCMU interrupts are used to active thermal update >> when trip points are reached. > [...] >> diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c >> new file mode 100644 >> index 0000000..bb065d4 >> --- /dev/null >> +++ b/drivers/thermal/db8500_cpufreq_cooling.c >> @@ -0,0 +1,118 @@ >> +/* >> + * 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> > > Your e-mail address is misspelled :) > > [...] >> diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c >> new file mode 100644 >> index 0000000..34dcc52 >> --- /dev/null >> +++ b/drivers/thermal/db8500_thermal.c >> @@ -0,0 +1,507 @@ >> +/* >> + * db8500_thermal.c - db8500 Thermal Management Implementation >> + * >> + * Copyright (C) 2012 ST-Ericsson >> + * Copyright (C) 2012 Linaro Ltd. >> + * >> + * Author: Hongbo Zhang <hognbo.zhang@stericsson.com> > > Misspelled address > >> + * >> + * 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; > > This member is set in db8500_thermal_probe(), but is never used. I would > suggest removing it. > >> + struct work_struct therm_work; >> + struct db8500_thsens_platform_data *trip_tab; >> + enum thermal_device_mode mode; >> + enum thermal_trend trend; >> + unsigned long cur_temp_pseudo; >> + unsigned int cur_index; >> + int low_irq; >> + int high_irq; > > Same story as thsens_pdev, low_irq and high_irq are set in > db8500_thermal_probe(), but are never used. Should be removed. > >> +}; >> + >> +/* Callback to bind cooling device to 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; >> + unsigned long max_state, upper, lower; >> + int i, j, ret; >> + >> + pzone = (struct db8500_thermal_zone *)thermal->devdata; >> + ptrips = pzone->trip_tab; >> + >> + if (!cdev->type) >> + return -EINVAL; > > cdev->type is an array, not a simple pointer, so it cannot be NULL. > >> + >> + 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; >> + >> + cdev->ops->get_max_state(cdev, &max_state); >> + upper = (i > max_state) ? max_state : i; >> + lower = (i > max_state) ? max_state : i; > > You may want to merge these two lines: upper = lower = ... > >> + >> + ret = thermal_zone_bind_cooling_device(thermal, i, >> + cdev, upper, lower); >> + if (ret) >> + pr_err("Error binding cooling device.\n"); >> + else >> + pr_info("Cdev %s bound.\n", cdev->type); >> + } >> + >> + return ret; >> +} >> + >> +/* Callback to unbind cooling device from 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; > > cdev->type cannot be NULL. > >> + >> + 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_unbind_cooling_device( >> + thermal, i, cdev); >> + if (ret) >> + pr_err("Error unbinding cooling device.\n"); >> + else >> + pr_info("Cdev %s unbound.\n", cdev->type); >> + } >> + >> + return ret; >> +} >> + >> +/* Callback to get current temperature */ >> +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; >> +} >> + >> +/* Callback to get temperature changing trend */ >> +static int db8500_sys_get_trend(struct thermal_zone_device *thermal, >> + int trip, enum thermal_trend *trend) >> +{ >> + struct db8500_thermal_zone *pzone; >> + pzone = (struct db8500_thermal_zone *)thermal->devdata; >> + >> + *trend = pzone->trend; >> + >> + return 0; >> +} >> + >> +/* Callback to get thermal zone mode */ >> +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; >> +} >> + >> +/* Callback to set thermal zone mode */ >> +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; >> + } > > If this function is called, you are sure the thermal zone has been > registered. > >> + >> + mutex_lock(&pzone->th_lock); >> + >> + pzone->mode = mode; >> + >> + if (mode == THERMAL_DEVICE_ENABLED) >> + schedule_work(&pzone->therm_work); >> + >> + mutex_unlock(&pzone->th_lock); >> + >> + return 0; >> +} >> + >> +/* Callback to get trip point type */ >> +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; >> +} >> + >> +/* Callback to get trip point temperature */ >> +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; >> +} >> + >> +/* Callback to get critical trip point temperature */ >> +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_trend = db8500_sys_get_trend, >> + .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); >> + >> + pzone->trend = THERMAL_TREND_DROPPING; >> + 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) > > } else if () There is no else condition here, because it it the highest critical trip point, system will be shut down in thermal_work. But I'd like to add some comments here to state this situation. > >> + pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1; >> + >> + pzone->trend = THERMAL_TREND_RAISING; >> + 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; >> + >> + 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, 0, pzone, &thdev_ops, 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->trend = THERMAL_TREND_STABLE; > > All the stuff from prcmu_stop_temp_sense() up to this line can race with > the irq handlers, I would suggest doing it before requesting the irqs. > >> + pzone->mode = THERMAL_DEVICE_ENABLED; > > Shouldn't this be protected by pzone->th_lock? Otherwise it should be > set before the thermal zone is registered. > >> + >> + 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; >> +} > > mutex_destroy() should be called on pzone->th_lock > >> + >> +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); >> + prcmu_stop_temp_sense(); >> + >> + return 0; >> +} >> + >> +static int db8500_thermal_resume(struct platform_device *pdev) >> +{ >> + struct db8500_thermal_zone *pzone; >> + struct db8500_thsens_platform_data *ptrips; >> + unsigned long dft_low, dft_high; >> + >> + pzone = platform_get_drvdata(pdev); >> + ptrips = pzone->trip_tab; >> + dft_low = PRCMU_DEFAULT_LOW_TEMP; >> + dft_high = ptrips->trip_points[0].temp; >> + >> + prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000)); >> + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); > > Shouldn't cur_index and cur_temp_pseudo be updated as well? You may want > to define a helper function with all the code shared by irq handlers > (both high and low), probe and resume. No, they cannot be update because we don't know the actual current temp[1] after short or long time suspend, everything goes as beginning. If a helper function is introduced, it can be only used in probe and resume I think, different and a bit complicated algorithm in irq handlers. [1] due to lack of corresponding interface, search "TODO" in this file to get more explanation. > >> + >> + return 0; >> +} > [...] >> 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> > > Misspelled address > > -- > Francesco
On 10/22/2012 02:02 PM, Hongbo Zhang wrote: [...] >>> +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); >>> + >>> + pzone->trend = THERMAL_TREND_DROPPING; >>> + 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) >> >> } else if () > There is no else condition here, because it it the highest critical > trip point, system will be shut down in thermal_work. > But I'd like to add some comments here to state this situation. I didn't mean adding a new else condition, what I meant is that if the first condition (idx < ptrips->num_trips - 1) is verified, then there is no need to check for the second condition (idx == ptrips->num_trips - 1). So I was thinking of changing the code to: if (idx < ptrips->num_trips - 1) ... else if (idx == ptrips->num_trips - 1) ... Sorry if I wasn't clear. >> >>> + pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1; >>> + >>> + pzone->trend = THERMAL_TREND_RAISING; >>> + 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; >>> + >>> + 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, 0, pzone, &thdev_ops, 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->trend = THERMAL_TREND_STABLE; >> >> All the stuff from prcmu_stop_temp_sense() up to this line can race with >> the irq handlers, I would suggest doing it before requesting the irqs. >> >>> + pzone->mode = THERMAL_DEVICE_ENABLED; >> >> Shouldn't this be protected by pzone->th_lock? Otherwise it should be >> set before the thermal zone is registered. >> >>> + >>> + 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; >>> +} >> >> mutex_destroy() should be called on pzone->th_lock >> >>> + >>> +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); >>> + prcmu_stop_temp_sense(); >>> + >>> + return 0; >>> +} >>> + >>> +static int db8500_thermal_resume(struct platform_device *pdev) >>> +{ >>> + struct db8500_thermal_zone *pzone; >>> + struct db8500_thsens_platform_data *ptrips; >>> + unsigned long dft_low, dft_high; >>> + >>> + pzone = platform_get_drvdata(pdev); >>> + ptrips = pzone->trip_tab; >>> + dft_low = PRCMU_DEFAULT_LOW_TEMP; >>> + dft_high = ptrips->trip_points[0].temp; >>> + >>> + prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000)); >>> + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); >> >> Shouldn't cur_index and cur_temp_pseudo be updated as well? You may want >> to define a helper function with all the code shared by irq handlers >> (both high and low), probe and resume. > No, they cannot be update because we don't know the actual current > temp[1] after short or long time suspend, everything goes as > beginning. That's what I wanted to say, if everything is reset to a default value, then cur_index and cur_temp should be reset too, as it's done in the probe function. Otherwise you may have a current pseudo-temp and a current index unrelated to how the hotmon is configured. > If a helper function is introduced, it can be only used in probe and > resume I think, different and a bit complicated algorithm in irq > handlers. I was thinking about a function which takes the new index and the new low and high parameters, and updates cur_index and cur_pseudo_temp and does the prcmu stuff. It seems to me this is (or should be) common to all the 4 functions. > [1] due to lack of corresponding interface, search "TODO" in this file > to get more explanation. -- Francesco
On 23 October 2012 02:51, Francesco Lavra <francescolavra.fl@gmail.com> wrote: > On 10/22/2012 02:02 PM, Hongbo Zhang wrote: > [...] >>>> +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); >>>> + >>>> + pzone->trend = THERMAL_TREND_DROPPING; >>>> + 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) >>> >>> } else if () >> There is no else condition here, because it it the highest critical >> trip point, system will be shut down in thermal_work. >> But I'd like to add some comments here to state this situation. > > I didn't mean adding a new else condition, what I meant is that if the > first condition (idx < ptrips->num_trips - 1) is verified, then there is > no need to check for the second condition (idx == ptrips->num_trips - > 1). So I was thinking of changing the code to: > > if (idx < ptrips->num_trips - 1) > ... > else if (idx == ptrips->num_trips - 1) > ... > > Sorry if I wasn't clear. Got it, thanks. > >>> >>>> + pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1; >>>> + >>>> + pzone->trend = THERMAL_TREND_RAISING; >>>> + 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; >>>> + >>>> + 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, 0, pzone, &thdev_ops, 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->trend = THERMAL_TREND_STABLE; >>> >>> All the stuff from prcmu_stop_temp_sense() up to this line can race with >>> the irq handlers, I would suggest doing it before requesting the irqs. >>> >>>> + pzone->mode = THERMAL_DEVICE_ENABLED; >>> >>> Shouldn't this be protected by pzone->th_lock? Otherwise it should be >>> set before the thermal zone is registered. >>> >>>> + >>>> + 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; >>>> +} >>> >>> mutex_destroy() should be called on pzone->th_lock >>> >>>> + >>>> +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); >>>> + prcmu_stop_temp_sense(); >>>> + >>>> + return 0; >>>> +} >>>> + >>>> +static int db8500_thermal_resume(struct platform_device *pdev) >>>> +{ >>>> + struct db8500_thermal_zone *pzone; >>>> + struct db8500_thsens_platform_data *ptrips; >>>> + unsigned long dft_low, dft_high; >>>> + >>>> + pzone = platform_get_drvdata(pdev); >>>> + ptrips = pzone->trip_tab; >>>> + dft_low = PRCMU_DEFAULT_LOW_TEMP; >>>> + dft_high = ptrips->trip_points[0].temp; >>>> + >>>> + prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000)); >>>> + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); >>> >>> Shouldn't cur_index and cur_temp_pseudo be updated as well? You may want >>> to define a helper function with all the code shared by irq handlers >>> (both high and low), probe and resume. >> No, they cannot be update because we don't know the actual current >> temp[1] after short or long time suspend, everything goes as >> beginning. > > That's what I wanted to say, if everything is reset to a default value, > then cur_index and cur_temp should be reset too, as it's done in the > probe function. Otherwise you may have a current pseudo-temp and a > current index unrelated to how the hotmon is configured. Yes, right. > >> If a helper function is introduced, it can be only used in probe and >> resume I think, different and a bit complicated algorithm in irq >> handlers. > > I was thinking about a function which takes the new index and the new > low and high parameters, and updates cur_index and cur_pseudo_temp and > does the prcmu stuff. It seems to me this is (or should be) common to > all the 4 functions. I misunderstood this helper will do all the updates, but algorithm of cur_index is different everywhere. If cur_index is calculated outside this new helper function, it works. I will do that. > >> [1] due to lack of corresponding interface, search "TODO" in this file >> to get more explanation. > > -- > Francesco
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 748ba7a..795d7ee 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -174,6 +174,10 @@ compatible = "stericsson,nmk_pinctrl"; }; + cpufreq-cooling { + compatible = "stericsson,db8500-cpufreq-cooling"; + }; + usb@a03e0000 { compatible = "stericsson,db8500-musb", "mentor,musb"; @@ -203,6 +207,13 @@ reg = <0x80157450 0xC>; }; + thermal@801573c0 { + compatible = "stericsson,db8500-thermal"; + reg = <0x801573c0 0x40>; + interrupts = <21 0x4>, <22 0x4>; + interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; + }; + db8500-prcmu-regulators { compatible = "stericsson,db8500-prcmu-regulator"; diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index cc5e7a8..34918c4 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -118,3 +118,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 416d436..5bbd3b5 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -33,6 +33,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> @@ -229,6 +231,71 @@ static struct ab8500_platform_data ab8500_platdata = { }; /* + * 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-0", + }, + }, + [2] = { + .temp = 80000, + .type = THERMAL_TRIP_ACTIVE, + .cooling_dev_name = { + [0] = "thermal-cpufreq-0", + }, + }, + [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 */ @@ -583,6 +650,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_key_dev, &snowball_sbnet_dev, &snowball_gpio_en_3v3_regulator_dev, + &u8500_thsens_device, + &u8500_cpufreq_cooling_device, }; static void __init mop500_init_machine(void) @@ -765,6 +834,10 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { "ux500-msp-i2s.2", &msp2_platform_data), OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, "ux500-msp-i2s.3", &msp3_platform_data), + OF_DEV_AUXDATA("stericsson,db8500-thermal", 0x801573c0, + "db8500-thermal", &db8500_thsens_data), + OF_DEV_AUXDATA("stericsson,db8500-cpufreq-cooling", 0, + "db8500-cpufreq-cooling", NULL), {}, }; diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index edfd67d..6607cba 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 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 bound 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 + bound to thermal zone trip points. When a trip point reached, the + bound 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 885550d..c7a8dab 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -7,3 +7,5 @@ obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o +obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c new file mode 100644 index 0000000..bb065d4 --- /dev/null +++ b/drivers/thermal/db8500_cpufreq_cooling.c @@ -0,0 +1,118 @@ +/* + * 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; +}; + +static int __devinit db8500_cpufreq_cooling_probe(struct platform_device *pdev) +{ + struct db8500_cpufreq_cdev *cooling_devs; + struct cpumask mask_val; + + cooling_devs = devm_kzalloc(&pdev->dev, + sizeof(struct db8500_cpufreq_cdev), GFP_KERNEL); + if (!cooling_devs) + return -ENOMEM; + + cpumask_set_cpu(0, &mask_val); + cooling_devs->cdev = cpufreq_cooling_register(&mask_val); + + if (IS_ERR(cooling_devs->cdev)) { + pr_err("Failed to register cpufreq cooling device\n"); + return PTR_ERR(cooling_devs->cdev); + } + + list_add_tail(&cooling_devs->node, &db8500_cpufreq_cdev_list); + pr_info("Cooling device registered: %s\n", + cooling_devs->cdev->type); + + return 0; +} + +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; +} + +static int db8500_cpufreq_cooling_suspend(struct platform_device *pdev, + pm_message_t state) +{ + return -ENOSYS; +} + +static int db8500_cpufreq_cooling_resume(struct platform_device *pdev) +{ + return -ENOSYS; +} + +#ifdef CONFIG_OF +static const struct of_device_id db8500_cpufreq_cooling_match[] = { + { .compatible = "stericsson,db8500-cpufreq-cooling" }, + {}, +}; +#else +#define db8500_cpufreq_cooling_match NULL +#endif + +static struct platform_driver db8500_cpufreq_cooling_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "db8500-cpufreq-cooling", + .of_match_table = db8500_cpufreq_cooling_match, + }, + .probe = db8500_cpufreq_cooling_probe, + .suspend = db8500_cpufreq_cooling_suspend, + .resume = db8500_cpufreq_cooling_resume, + .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..34dcc52 --- /dev/null +++ b/drivers/thermal/db8500_thermal.c @@ -0,0 +1,507 @@ +/* + * 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; + enum thermal_trend trend; + unsigned long cur_temp_pseudo; + unsigned int cur_index; + int low_irq; + int high_irq; +}; + +/* Callback to bind cooling device to 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; + unsigned long max_state, upper, lower; + 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; + + cdev->ops->get_max_state(cdev, &max_state); + upper = (i > max_state) ? max_state : i; + lower = (i > max_state) ? max_state : i; + + ret = thermal_zone_bind_cooling_device(thermal, i, + cdev, upper, lower); + if (ret) + pr_err("Error binding cooling device.\n"); + else + pr_info("Cdev %s bound.\n", cdev->type); + } + + return ret; +} + +/* Callback to unbind cooling device from 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; + + ret = thermal_zone_unbind_cooling_device( + thermal, i, cdev); + if (ret) + pr_err("Error unbinding cooling device.\n"); + else + pr_info("Cdev %s unbound.\n", cdev->type); + } + + return ret; +} + +/* Callback to get current temperature */ +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; +} + +/* Callback to get temperature changing trend */ +static int db8500_sys_get_trend(struct thermal_zone_device *thermal, + int trip, enum thermal_trend *trend) +{ + struct db8500_thermal_zone *pzone; + pzone = (struct db8500_thermal_zone *)thermal->devdata; + + *trend = pzone->trend; + + return 0; +} + +/* Callback to get thermal zone mode */ +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; +} + +/* Callback to set thermal zone mode */ +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); + + pzone->mode = mode; + + if (mode == THERMAL_DEVICE_ENABLED) + schedule_work(&pzone->therm_work); + + mutex_unlock(&pzone->th_lock); + + return 0; +} + +/* Callback to get trip point type */ +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; +} + +/* Callback to get trip point temperature */ +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; +} + +/* Callback to get critical trip point temperature */ +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_trend = db8500_sys_get_trend, + .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); + + pzone->trend = THERMAL_TREND_DROPPING; + 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; + + pzone->trend = THERMAL_TREND_RAISING; + 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; + + 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, 0, pzone, &thdev_ops, 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->trend = THERMAL_TREND_STABLE; + 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); + prcmu_stop_temp_sense(); + + return 0; +} + +static int db8500_thermal_resume(struct platform_device *pdev) +{ + struct db8500_thermal_zone *pzone; + struct db8500_thsens_platform_data *ptrips; + unsigned long dft_low, dft_high; + + pzone = platform_get_drvdata(pdev); + ptrips = pzone->trip_tab; + dft_low = PRCMU_DEFAULT_LOW_TEMP; + dft_high = ptrips->trip_points[0].temp; + + prcmu_config_hotmon((u8)(dft_low/1000), (u8)(dft_high/1000)); + prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); + + return 0; +} + +#ifdef CONFIG_OF +static const struct of_device_id db8500_thermal_match[] = { + { .compatible = "stericsson,db8500-thermal" }, + {}, +}; +#else +#define db8500_thermal_match NULL +#endif + +static struct platform_driver db8500_thermal_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "db8500-thermal", + .of_match_table = db8500_thermal_match, + }, + .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_ */