Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (7b791d44) · Commits · 戴 / test

Documentation/thermal/sysfs-api.txt

+11 −12

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ The generic thermal sysfs provides a set of interfaces for thermal zone devices
		and thermal cooling devices (fan, processor...) to register with the thermal management
		solution and to be a part of it.

		This how-to focusses on enabling new thermal zone and cooling devices to participate
		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.
		@@ -41,9 +41,9 @@ and throttle appropriate devices.
		name: the thermal zone name.
		trips: the total number of trip points this thermal zone supports.
		devdata: device private data
		ops: thermal zone device callbacks.
		ops: thermal zone device call-backs.
		.bind: bind the thermal zone device with a thermal cooling device.
		.unbind: unbing 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.
		@@ -69,7 +69,7 @@ and throttle appropriate devices.
		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 callbacks.
		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.
		@@ -109,7 +109,6 @@ RO read only value
		RW read/write value

		All thermal sysfs attributes will be represented under /sys/class/thermal
		/sys/class/thermal/

		Thermal zone device sys I/F, created once it's registered:
		\|thermal_zone[0-*]:
		@@ -129,7 +128,7 @@ Thermal cooling device sys I/F, created once it's registered:
		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 exection.
		thermal_zone_bind_cooling_device/thermal_zone_unbind_cooling_device successful execution.

		\|thermal_zone[0-*]
		\|-----cdev[0-]: The [0-]th cooling device in the current thermal zone
		@@ -147,11 +146,11 @@ type Strings which represent the thermal zone type.
		Optional

		temp Current temperature as reported by thermal zone (sensor)
		Unit: degree celsius
		Unit: degree Celsius
		RO
		Required

		mode One of the predifned values in [kernel, user]
		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
		@@ -164,12 +163,12 @@ mode One of the predifned values in [kernel, user]
		charge of the thermal management.

		trip_point_[0-*]_temp The temperature above which trip point will be fired
		Unit: degree celsius
		Unit: degree Celsius
		RO
		Optional

		trip_point_[0-*]_type Strings which indicate the type of the trip point
		Eg. it can be one of critical, hot, passive,
		E.g. it can be one of critical, hot, passive,
		active[0-*] for ACPI thermal zone.
		RO
		Optional
		@@ -179,7 +178,7 @@ cdev[0-*] Sysfs link to the thermal cooling device node where the sys I/F
		RO
		Optional

		cdev[0-]_trip_point The trip point with which cdev[0-] is assocated in this thermal zone
		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
		@@ -211,7 +210,7 @@ cur_state The current cooling state of this cooling device.

		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 thermale_zone_device (thermal_zone1) with 4 trip points in all.
		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:

drivers/acpi/Kconfig

+16 −4

Original line number	Diff line number	Diff line
		@@ -204,13 +204,25 @@ config ACPI_NUMA

		config ACPI_WMI
		tristate "WMI (EXPERIMENTAL)"
		depends on X86
		depends on EXPERIMENTAL
		help
		This driver adds support for the ACPI-WMI mapper device (PNP0C14)
		found on some systems.
		This driver adds support for the ACPI-WMI (Windows Management
		Instrumentation) mapper device (PNP0C14) found on some systems.

		ACPI-WMI is a proprietary extension to ACPI to expose parts of the
		ACPI firmware to userspace - this is done through various vendor
		defined methods and data blocks in a PNP0C14 device, which are then
		made available for userspace to call.

		The implementation of this in Linux currently only exposes this to
		other kernel space drivers.

		This driver is a required dependency to build the firmware specific
		drivers needed on many machines, including Acer and HP laptops.

		NOTE: You will need another driver or userspace application on top of
		this to actually use anything defined in the ACPI-WMI mapper.
		It is safe to enable this driver even if your DSDT doesn't define
		any ACPI-WMI devices.

		config ACPI_ASUS
		tristate "ASUS/Medion Laptop Extras"

drivers/acpi/blacklist.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -445,6 +445,8 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		* DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"),
		* _OSI(Linux) is a NOP:
		* DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),
		* _OSI(Linux) effect unknown
		* DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
		*/
		{
		.callback = dmi_enable_osi_linux,
		@@ -464,6 +466,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		},
		{
		.callback = dmi_unknown_osi_linux,
		.ident = "Lenovo ThinkPad X61",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
		},
		},
		{
		.callback = dmi_unknown_osi_linux,
		.ident = "Lenovo 3000 V100",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		@@ -505,6 +515,16 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_NAME, "NEC VERSA M360"),
		},
		},
		/* Panasonic */
		{
		.callback = dmi_unknown_osi_linux,
		.ident = "Panasonic",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
		/* Toughbook CF-52 */
		DMI_MATCH(DMI_PRODUCT_NAME, "CF-52CCABVBG"),
		},
		},
		/*
		* Disable OSI(Linux) warnings on all "Samsung Electronics"
		*

drivers/acpi/osl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,7 @@ struct acpi_table_header *acpi_find_dsdt_initrd(void)
		struct kstat stat;
		char *ramfs_dsdt_name = "/DSDT.aml";

		printk(KERN_INFO PREFIX "Checking initramfs for custom DSDT");
		printk(KERN_INFO PREFIX "Checking initramfs for custom DSDT\n");

		/*
		* Never do this at home, only the user-space is allowed to open a file.

drivers/acpi/processor_perflib.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,10 @@ ACPI_MODULE_NAME("processor_perflib");

		static DEFINE_MUTEX(performance_mutex);

		/* Use cpufreq debug layer for _PPC changes. */
		#define cpufreq_printk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, \
		"cpufreq-core", msg)

		/*
		* _PPC support is implemented as a CPUfreq policy notifier:
		* This means each time a CPUfreq driver registered also with
		@@ -131,6 +135,9 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
		return -ENODEV;
		}

		cpufreq_printk("CPU %d: _PPC is %d - frequency %s limited\n", pr->id,
		(int)ppc, ppc ? "" : "not");

		pr->performance_platform_limit = (int)ppc;

		return 0;

Admin message