ACPI & driver patches for 2.6.32-rc6
Subsystems (6)
Len Brown
reviewerA few patches for 2.6.32-rc6...
Please speak up if you have trouble with any of these, or know of additional patches that merit inclusion.
thanks,
-Len Brown, Intel Open Source Technolgy Center
Len Brown
reviewerPATCH 1/12 ACPI: clean up video.c boundary checks and types
From: Arjan van de Ven <[email protected]>
proc.c and video.c are a bit sloppy around types and style, confusing gcc for a new feature that'll be in 2.6.33 and will cause a warning on the current code.
This patch changes
if (foo + 1 > sizeof bar)
into
if (foo >= sizeof(bar))
which is more kernel-style.
it also changes a variable in proc.c to unsigned; it gets assigned a value from an unsigned type, and is then only compared for > not for negative, so using unsigned is just outright the right type
--- drivers/acpi/proc.c | 2 +- drivers/acpi/video.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/acpi/proc.c +1 -1
@@ -393,7 +393,7 @@ acpi_system_write_wakeup_device(struct file *file,struct list_head *node, *next;char strbuf[5 ];char str[5 ] ="" ; -int len = count; +unsigned int len = count;struct acpi_device *found_dev =NULL ;if (len >4 )
drivers/acpi/video.c +4 -4
@@ -1223,7 +1223,7 @@ acpi_video_device_write_state(struct file *file,u32 state =0 ; -if (!dev || count +1 >sizeof str) +if (!dev || count >=sizeof (str))return -EINVAL ;if (copy_from_user (str, buffer, count))
@@ -1280,7 +1280,7 @@ acpi_video_device_write_brightness(struct file *file,int i; -if (!dev || !dev->brightness || count +1 >sizeof str) +if (!dev || !dev->brightness || count >=sizeof (str))return -EINVAL ;if (copy_from_user (str, buffer, count))
@@ -1562,7 +1562,7 @@ acpi_video_bus_write_POST(struct file *file,unsigned long long opt, options; -if (!video || count +1 >sizeof str) +if (!video || count >=sizeof (str))return -EINVAL ; status =acpi_video_bus_POST_options (video, &options);
@@ -1602,7 +1602,7 @@ acpi_video_bus_write_DOS(struct file *file,unsigned long opt; -if (!video || count +1 >sizeof str) +if (!video || count >=sizeof (str))return -EINVAL ;if (copy_from_user (str, buffer, count))
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 2/12 Revert "eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated"
In reply to Len BrownFrom: Corentin Chary <[email protected]>
rt2860sta is fine with the patch as is, but iwl3945 isn't (eeepc_rfkill_set() needs to call eeepc_rfkill_hotplug(true) – which means that we're back to causing the rt2860sta panic
This reverts commit b56ab33d68638e6aafdbfc694025e8354a628f49.
--- drivers/platform/x86/eeepc-laptop.c | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-)
drivers/platform/x86/eeepc-laptop.c +8 -19
@@ -150,8 +150,6 @@ struct eeepc_hotk {/* The actual device the driver binds to */ static struct eeepc_hotk *ehotk; -static void eeepc_rfkill_hotplug (bool real); -/* Platform device/driver */ static int eeepc_hotk_thaw (struct device *device);static int eeepc_hotk_restore (struct device *device);
@@ -345,16 +343,7 @@ static bool eeepc_wlan_rfkill_blocked(void)static int eeepc_rfkill_set (void *data,bool blocked) {unsigned long asl = (unsigned long )data; -int ret; - -if (asl !=CM_ASL_WLAN ) -return set_acpi (asl, !blocked); - -/* hack to avoid panic with rt2860sta */ -if (blocked) -eeepc_rfkill_hotplug (false); - ret =set_acpi (asl, !blocked); -return ret; +return set_acpi (asl, !blocked); }static const struct rfkill_ops eeepc_rfkill_ops = {
@@ -654,13 +643,13 @@ static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,return 0 ; } -static void eeepc_rfkill_hotplug (bool real) +static void eeepc_rfkill_hotplug (void ) {struct pci_dev *dev;struct pci_bus *bus; -bool blocked = real ?eeepc_wlan_rfkill_blocked () : true; +bool blocked =eeepc_wlan_rfkill_blocked (); -if (real && ehotk->wlan_rfkill) +if (ehotk->wlan_rfkill)rfkill_set_sw_state (ehotk->wlan_rfkill, blocked);mutex_lock (&ehotk->hotplug_lock);
@@ -703,7 +692,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)if (event !=ACPI_NOTIFY_BUS_CHECK )return ; -eeepc_rfkill_hotplug (true); +eeepc_rfkill_hotplug (); }static void eeepc_hotk_notify (struct acpi_device *device,u32 event)
@@ -861,7 +850,7 @@ static int eeepc_hotk_restore(struct device *device) {/* Refresh both wlan rfkill state and pci hotplug */ if (ehotk->wlan_rfkill) -eeepc_rfkill_hotplug (true); +eeepc_rfkill_hotplug ();if (ehotk->bluetooth_rfkill) rfkill_set_sw_state(ehotk->bluetooth_rfkill,
@@ -1004,7 +993,7 @@ static void eeepc_rfkill_exit(void)* Refresh pci hotplug in case the rfkill state was changed after * eeepc_unregister_rfkill_notifier() */ -eeepc_rfkill_hotplug (true); +eeepc_rfkill_hotplug ();if (ehotk->hotplug_slot)pci_hp_deregister (ehotk->hotplug_slot);
@@ -1120,7 +1109,7 @@ static int eeepc_rfkill_init(struct device *dev)* Refresh pci hotplug in case the rfkill state was changed during * setup. */ -eeepc_rfkill_hotplug (true); +eeepc_rfkill_hotplug (); exit:if (result && result != -ENODEV )
Signature · 6 lines
1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Len Brown
reviewerPATCH 3/12 eeepc-laptop: don't enable camera at startup if it's already on.
In reply to Len BrownFrom: Luca Niccoli <[email protected]>
Switching the camera takes 500ms, checking if it's on is almost free... The BIOS remembers the setting through reboots, so there's good chance the camera is already enabled.
--- drivers/platform/x86/eeepc-laptop.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/platform/x86/eeepc-laptop.c +2 -1
@@ -356,7 +356,8 @@ static void __devinit eeepc_enable_camera(void)* If the following call to set_acpi() fails, it's because there's no * camera so we can ignore the error. */ -set_acpi (CM_ASL_CAMERA ,1 ); +if (get_acpi (CM_ASL_CAMERA ) ==0 ) +set_acpi (CM_ASL_CAMERA ,1 ); }/*
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 4/12 acpi-power-meter: Don't leak ACPI error codes to userspace
In reply to Len BrownFrom: Darrick J. Wong <[email protected]>
If the ACPI methods return an error code, we must return -EINVAL to userspace to flag the error. Right now we pass the (positive) number right through, which causes echo to keep writing bogus values.
--- drivers/acpi/power_meter.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/acpi/power_meter.c +5 -1
@@ -294,7 +294,11 @@ static int set_acpi_trip(struct acpi_power_meter_resource *resource)return -EINVAL ; } -return data; +/* _PTP returns 0 on success, nonzero otherwise */ +if (data) +return -EINVAL ; + +return 0 ; } static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 5/12 ACPI: add __cpuinit to acpi_processor_add()
In reply to Len BrownFrom: Rakib Mullick <[email protected]>
Annote acpi_processor_add with cpuinit since it calls a cpuinit function acpi_processor_power_init and fixes a section mismatch warning.
We were warned by the following warning:
LD drivers/acpi/processor.o
WARNING: drivers/acpi/processor.o(.text+0x1829): Section mismatch in reference from the function acpi_processor_add() to the function .cpuinit.text:acpi_processor_power_init()
The function acpi_processor_add() references
the function __cpuinit acpi_processor_power_init().
This is often because acpi_processor_add lacks a __cpuinit annotation or the annotation of acpi_processor_power_init is wrong.
--- drivers/acpi/processor_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/acpi/processor_core.c +1 -1
@@ -770,7 +770,7 @@ static struct notifier_block acpi_cpu_notifier = .notifier_call = acpi_cpu_soft_notify, }; -static int acpi_processor_add (struct acpi_device *device) +static int __cpuinit acpi_processor_add (struct acpi_device *device) {struct acpi_processor *pr =NULL ;int result =0 ;
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 6/12 ACPICA: avoid "Info: mapping multiple BARs. Your kernel is fine."
In reply to Len BrownFrom: Bob Moore <[email protected]>
Ensure that memory mappings created for operation regions
do not cross page boundaries. Crossing a page boundary
while mapping regions can cause warnings if the pages have different attributes.
Such regions are probably BIOS bugs, and this is the workaround.
http://bugzilla.kernel.org/show_bug.cgi?id=14445
[Kernel summit hacking hour]
--- drivers/acpi/acpica/acconfig.h | 4 ++-- drivers/acpi/acpica/exregion.c | 35 +++++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 12 deletions(-)
drivers/acpi/acpica/acconfig.h +2 -2
@@ -103,9 +103,9 @@#define ACPI_MAX_REFERENCE_COUNT 0x1000 -/* Size of cached memory mapping for system memory operation region */ +/* Default page size for use in mapping memory for operation regions */ -#define ACPI_SYSMEM_REGION_WINDOW_SIZE 4096 +#define ACPI_DEFAULT_PAGE_SIZE 4096/* Must be power of 2 */ /* owner_id tracking. 8 entries allows for 255 owner_ids */
drivers/acpi/acpica/exregion.c +25 -10
@@ -77,7 +77,8 @@ acpi_ex_system_memory_space_handler(u32 function,void *logical_addr_ptr =NULL ;struct acpi_mem_space_context *mem_info = region_context;u32 length; -acpi_size window_size; +acpi_size map_length; +acpi_size page_boundary_map_length;#ifdef ACPI_MISALIGNMENT_NOT_SUPPORTED u32 remainder;#endif
@@ -144,25 +145,39 @@ acpi_ex_system_memory_space_handler(u32 function, }/* -* Don't attempt to map memory beyond the end of the region, and -* constrain the maximum mapping size to something reasonable. +* Attempt to map from the requested address to the end of the region. +* However, we will never map more than one page, nor will we cross +* a page boundary. */ - window_size = (acpi_size) + map_length = (acpi_size) ((mem_info->address + mem_info->length) - address); -if (window_size >ACPI_SYSMEM_REGION_WINDOW_SIZE ) { - window_size =ACPI_SYSMEM_REGION_WINDOW_SIZE ; +/* +* If mapping the entire remaining portion of the region will cross +* a page boundary, just map up to the page boundary, do not cross. +* On some systems, crossing a page boundary while mapping regions +* can cause warnings if the pages have different attributes +* due to resource management +*/ + page_boundary_map_length = +ACPI_ROUND_UP (address,ACPI_DEFAULT_PAGE_SIZE ) - address; + +if (!page_boundary_map_length) { + page_boundary_map_length =ACPI_DEFAULT_PAGE_SIZE ; + } + +if (map_length > page_boundary_map_length) { + map_length = page_boundary_map_length; }/* Create a new mapping starting at the address given */ - mem_info->mapped_logical_address = -acpi_os_map_memory ((acpi_physical_address ) address, window_size); + mem_info->mapped_logical_address =acpi_os_map_memory ((acpi_physical_address ) address, map_length);if (!mem_info->mapped_logical_address) {ACPI_ERROR ((AE_INFO ,"Could not map memory at %8.8X%8.8X, size %X" ,ACPI_FORMAT_NATIVE_UINT (address), - (u32 ) window_size)); + (u32 ) map_length)); mem_info->mapped_length =0 ;return_ACPI_STATUS (AE_NO_MEMORY ); }
@@ -170,7 +185,7 @@ acpi_ex_system_memory_space_handler(u32 function,/* Save the physical address and mapping size */ mem_info->mapped_physical_address = address; - mem_info->mapped_length = window_size; + mem_info->mapped_length = map_length; }/*
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 7/12 ACPI: Move dereference after NULL test
In reply to Len BrownFrom: Julia Lawall <[email protected]>
If the NULL test on pr is needed, then the dereference should be after the NULL test.
A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/):
// <smpl>
@match exists@
expression x, E;
identifier fld;
@@
* x->fld
... when != \(x = E\|&x\)
* x == NULL
// </smpl>
--- drivers/acpi/processor_throttling.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/acpi/processor_throttling.c +3 -3
@@ -1133,15 +1133,15 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)int result =0 ;struct acpi_processor_throttling *pthrottling; +if (!pr) +return -EINVAL ; +ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"pblk_address[0x%08x] duty_offset[%d] duty_width[%d]\n" , pr->throttling.address, pr->throttling.duty_offset, pr->throttling.duty_width)); -if (!pr) -return -EINVAL ; -/* * Evaluate _PTC, _TSS and _TPC * They must all be present or none of them can be used.
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 8/12 acpi: thermal: Add EOL to the trip_point_N_type strings
In reply to Len BrownFrom: Amit Kucheria <[email protected]>
Make the trip_point_N_type sysfs files return a string ending in EOL for consistency with other sysfs files.
--- drivers/thermal/thermal_sys.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/thermal/thermal_sys.c +5 -5
@@ -180,15 +180,15 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,switch (type) {case THERMAL_TRIP_CRITICAL : -return sprintf (buf,"critical" ); +return sprintf (buf,"critical\n" );case THERMAL_TRIP_HOT : -return sprintf (buf,"hot" ); +return sprintf (buf,"hot\n" );case THERMAL_TRIP_PASSIVE : -return sprintf (buf,"passive" ); +return sprintf (buf,"passive\n" );case THERMAL_TRIP_ACTIVE : -return sprintf (buf,"active" ); +return sprintf (buf,"active\n" );default : -return sprintf (buf,"unknown" ); +return sprintf (buf,"unknown\n" ); } }
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 9/12 thermal: sysfs-api.txt - reformat for improved readability
In reply to Len BrownFrom: Frans Pop <[email protected]>
The document currently uses large indentations which make the text too wide for easy readability. Also improve general consistency.
--- Documentation/thermal/sysfs-api.txt | 536 ++++++++++++++++++----------------- 1 files changed, 270 insertions(+), 266 deletions(-)
rewrite Documentation/thermal/sysfs-api.txt (76%)
Documentation/thermal/sysfs-api.txt +270 -266
@@ -1,266 +1,270 @@ -Generic Thermal Sysfs driver How To -========================= - -Written by Sujith Thomas <[email protected]>, Zhang Rui <[email protected]> - -Updated: 2 January 2008 - -Copyright (c) 2008 Intel Corporation - - -0. Introduction - -The generic thermal sysfs provides a set of interfaces for thermal zone devices (sensors) -and thermal cooling devices (fan, processor...) to register with the thermal management -solution and to be a part of it. - -This how-to focuses on enabling new thermal zone and cooling devices to participate -in thermal management. -This solution is platform independent and any type of thermal zone devices and -cooling devices should be able to make use of the infrastructure. - -The main task of the thermal sysfs driver is to expose thermal zone attributes as well -as cooling device attributes to the user space. -An intelligent thermal management application can make decisions based on inputs -from thermal zone attributes (the current temperature and trip point temperature) -and throttle appropriate devices. - -[0-*] denotes any positive number starting from 0 -[1-*] denotes any positive number starting from 1 - -1. thermal sysfs driver interface functions - -1.1 thermal zone device interface -1.1.1 struct thermal_zone_device *thermal_zone_device_register(char *name, int trips, - void *devdata, struct thermal_zone_device_ops *ops) - - This interface function adds a new thermal zone device (sensor) to - /sys/class/thermal folder as thermal_zone[0-*]. - It tries to bind all the thermal cooling devices registered at the same time. - - name: the thermal zone name. - trips: the total number of trip points this thermal zone supports. - devdata: device private data - ops: thermal zone device call-backs. - .bind: bind the thermal zone device with a thermal cooling device. - .unbind: unbind the thermal zone device with a thermal cooling device. - .get_temp: get the current temperature of the thermal zone. - .get_mode: get the current mode (user/kernel) of the thermal zone. - "kernel" means thermal management is done in kernel. - "user" will prevent kernel thermal driver actions upon trip points - so that user applications can take charge of thermal management. - .set_mode: set the mode (user/kernel) of the thermal zone. - .get_trip_type: get the type of certain trip point. - .get_trip_temp: get the temperature above which the certain trip point - will be fired. - -1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz) - - This interface function removes the thermal zone device. - It deletes the corresponding entry form /sys/class/thermal folder and unbind all - the thermal cooling devices it uses. - -1.2 thermal cooling device interface -1.2.1 struct thermal_cooling_device *thermal_cooling_device_register(char *name, - void *devdata, struct thermal_cooling_device_ops *) - - This interface function adds a new thermal cooling device (fan/processor/...) to - /sys/class/thermal/ folder as cooling_device[0-*]. - It tries to bind itself to all the thermal zone devices register at the same time. - name: the cooling device name. - devdata: device private data. - ops: thermal cooling devices call-backs. - .get_max_state: get the Maximum throttle state of the cooling device. - .get_cur_state: get the Current throttle state of the cooling device. - .set_cur_state: set the Current throttle state of the cooling device. - -1.2.2 void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev) - - This interface function remove the thermal cooling device. - It deletes the corresponding entry form /sys/class/thermal folder and unbind - itself from all the thermal zone devices using it. - -1.3 interface for binding a thermal zone device with a thermal cooling device -1.3.1 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, - int trip, struct thermal_cooling_device *cdev); - - This interface function bind a thermal cooling device to the certain trip point - of a thermal zone device. - This function is usually called in the thermal zone device .bind callback. - tz: the thermal zone device - cdev: thermal cooling device - trip: indicates which trip point the cooling devices is associated with - in this thermal zone. - -1.3.2 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, - int trip, struct thermal_cooling_device *cdev); - - This interface function unbind a thermal cooling device from the certain trip point - of a thermal zone device. - This function is usually called in the thermal zone device .unbind callback. - tz: the thermal zone device - cdev: thermal cooling device - trip: indicates which trip point the cooling devices is associated with - in this thermal zone. - -2. sysfs attributes structure - -RO read only value -RW read/write value - -Thermal sysfs attributes will be represented under /sys/class/thermal. -Hwmon sysfs I/F extension is also available under /sys/class/hwmon -if hwmon is compiled in or built as a module. - -Thermal zone device sys I/F, created once it's registered: -/sys/class/thermal/thermal_zone[0-*]: - |-----type: Type of the thermal zone - |-----temp: Current temperature - |-----mode: Working mode of the thermal zone - |-----trip_point_[0-*]_temp: Trip point temperature - |-----trip_point_[0-*]_type: Trip point type - -Thermal cooling device sys I/F, created once it's registered: -/sys/class/thermal/cooling_device[0-*]: - |-----type : Type of the cooling device(processor/fan/...) - |-----max_state: Maximum cooling state of the cooling device - |-----cur_state: Current cooling state of the cooling device - - -These two dynamic attributes are created/removed in pairs. -They represent the relationship between a thermal zone and its associated cooling device. -They are created/removed for each -thermal_zone_bind_cooling_device/thermal_zone_unbind_cooling_device successful execution. - -/sys/class/thermal/thermal_zone[0-*] - |-----cdev[0-*]: The [0-*]th cooling device in the current thermal zone - |-----cdev[0-*]_trip_point: Trip point that cdev[0-*] is associated with - -Besides the thermal zone device sysfs I/F and cooling device sysfs I/F, -the generic thermal driver also creates a hwmon sysfs I/F for each _type_ of -thermal zone device. E.g. the generic thermal driver registers one hwmon class device -and build the associated hwmon sysfs I/F for all the registered ACPI thermal zones. -/sys/class/hwmon/hwmon[0-*]: - |-----name: The type of the thermal zone devices. - |-----temp[1-*]_input: The current temperature of thermal zone [1-*]. - |-----temp[1-*]_critical: The critical trip point of thermal zone [1-*]. -Please read Documentation/hwmon/sysfs-interface for additional information. - -*************************** -* Thermal zone attributes * -*************************** - -type Strings which represent the thermal zone type. - This is given by thermal zone driver as part of registration. - Eg: "acpitz" indicates it's an ACPI thermal device. - In order to keep it consistent with hwmon sys attribute, - this should be a short, lowercase string, - not containing spaces nor dashes. - RO - Required - -temp Current temperature as reported by thermal zone (sensor) - Unit: millidegree Celsius - RO - Required - -mode One of the predefined values in [kernel, user] - This file gives information about the algorithm - that is currently managing the thermal zone. - It can be either default kernel based algorithm - or user space application. - RW - Optional - kernel = Thermal management in kernel thermal zone driver. - user = Preventing kernel thermal zone driver actions upon - trip points so that user application can take full - charge of the thermal management. - -trip_point_[0-*]_temp The temperature above which trip point will be fired - Unit: millidegree Celsius - RO - Optional - -trip_point_[0-*]_type Strings which indicate the type of the trip point - E.g. it can be one of critical, hot, passive, - active[0-*] for ACPI thermal zone. - RO - Optional - -cdev[0-*] Sysfs link to the thermal cooling device node where the sys I/F - for cooling device throttling control represents. - RO - Optional - -cdev[0-*]_trip_point The trip point with which cdev[0-*] is associated in this thermal zone - -1 means the cooling device is not associated with any trip point. - RO - Optional - -****************************** -* Cooling device attributes * -****************************** - -type String which represents the type of device - eg: For generic ACPI: this should be "Fan", - "Processor" or "LCD" - eg. For memory controller device on intel_menlow platform: - this should be "Memory controller" - RO - Required - -max_state The maximum permissible cooling state of this cooling device. - RO - Required - -cur_state The current cooling state of this cooling device. - the value can any integer numbers between 0 and max_state, - cur_state == 0 means no cooling - cur_state == max_state means the maximum cooling. - RW - Required - -3. A simple implementation - -ACPI thermal zone may support multiple trip points like critical/hot/passive/active. -If an ACPI thermal zone supports critical, passive, active[0] and active[1] at the same time, -it may register itself as a thermal_zone_device (thermal_zone1) with 4 trip points in all. -It has one processor and one fan, which are both registered as thermal_cooling_device. -If the processor is listed in _PSL method, and the fan is listed in _AL0 method, -the sys I/F structure will be built like this: - -/sys/class/thermal: - -|thermal_zone1: - |-----type: acpitz - |-----temp: 37000 - |-----mode: kernel - |-----trip_point_0_temp: 100000 - |-----trip_point_0_type: critical - |-----trip_point_1_temp: 80000 - |-----trip_point_1_type: passive - |-----trip_point_2_temp: 70000 - |-----trip_point_2_type: active0 - |-----trip_point_3_temp: 60000 - |-----trip_point_3_type: active1 - |-----cdev0: --->/sys/class/thermal/cooling_device0 - |-----cdev0_trip_point: 1 /* cdev0 can be used for passive */ - |-----cdev1: --->/sys/class/thermal/cooling_device3 - |-----cdev1_trip_point: 2 /* cdev1 can be used for active[0]*/ - -|cooling_device0: - |-----type: Processor - |-----max_state: 8 - |-----cur_state: 0 - -|cooling_device3: - |-----type: Fan - |-----max_state: 2 - |-----cur_state: 0 - -/sys/class/hwmon: - -|hwmon0: - |-----name: acpitz - |-----temp1_input: 37000 - |-----temp1_crit: 100000 +Generic Thermal Sysfs driver How To +=================================== + +Written by Sujith Thomas <[email protected]>, Zhang Rui <[email protected]> + +Updated: 2 January 2008 + +Copyright (c) 2008 Intel Corporation + + +0. Introduction + +The generic thermal sysfs provides a set of interfaces for thermal zone +devices (sensors) and thermal cooling devices (fan, processor...) to register +with the thermal management solution and to be a part of it. + +This how-to focuses on enabling new thermal zone and cooling devices to +participate in thermal management. +This solution is platform independent and any type of thermal zone devices +and cooling devices should be able to make use of the infrastructure. + +The main task of the thermal sysfs driver is to expose thermal zone attributes +as well as cooling device attributes to the user space. +An intelligent thermal management application can make decisions based on +inputs from thermal zone attributes (the current temperature and trip point +temperature) and throttle appropriate devices. + +[0-*] denotes any positive number starting from 0 +[1-*] denotes any positive number starting from 1 + +1. thermal sysfs driver interface functions + +1.1 thermal zone device interface +1.1.1 struct thermal_zone_device *thermal_zone_device_register(char *name, + int trips, void *devdata, struct thermal_zone_device_ops *ops) + + This interface function adds a new thermal zone device (sensor) to + /sys/class/thermal folder as thermal_zone[0-*]. It tries to bind all the + thermal cooling devices registered at the same time. + + name: the thermal zone name. + trips: the total number of trip points this thermal zone supports. + devdata: device private data + ops: thermal zone device call-backs. + .bind: bind the thermal zone device with a thermal cooling device. + .unbind: unbind the thermal zone device with a thermal cooling device. + .get_temp: get the current temperature of the thermal zone. + .get_mode: get the current mode (user/kernel) of the thermal zone. + - "kernel" means thermal management is done in kernel. + - "user" will prevent kernel thermal driver actions upon trip points + so that user applications can take charge of thermal management. + .set_mode: set the mode (user/kernel) of the thermal zone. + .get_trip_type: get the type of certain trip point. + .get_trip_temp: get the temperature above which the certain trip point + will be fired. + +1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz) + + This interface function removes the thermal zone device. + It deletes the corresponding entry form /sys/class/thermal folder and + unbind all the thermal cooling devices it uses. + +1.2 thermal cooling device interface +1.2.1 struct thermal_cooling_device *thermal_cooling_device_register(char *name, + void *devdata, struct thermal_cooling_device_ops *) + + This interface function adds a new thermal cooling device (fan/processor/...) + to /sys/class/thermal/ folder as cooling_device[0-*]. It tries to bind itself + to all the thermal zone devices register at the same time. + name: the cooling device name. + devdata: device private data. + ops: thermal cooling devices call-backs. + .get_max_state: get the Maximum throttle state of the cooling device. + .get_cur_state: get the Current throttle state of the cooling device. + .set_cur_state: set the Current throttle state of the cooling device. + +1.2.2 void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev) + + This interface function remove the thermal cooling device. + It deletes the corresponding entry form /sys/class/thermal folder and + unbind itself from all the thermal zone devices using it. + +1.3 interface for binding a thermal zone device with a thermal cooling device +1.3.1 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, + int trip, struct thermal_cooling_device *cdev); + + This interface function bind a thermal cooling device to the certain trip + point of a thermal zone device. + This function is usually called in the thermal zone device .bind callback. + tz: the thermal zone device + cdev: thermal cooling device + trip: indicates which trip point the cooling devices is associated with + in this thermal zone. + +1.3.2 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, + int trip, struct thermal_cooling_device *cdev); + + This interface function unbind a thermal cooling device from the certain + trip point of a thermal zone device. This function is usually called in + the thermal zone device .unbind callback. + tz: the thermal zone device + cdev: thermal cooling device + trip: indicates which trip point the cooling devices is associated with + in this thermal zone. + +2. sysfs attributes structure + +RO read only value +RW read/write value + +Thermal sysfs attributes will be represented under /sys/class/thermal. +Hwmon sysfs I/F extension is also available under /sys/class/hwmon +if hwmon is compiled in or built as a module. + +Thermal zone device sys I/F, created once it's registered: +/sys/class/thermal/thermal_zone[0-*]: + |---type: Type of the thermal zone + |---temp: Current temperature + |---mode: Working mode of the thermal zone + |---trip_point_[0-*]_temp: Trip point temperature + |---trip_point_[0-*]_type: Trip point type + +Thermal cooling device sys I/F, created once it's registered: +/sys/class/thermal/cooling_device[0-*]: + |---type: Type of the cooling device(processor/fan/...) + |---max_state: Maximum cooling state of the cooling device + |---cur_state: Current cooling state of the cooling device + + +Then next two dynamic attributes are created/removed in pairs. They represent +the relationship between a thermal zone and its associated cooling device. +They are created/removed for each successful execution of +thermal_zone_bind_cooling_device/thermal_zone_unbind_cooling_device. + +/sys/class/thermal/thermal_zone[0-*]: + |---cdev[0-*]: [0-*]th cooling device in current thermal zone + |---cdev[0-*]_trip_point: Trip point that cdev[0-*] is associated with + +Besides the thermal zone device sysfs I/F and cooling device sysfs I/F, +the generic thermal driver also creates a hwmon sysfs I/F for each _type_ +of thermal zone device. E.g. the generic thermal driver registers one hwmon +class device and build the associated hwmon sysfs I/F for all the registered +ACPI thermal zones. + +/sys/class/hwmon/hwmon[0-*]: + |---name: The type of the thermal zone devices + |---temp[1-*]_input: The current temperature of thermal zone [1-*] + |---temp[1-*]_critical: The critical trip point of thermal zone [1-*] + +Please read Documentation/hwmon/sysfs-interface for additional information. + +*************************** +* Thermal zone attributes * +*************************** + +type + Strings which represent the thermal zone type. + This is given by thermal zone driver as part of registration. + E.g: "acpitz" indicates it's an ACPI thermal device. + In order to keep it consistent with hwmon sys attribute; this should + be a short, lowercase string, not containing spaces nor dashes. + RO, Required + +temp + Current temperature as reported by thermal zone (sensor). + Unit: millidegree Celsius + RO, Required + +mode + One of the predefined values in [kernel, user]. + This file gives information about the algorithm that is currently + managing the thermal zone. It can be either default kernel based + algorithm or user space application. + kernel = Thermal management in kernel thermal zone driver. + user = Preventing kernel thermal zone driver actions upon + trip points so that user application can take full + charge of the thermal management. + RW, Optional + +trip_point_[0-*]_temp + The temperature above which trip point will be fired. + Unit: millidegree Celsius + RO, Optional + +trip_point_[0-*]_type + Strings which indicate the type of the trip point. + E.g. it can be one of critical, hot, passive, active[0-*] for ACPI + thermal zone. + RO, Optional + +cdev[0-*] + Sysfs link to the thermal cooling device node where the sys I/F + for cooling device throttling control represents. + RO, Optional + +cdev[0-*]_trip_point + The trip point with which cdev[0-*] is associated in this thermal + zone; -1 means the cooling device is not associated with any trip + point. + RO, Optional + +***************************** +* Cooling device attributes * +***************************** + +type + String which represents the type of device, e.g: + - for generic ACPI: should be "Fan", "Processor" or "LCD" + - for memory controller device on intel_menlow platform: + should be "Memory controller". + RO, Required + +max_state + The maximum permissible cooling state of this cooling device. + RO, Required + +cur_state + The current cooling state of this cooling device. + The value can any integer numbers between 0 and max_state: + - cur_state == 0 means no cooling + - cur_state == max_state means the maximum cooling. + RW, Required + +3. A simple implementation + +ACPI thermal zone may support multiple trip points like critical, hot, +passive, active. If an ACPI thermal zone supports critical, passive, +active[0] and active[1] at the same time, it may register itself as a +thermal_zone_device (thermal_zone1) with 4 trip points in all. +It has one processor and one fan, which are both registered as +thermal_cooling_device. + +If the processor is listed in _PSL method, and the fan is listed in _AL0 +method, the sys I/F structure will be built like this: + +/sys/class/thermal: + +|thermal_zone1: + |---type: acpitz + |---temp: 37000 + |---mode: kernel + |---trip_point_0_temp: 100000 + |---trip_point_0_type: critical + |---trip_point_1_temp: 80000 + |---trip_point_1_type: passive + |---trip_point_2_temp: 70000 + |---trip_point_2_type: active0 + |---trip_point_3_temp: 60000 + |---trip_point_3_type: active1 + |---cdev0: --->/sys/class/thermal/cooling_device0 + |---cdev0_trip_point: 1 /* cdev0 can be used for passive */ + |---cdev1: --->/sys/class/thermal/cooling_device3 + |---cdev1_trip_point: 2 /* cdev1 can be used for active[0]*/ + +|cooling_device0: + |---type: Processor + |---max_state: 8 + |---cur_state: 0 + +|cooling_device3: + |---type: Fan + |---max_state: 2 + |---cur_state: 0 + +/sys/class/hwmon: + +|hwmon0: + |---name: acpitz + |---temp1_input: 37000 + |---temp1_crit: 100000
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 10/12 thermal: sysfs-api.txt - document passive attribute for thermal zones
In reply to Len BrownFrom: Frans Pop <[email protected]>
--- Documentation/thermal/sysfs-api.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
Documentation/thermal/sysfs-api.txt +9 -0
@@ -199,6 +199,15 @@ cdev[0-*]_trip_point point. RO, Optional +passive + Attribute is only present for zones in which the passive cooling + policy is not supported by native thermal driver. Default is zero + and can be set to a temperature (in millidegrees) to enable a + passive trip point for the zone. Activation is done by polling with + an interval of 1 second. + Unit: millidegrees Celsius + RW, Optional + ***************************** * Cooling device attributes * *****************************
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 11/12 ACPI: add DMI entry for SCI_EN resume quirk on HP dv4
In reply to Len BrownFrom: Gustavo Maciel Dias Vieira <[email protected]>
Fixes the missing battery on sleep problem for yet another HP laptop ("HP Pavilion dv4").
Fixes:
http://bugzilla.kernel.org/show_bug.cgi?id=13449
--- drivers/acpi/sleep.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/acpi/sleep.c +8 -0
@@ -413,6 +413,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, }, { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Pavilion dv4", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4"), + }, + }, + { .callback = init_old_suspend_ordering, .ident = "Panasonic CF51-2L", .matches = {
Signature · 1 line
1.6.0.6
Len Brown
reviewerPATCH 12/12 ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resume
In reply to Len BrownFrom: Vaibhav Verma <[email protected]>
http://bugzilla.kernel.org/show_bug.cgi?id=13745
--- drivers/acpi/sleep.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
drivers/acpi/sleep.c +16 -0
@@ -421,6 +421,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, }, { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Pavilion dv7", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7"), + }, + }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario CQ40 Notebook PC"), + }, + }, + { .callback = init_old_suspend_ordering, .ident = "Panasonic CF51-2L", .matches = {
Signature · 1 line
1.6.0.6