Loading Documentation/ibm-acpi.txt +120 −31 Original line number Original line Diff line number Diff line Loading @@ -398,25 +398,67 @@ Temperature sensors -- /proc/acpi/ibm/thermal Most ThinkPads include six or more separate temperature sensors but Most ThinkPads include six or more separate temperature sensors but only expose the CPU temperature through the standard ACPI methods. only expose the CPU temperature through the standard ACPI methods. This feature shows readings from up to eight different sensors. Some This feature shows readings from up to eight different sensors on older readings may not be valid, e.g. may show large negative values. For ThinkPads, and it has experimental support for up to sixteen different example, on the X40, a typical output may be: sensors on newer ThinkPads. Readings from sensors that are not available return -128. No commands can be written to this file. EXPERIMENTAL: The 16-sensors feature is marked EXPERIMENTAL because the implementation directly accesses hardware registers and may not work as expected. USE WITH CAUTION! To use this feature, you need to supply the experimental=1 parameter when loading the module. When EXPERIMENTAL mode is enabled, reading the first 8 sensors on newer ThinkPads will also use an new experimental thermal sensor access mode. For example, on the X40, a typical output may be: temperatures: 42 42 45 41 36 -128 33 -128 temperatures: 42 42 45 41 36 -128 33 -128 Thomas Gruber took his R51 apart and traced all six active sensors in EXPERIMENTAL: On the T43/p, a typical output may be: his laptop (the location of sensors may vary on other models): temperatures: 48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128 The mapping of thermal sensors to physical locations varies depending on system-board model (and thus, on ThinkPad model). http://thinkwiki.org/wiki/Thermal_Sensors is a public wiki page that tries to track down these locations for various models. Most (newer?) models seem to follow this pattern: 1: CPU 1: CPU 2: Mini PCI Module 2: (depends on model) 3: HDD 3: (depends on model) 4: GPU 4: GPU 5: Battery 5: Main battery: main sensor 6: N/A 6: Bay battery: main sensor 7: Battery 7: Main battery: secondary sensor 8: N/A 8: Bay battery: secondary sensor 9-15: (depends on model) For the R51 (source: Thomas Gruber): 2: Mini-PCI 3: Internal HDD For the T43, T43/p (source: Shmidoax/Thinkwiki.org) http://thinkwiki.org/wiki/Thermal_Sensors#ThinkPad_T43.2C_T43p 2: System board, left side (near PCMCIA slot), reported as HDAPS temp 3: PCMCIA slot 9: MCH (northbridge) to DRAM Bus 10: ICH (southbridge), under Mini-PCI card, under touchpad 11: Power regulator, underside of system board, below F2 key The A31 has a very atypical layout for the thermal sensors (source: Milos Popovic, http://thinkwiki.org/wiki/Thermal_Sensors#ThinkPad_A31) 1: CPU 2: Main Battery: main sensor 3: Power Converter 4: Bay Battery: main sensor 5: MCH (northbridge) 6: PCMCIA/ambient 7: Main Battery: secondary sensor 8: Bay Battery: secondary sensor No commands can be written to this file. EXPERIMENTAL: Embedded controller register dump -- /proc/acpi/ibm/ecdump EXPERIMENTAL: Embedded controller register dump -- /proc/acpi/ibm/ecdump ------------------------------------------------------------------------ ------------------------------------------------------------------------ Loading Loading @@ -529,27 +571,57 @@ directly accesses hardware registers and may not work as expected. USE WITH CAUTION! To use this feature, you need to supply the WITH CAUTION! To use this feature, you need to supply the experimental=1 parameter when loading the module. experimental=1 parameter when loading the module. This feature attempts to show the current fan speed. The speed is read This feature attempts to show the current fan speed, control mode and directly from the hardware registers of the embedded controller. This other fan data that might be available. The speed is read directly is known to work on later R, T and X series ThinkPads but may show a from the hardware registers of the embedded controller. This is known bogus value on other models. to work on later R, T and X series ThinkPads but may show a bogus value on other models. Most ThinkPad fans work in "levels". Level 0 stops the fan. The higher the level, the higher the fan speed, although adjacent levels often map to the same fan speed. 7 is the highest level, where the fan reaches the maximum recommended speed. Level "auto" means the EC changes the fan level according to some internal algorithm, usually based on readings from the thermal sensors. Level "disengaged" means the EC disables the speed-locked closed-loop fan control, and drives the fan as fast as it can go, which might exceed hardware limits, so use this level with caution. The fan usually ramps up or down slowly from one speed to another, and it is normal for the EC to take several seconds to react to fan commands. The fan may be enabled or disabled with the following commands: The fan may be enabled or disabled with the following commands: echo enable >/proc/acpi/ibm/fan echo enable >/proc/acpi/ibm/fan echo disable >/proc/acpi/ibm/fan echo disable >/proc/acpi/ibm/fan Placing a fan on level 0 is the same as disabling it. Enabling a fan will try to place it in a safe level if it is too slow or disabled. WARNING WARNING WARNING: do not leave the fan disabled unless you are WARNING WARNING WARNING: do not leave the fan disabled unless you are monitoring the temperature sensor readings and you are ready to enable monitoring all of the temperature sensor readings and you are ready to it if necessary to avoid overheating. enable it if necessary to avoid overheating. The fan only runs if it's enabled *and* the various temperature An enabled fan in level "auto" may stop spinning if the EC decides the sensors which control it read high enough. On the X40, this seems to ThinkPad is cool enough and doesn't need the extra airflow. This is depend on the CPU and HDD temperatures. Specifically, the fan is normal, and the EC will spin the fan up if the varios thermal readings turned on when either the CPU temperature climbs to 56 degrees or the rise too much. HDD temperature climbs to 46 degrees. The fan is turned off when the CPU temperature drops to 49 degrees and the HDD temperature drops to On the X40, this seems to depend on the CPU and HDD temperatures. 41 degrees. These thresholds cannot currently be controlled. Specifically, the fan is turned on when either the CPU temperature climbs to 56 degrees or the HDD temperature climbs to 46 degrees. The fan is turned off when the CPU temperature drops to 49 degrees and the HDD temperature drops to 41 degrees. These thresholds cannot currently be controlled. The fan level can be controlled with the command: echo 'level <level>' > /proc/acpi/ibm/thermal Where <level> is an integer from 0 to 7, or one of the words "auto" or "disengaged" (without the quotes). Not all ThinkPads support the "auto" and "disengaged" levels. On the X31 and X40 (and ONLY on those models), the fan speed can be On the X31 and X40 (and ONLY on those models), the fan speed can be controlled to a certain degree. Once the fan is running, it can be controlled to a certain degree. Once the fan is running, it can be Loading @@ -562,12 +634,9 @@ about 3700 to about 7350. Values outside this range either do not have any effect or the fan speed eventually settles somewhere in that any effect or the fan speed eventually settles somewhere in that range. The fan cannot be stopped or started with this command. range. The fan cannot be stopped or started with this command. On the 570, temperature readings are not available through this The ThinkPad's ACPI DSDT code will reprogram the fan on its own when feature and the fan control works a little differently. The fan speed certain conditions are met. It will override any fan programming done is reported in levels from 0 (off) to 7 (max) and can be controlled through ibm-acpi. with the following command: echo 'level <level>' > /proc/acpi/ibm/thermal EXPERIMENTAL: WAN -- /proc/acpi/ibm/wan EXPERIMENTAL: WAN -- /proc/acpi/ibm/wan --------------------------------------- --------------------------------------- Loading Loading @@ -601,6 +670,26 @@ example: modprobe ibm_acpi hotkey=enable,0xffff video=auto_disable modprobe ibm_acpi hotkey=enable,0xffff video=auto_disable The ibm-acpi kernel driver can be programmed to revert the fan level to a safe setting if userspace does not issue one of the fan commands: "enable", "disable", "level" or "watchdog" within a configurable ammount of time. To do this, use the "watchdog" command. echo 'watchdog <interval>' > /proc/acpi/ibm/fan Interval is the ammount of time in seconds to wait for one of the above mentioned fan commands before reseting the fan level to a safe one. If set to zero, the watchdog is disabled (default). When the watchdog timer runs out, it does the exact equivalent of the "enable" fan command. Note that the watchdog timer stops after it enables the fan. It will be rearmed again automatically (using the same interval) when one of the above mentioned fan commands is received. The fan watchdog is, therefore, not suitable to protect against fan mode changes made through means other than the "enable", "disable", and "level" fan commands. Example Configuration Example Configuration --------------------- --------------------- Loading drivers/acpi/Kconfig +14 −0 Original line number Original line Diff line number Diff line Loading @@ -173,6 +173,7 @@ config ACPI_NUMA config ACPI_ASUS config ACPI_ASUS tristate "ASUS/Medion Laptop Extras" tristate "ASUS/Medion Laptop Extras" depends on X86 depends on X86 select BACKLIGHT_CLASS_DEVICE ---help--- ---help--- This driver provides support for extra features of ACPI-compatible This driver provides support for extra features of ACPI-compatible ASUS laptops. As some of Medion laptops are made by ASUS, it may also ASUS laptops. As some of Medion laptops are made by ASUS, it may also Loading Loading @@ -201,6 +202,7 @@ config ACPI_ASUS config ACPI_IBM config ACPI_IBM tristate "IBM ThinkPad Laptop Extras" tristate "IBM ThinkPad Laptop Extras" depends on X86 depends on X86 select BACKLIGHT_CLASS_DEVICE ---help--- ---help--- This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video support for Fn-Fx key combinations, Bluetooth control, video Loading @@ -223,9 +225,21 @@ config ACPI_IBM_DOCK If you are not sure, say N here. If you are not sure, say N here. config ACPI_IBM_BAY bool "Legacy Removable Bay Support" depends on ACPI_IBM depends on ACPI_BAY=n default n ---help--- Allows the ibm_acpi driver to handle removable bays. This support is obsoleted by CONFIG_ACPI_BAY. If you are not sure, say N here. config ACPI_TOSHIBA config ACPI_TOSHIBA tristate "Toshiba Laptop Extras" tristate "Toshiba Laptop Extras" depends on X86 depends on X86 select BACKLIGHT_CLASS_DEVICE ---help--- ---help--- This driver adds support for access to certain system settings This driver adds support for access to certain system settings on "legacy free" Toshiba laptops. These laptops can be recognized by on "legacy free" Toshiba laptops. These laptops can be recognized by Loading drivers/acpi/asus_acpi.c +46 −16 Original line number Original line Diff line number Diff line Loading @@ -35,6 +35,7 @@ #include <linux/init.h> #include <linux/init.h> #include <linux/types.h> #include <linux/types.h> #include <linux/proc_fs.h> #include <linux/proc_fs.h> #include <linux/backlight.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h> #include <asm/uaccess.h> #include <asm/uaccess.h> Loading Loading @@ -402,6 +403,8 @@ static struct model_data model_conf[END_MODEL] = { /* procdir we use */ /* procdir we use */ static struct proc_dir_entry *asus_proc_dir; static struct proc_dir_entry *asus_proc_dir; static struct backlight_device *asus_backlight_device; /* /* * This header is made available to allow proper configuration given model, * This header is made available to allow proper configuration given model, * revision number , ... this info cannot go in struct asus_hotk because it is * revision number , ... this info cannot go in struct asus_hotk because it is Loading Loading @@ -779,7 +782,7 @@ proc_write_lcd(struct file *file, const char __user * buffer, return rv; return rv; } } static int read_brightness(void) static int read_brightness(struct backlight_device *bd) { { int value; int value; Loading @@ -801,9 +804,10 @@ static int read_brightness(void) /* /* * Change the brightness level * Change the brightness level */ */ static void set_brightness(int value) static int set_brightness(int value) { { acpi_status status = 0; acpi_status status = 0; int ret = 0; /* SPLV laptop */ /* SPLV laptop */ if (hotk->methods->brightness_set) { if (hotk->methods->brightness_set) { Loading @@ -811,11 +815,12 @@ static void set_brightness(int value) value, NULL)) value, NULL)) printk(KERN_WARNING printk(KERN_WARNING "Asus ACPI: Error changing brightness\n"); "Asus ACPI: Error changing brightness\n"); return; ret = -EIO; goto out; } } /* No SPLV method if we are here, act as appropriate */ /* No SPLV method if we are here, act as appropriate */ value -= read_brightness(); value -= read_brightness(NULL); while (value != 0) { while (value != 0) { status = acpi_evaluate_object(NULL, (value > 0) ? status = acpi_evaluate_object(NULL, (value > 0) ? hotk->methods->brightness_up : hotk->methods->brightness_up : Loading @@ -825,15 +830,22 @@ static void set_brightness(int value) if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status)) printk(KERN_WARNING printk(KERN_WARNING "Asus ACPI: Error changing brightness\n"); "Asus ACPI: Error changing brightness\n"); ret = -EIO; } } return; out: return ret; } static int set_brightness_status(struct backlight_device *bd) { return set_brightness(bd->props->brightness); } } static int static int proc_read_brn(char *page, char **start, off_t off, int count, int *eof, proc_read_brn(char *page, char **start, off_t off, int count, int *eof, void *data) void *data) { { return sprintf(page, "%d\n", read_brightness()); return sprintf(page, "%d\n", read_brightness(NULL)); } } static int static int Loading Loading @@ -1333,6 +1345,26 @@ static int asus_hotk_remove(struct acpi_device *device, int type) return 0; return 0; } } static struct backlight_properties asus_backlight_data = { .owner = THIS_MODULE, .get_brightness = read_brightness, .update_status = set_brightness_status, .max_brightness = 15, }; static void __exit asus_acpi_exit(void) { if (asus_backlight_device) backlight_device_unregister(asus_backlight_device); acpi_bus_unregister_driver(&asus_hotk_driver); remove_proc_entry(PROC_ASUS, acpi_root_dir); kfree(asus_info); return; } static int __init asus_acpi_init(void) static int __init asus_acpi_init(void) { { int result; int result; Loading Loading @@ -1370,17 +1402,15 @@ static int __init asus_acpi_init(void) return result; return result; } } return 0; asus_backlight_device = backlight_device_register("asus", NULL, &asus_backlight_data); if (IS_ERR(asus_backlight_device)) { printk(KERN_ERR "Could not register asus backlight device\n"); asus_backlight_device = NULL; asus_acpi_exit(); } } static void __exit asus_acpi_exit(void) return 0; { acpi_bus_unregister_driver(&asus_hotk_driver); remove_proc_entry(PROC_ASUS, acpi_root_dir); kfree(asus_info); return; } } module_init(asus_acpi_init); module_init(asus_acpi_init); Loading drivers/acpi/ibm_acpi.c +886 −151 File changed.Preview size limit exceeded, changes collapsed. Show changes drivers/acpi/toshiba_acpi.c +65 −23 Original line number Original line Diff line number Diff line Loading @@ -41,6 +41,8 @@ #include <linux/init.h> #include <linux/init.h> #include <linux/types.h> #include <linux/types.h> #include <linux/proc_fs.h> #include <linux/proc_fs.h> #include <linux/backlight.h> #include <asm/uaccess.h> #include <asm/uaccess.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h> Loading Loading @@ -210,6 +212,7 @@ static acpi_status hci_read1(u32 reg, u32 * out1, u32 * result) } } static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ; static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ; static struct backlight_device *toshiba_backlight_device; static int force_fan; static int force_fan; static int last_key_event; static int last_key_event; static int key_event_valid; static int key_event_valid; Loading Loading @@ -271,14 +274,23 @@ dispatch_write(struct file *file, const char __user * buffer, return result; return result; } } static char *read_lcd(char *p) static int get_lcd(struct backlight_device *bd) { { u32 hci_result; u32 hci_result; u32 value; u32 value; hci_read1(HCI_LCD_BRIGHTNESS, &value, &hci_result); hci_read1(HCI_LCD_BRIGHTNESS, &value, &hci_result); if (hci_result == HCI_SUCCESS) { if (hci_result == HCI_SUCCESS) { value = value >> HCI_LCD_BRIGHTNESS_SHIFT; return (value >> HCI_LCD_BRIGHTNESS_SHIFT); } else return -EFAULT; } static char *read_lcd(char *p) { int value = get_lcd(NULL); if (value >= 0) { p += sprintf(p, "brightness: %d\n", value); p += sprintf(p, "brightness: %d\n", value); p += sprintf(p, "brightness_levels: %d\n", p += sprintf(p, "brightness_levels: %d\n", HCI_LCD_BRIGHTNESS_LEVELS); HCI_LCD_BRIGHTNESS_LEVELS); Loading @@ -289,22 +301,34 @@ static char *read_lcd(char *p) return p; return p; } } static unsigned long write_lcd(const char *buffer, unsigned long count) static int set_lcd(int value) { { int value; u32 hci_result; u32 hci_result; if (sscanf(buffer, " brightness : %i", &value) == 1 && value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS) { value = value << HCI_LCD_BRIGHTNESS_SHIFT; value = value << HCI_LCD_BRIGHTNESS_SHIFT; hci_write1(HCI_LCD_BRIGHTNESS, value, &hci_result); hci_write1(HCI_LCD_BRIGHTNESS, value, &hci_result); if (hci_result != HCI_SUCCESS) if (hci_result != HCI_SUCCESS) return -EFAULT; return -EFAULT; } else { return -EINVAL; return 0; } } return count; static int set_lcd_status(struct backlight_device *bd) { return set_lcd(bd->props->brightness); } static unsigned long write_lcd(const char *buffer, unsigned long count) { int value; int ret = count; if (sscanf(buffer, " brightness : %i", &value) == 1 && value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS) ret = set_lcd(value); else ret = -EINVAL; return ret; } } static char *read_video(char *p) static char *read_video(char *p) Loading Loading @@ -506,6 +530,26 @@ static acpi_status __exit remove_device(void) return AE_OK; return AE_OK; } } static struct backlight_properties toshiba_backlight_data = { .owner = THIS_MODULE, .get_brightness = get_lcd, .update_status = set_lcd_status, .max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1, }; static void __exit toshiba_acpi_exit(void) { if (toshiba_backlight_device) backlight_device_unregister(toshiba_backlight_device); remove_device(); if (toshiba_proc_dir) remove_proc_entry(PROC_TOSHIBA, acpi_root_dir); return; } static int __init toshiba_acpi_init(void) static int __init toshiba_acpi_init(void) { { acpi_status status = AE_OK; acpi_status status = AE_OK; Loading Loading @@ -546,17 +590,15 @@ static int __init toshiba_acpi_init(void) remove_proc_entry(PROC_TOSHIBA, acpi_root_dir); remove_proc_entry(PROC_TOSHIBA, acpi_root_dir); } } return (ACPI_SUCCESS(status)) ? 0 : -ENODEV; toshiba_backlight_device = backlight_device_register("toshiba", NULL, &toshiba_backlight_data); if (IS_ERR(toshiba_backlight_device)) { printk(KERN_ERR "Could not register toshiba backlight device\n"); toshiba_backlight_device = NULL; toshiba_acpi_exit(); } } static void __exit toshiba_acpi_exit(void) return (ACPI_SUCCESS(status)) ? 0 : -ENODEV; { remove_device(); if (toshiba_proc_dir) remove_proc_entry(PROC_TOSHIBA, acpi_root_dir); return; } } module_init(toshiba_acpi_init); module_init(toshiba_acpi_init); Loading Loading
Documentation/ibm-acpi.txt +120 −31 Original line number Original line Diff line number Diff line Loading @@ -398,25 +398,67 @@ Temperature sensors -- /proc/acpi/ibm/thermal Most ThinkPads include six or more separate temperature sensors but Most ThinkPads include six or more separate temperature sensors but only expose the CPU temperature through the standard ACPI methods. only expose the CPU temperature through the standard ACPI methods. This feature shows readings from up to eight different sensors. Some This feature shows readings from up to eight different sensors on older readings may not be valid, e.g. may show large negative values. For ThinkPads, and it has experimental support for up to sixteen different example, on the X40, a typical output may be: sensors on newer ThinkPads. Readings from sensors that are not available return -128. No commands can be written to this file. EXPERIMENTAL: The 16-sensors feature is marked EXPERIMENTAL because the implementation directly accesses hardware registers and may not work as expected. USE WITH CAUTION! To use this feature, you need to supply the experimental=1 parameter when loading the module. When EXPERIMENTAL mode is enabled, reading the first 8 sensors on newer ThinkPads will also use an new experimental thermal sensor access mode. For example, on the X40, a typical output may be: temperatures: 42 42 45 41 36 -128 33 -128 temperatures: 42 42 45 41 36 -128 33 -128 Thomas Gruber took his R51 apart and traced all six active sensors in EXPERIMENTAL: On the T43/p, a typical output may be: his laptop (the location of sensors may vary on other models): temperatures: 48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128 The mapping of thermal sensors to physical locations varies depending on system-board model (and thus, on ThinkPad model). http://thinkwiki.org/wiki/Thermal_Sensors is a public wiki page that tries to track down these locations for various models. Most (newer?) models seem to follow this pattern: 1: CPU 1: CPU 2: Mini PCI Module 2: (depends on model) 3: HDD 3: (depends on model) 4: GPU 4: GPU 5: Battery 5: Main battery: main sensor 6: N/A 6: Bay battery: main sensor 7: Battery 7: Main battery: secondary sensor 8: N/A 8: Bay battery: secondary sensor 9-15: (depends on model) For the R51 (source: Thomas Gruber): 2: Mini-PCI 3: Internal HDD For the T43, T43/p (source: Shmidoax/Thinkwiki.org) http://thinkwiki.org/wiki/Thermal_Sensors#ThinkPad_T43.2C_T43p 2: System board, left side (near PCMCIA slot), reported as HDAPS temp 3: PCMCIA slot 9: MCH (northbridge) to DRAM Bus 10: ICH (southbridge), under Mini-PCI card, under touchpad 11: Power regulator, underside of system board, below F2 key The A31 has a very atypical layout for the thermal sensors (source: Milos Popovic, http://thinkwiki.org/wiki/Thermal_Sensors#ThinkPad_A31) 1: CPU 2: Main Battery: main sensor 3: Power Converter 4: Bay Battery: main sensor 5: MCH (northbridge) 6: PCMCIA/ambient 7: Main Battery: secondary sensor 8: Bay Battery: secondary sensor No commands can be written to this file. EXPERIMENTAL: Embedded controller register dump -- /proc/acpi/ibm/ecdump EXPERIMENTAL: Embedded controller register dump -- /proc/acpi/ibm/ecdump ------------------------------------------------------------------------ ------------------------------------------------------------------------ Loading Loading @@ -529,27 +571,57 @@ directly accesses hardware registers and may not work as expected. USE WITH CAUTION! To use this feature, you need to supply the WITH CAUTION! To use this feature, you need to supply the experimental=1 parameter when loading the module. experimental=1 parameter when loading the module. This feature attempts to show the current fan speed. The speed is read This feature attempts to show the current fan speed, control mode and directly from the hardware registers of the embedded controller. This other fan data that might be available. The speed is read directly is known to work on later R, T and X series ThinkPads but may show a from the hardware registers of the embedded controller. This is known bogus value on other models. to work on later R, T and X series ThinkPads but may show a bogus value on other models. Most ThinkPad fans work in "levels". Level 0 stops the fan. The higher the level, the higher the fan speed, although adjacent levels often map to the same fan speed. 7 is the highest level, where the fan reaches the maximum recommended speed. Level "auto" means the EC changes the fan level according to some internal algorithm, usually based on readings from the thermal sensors. Level "disengaged" means the EC disables the speed-locked closed-loop fan control, and drives the fan as fast as it can go, which might exceed hardware limits, so use this level with caution. The fan usually ramps up or down slowly from one speed to another, and it is normal for the EC to take several seconds to react to fan commands. The fan may be enabled or disabled with the following commands: The fan may be enabled or disabled with the following commands: echo enable >/proc/acpi/ibm/fan echo enable >/proc/acpi/ibm/fan echo disable >/proc/acpi/ibm/fan echo disable >/proc/acpi/ibm/fan Placing a fan on level 0 is the same as disabling it. Enabling a fan will try to place it in a safe level if it is too slow or disabled. WARNING WARNING WARNING: do not leave the fan disabled unless you are WARNING WARNING WARNING: do not leave the fan disabled unless you are monitoring the temperature sensor readings and you are ready to enable monitoring all of the temperature sensor readings and you are ready to it if necessary to avoid overheating. enable it if necessary to avoid overheating. The fan only runs if it's enabled *and* the various temperature An enabled fan in level "auto" may stop spinning if the EC decides the sensors which control it read high enough. On the X40, this seems to ThinkPad is cool enough and doesn't need the extra airflow. This is depend on the CPU and HDD temperatures. Specifically, the fan is normal, and the EC will spin the fan up if the varios thermal readings turned on when either the CPU temperature climbs to 56 degrees or the rise too much. HDD temperature climbs to 46 degrees. The fan is turned off when the CPU temperature drops to 49 degrees and the HDD temperature drops to On the X40, this seems to depend on the CPU and HDD temperatures. 41 degrees. These thresholds cannot currently be controlled. Specifically, the fan is turned on when either the CPU temperature climbs to 56 degrees or the HDD temperature climbs to 46 degrees. The fan is turned off when the CPU temperature drops to 49 degrees and the HDD temperature drops to 41 degrees. These thresholds cannot currently be controlled. The fan level can be controlled with the command: echo 'level <level>' > /proc/acpi/ibm/thermal Where <level> is an integer from 0 to 7, or one of the words "auto" or "disengaged" (without the quotes). Not all ThinkPads support the "auto" and "disengaged" levels. On the X31 and X40 (and ONLY on those models), the fan speed can be On the X31 and X40 (and ONLY on those models), the fan speed can be controlled to a certain degree. Once the fan is running, it can be controlled to a certain degree. Once the fan is running, it can be Loading @@ -562,12 +634,9 @@ about 3700 to about 7350. Values outside this range either do not have any effect or the fan speed eventually settles somewhere in that any effect or the fan speed eventually settles somewhere in that range. The fan cannot be stopped or started with this command. range. The fan cannot be stopped or started with this command. On the 570, temperature readings are not available through this The ThinkPad's ACPI DSDT code will reprogram the fan on its own when feature and the fan control works a little differently. The fan speed certain conditions are met. It will override any fan programming done is reported in levels from 0 (off) to 7 (max) and can be controlled through ibm-acpi. with the following command: echo 'level <level>' > /proc/acpi/ibm/thermal EXPERIMENTAL: WAN -- /proc/acpi/ibm/wan EXPERIMENTAL: WAN -- /proc/acpi/ibm/wan --------------------------------------- --------------------------------------- Loading Loading @@ -601,6 +670,26 @@ example: modprobe ibm_acpi hotkey=enable,0xffff video=auto_disable modprobe ibm_acpi hotkey=enable,0xffff video=auto_disable The ibm-acpi kernel driver can be programmed to revert the fan level to a safe setting if userspace does not issue one of the fan commands: "enable", "disable", "level" or "watchdog" within a configurable ammount of time. To do this, use the "watchdog" command. echo 'watchdog <interval>' > /proc/acpi/ibm/fan Interval is the ammount of time in seconds to wait for one of the above mentioned fan commands before reseting the fan level to a safe one. If set to zero, the watchdog is disabled (default). When the watchdog timer runs out, it does the exact equivalent of the "enable" fan command. Note that the watchdog timer stops after it enables the fan. It will be rearmed again automatically (using the same interval) when one of the above mentioned fan commands is received. The fan watchdog is, therefore, not suitable to protect against fan mode changes made through means other than the "enable", "disable", and "level" fan commands. Example Configuration Example Configuration --------------------- --------------------- Loading
drivers/acpi/Kconfig +14 −0 Original line number Original line Diff line number Diff line Loading @@ -173,6 +173,7 @@ config ACPI_NUMA config ACPI_ASUS config ACPI_ASUS tristate "ASUS/Medion Laptop Extras" tristate "ASUS/Medion Laptop Extras" depends on X86 depends on X86 select BACKLIGHT_CLASS_DEVICE ---help--- ---help--- This driver provides support for extra features of ACPI-compatible This driver provides support for extra features of ACPI-compatible ASUS laptops. As some of Medion laptops are made by ASUS, it may also ASUS laptops. As some of Medion laptops are made by ASUS, it may also Loading Loading @@ -201,6 +202,7 @@ config ACPI_ASUS config ACPI_IBM config ACPI_IBM tristate "IBM ThinkPad Laptop Extras" tristate "IBM ThinkPad Laptop Extras" depends on X86 depends on X86 select BACKLIGHT_CLASS_DEVICE ---help--- ---help--- This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video support for Fn-Fx key combinations, Bluetooth control, video Loading @@ -223,9 +225,21 @@ config ACPI_IBM_DOCK If you are not sure, say N here. If you are not sure, say N here. config ACPI_IBM_BAY bool "Legacy Removable Bay Support" depends on ACPI_IBM depends on ACPI_BAY=n default n ---help--- Allows the ibm_acpi driver to handle removable bays. This support is obsoleted by CONFIG_ACPI_BAY. If you are not sure, say N here. config ACPI_TOSHIBA config ACPI_TOSHIBA tristate "Toshiba Laptop Extras" tristate "Toshiba Laptop Extras" depends on X86 depends on X86 select BACKLIGHT_CLASS_DEVICE ---help--- ---help--- This driver adds support for access to certain system settings This driver adds support for access to certain system settings on "legacy free" Toshiba laptops. These laptops can be recognized by on "legacy free" Toshiba laptops. These laptops can be recognized by Loading
drivers/acpi/asus_acpi.c +46 −16 Original line number Original line Diff line number Diff line Loading @@ -35,6 +35,7 @@ #include <linux/init.h> #include <linux/init.h> #include <linux/types.h> #include <linux/types.h> #include <linux/proc_fs.h> #include <linux/proc_fs.h> #include <linux/backlight.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h> #include <asm/uaccess.h> #include <asm/uaccess.h> Loading Loading @@ -402,6 +403,8 @@ static struct model_data model_conf[END_MODEL] = { /* procdir we use */ /* procdir we use */ static struct proc_dir_entry *asus_proc_dir; static struct proc_dir_entry *asus_proc_dir; static struct backlight_device *asus_backlight_device; /* /* * This header is made available to allow proper configuration given model, * This header is made available to allow proper configuration given model, * revision number , ... this info cannot go in struct asus_hotk because it is * revision number , ... this info cannot go in struct asus_hotk because it is Loading Loading @@ -779,7 +782,7 @@ proc_write_lcd(struct file *file, const char __user * buffer, return rv; return rv; } } static int read_brightness(void) static int read_brightness(struct backlight_device *bd) { { int value; int value; Loading @@ -801,9 +804,10 @@ static int read_brightness(void) /* /* * Change the brightness level * Change the brightness level */ */ static void set_brightness(int value) static int set_brightness(int value) { { acpi_status status = 0; acpi_status status = 0; int ret = 0; /* SPLV laptop */ /* SPLV laptop */ if (hotk->methods->brightness_set) { if (hotk->methods->brightness_set) { Loading @@ -811,11 +815,12 @@ static void set_brightness(int value) value, NULL)) value, NULL)) printk(KERN_WARNING printk(KERN_WARNING "Asus ACPI: Error changing brightness\n"); "Asus ACPI: Error changing brightness\n"); return; ret = -EIO; goto out; } } /* No SPLV method if we are here, act as appropriate */ /* No SPLV method if we are here, act as appropriate */ value -= read_brightness(); value -= read_brightness(NULL); while (value != 0) { while (value != 0) { status = acpi_evaluate_object(NULL, (value > 0) ? status = acpi_evaluate_object(NULL, (value > 0) ? hotk->methods->brightness_up : hotk->methods->brightness_up : Loading @@ -825,15 +830,22 @@ static void set_brightness(int value) if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status)) printk(KERN_WARNING printk(KERN_WARNING "Asus ACPI: Error changing brightness\n"); "Asus ACPI: Error changing brightness\n"); ret = -EIO; } } return; out: return ret; } static int set_brightness_status(struct backlight_device *bd) { return set_brightness(bd->props->brightness); } } static int static int proc_read_brn(char *page, char **start, off_t off, int count, int *eof, proc_read_brn(char *page, char **start, off_t off, int count, int *eof, void *data) void *data) { { return sprintf(page, "%d\n", read_brightness()); return sprintf(page, "%d\n", read_brightness(NULL)); } } static int static int Loading Loading @@ -1333,6 +1345,26 @@ static int asus_hotk_remove(struct acpi_device *device, int type) return 0; return 0; } } static struct backlight_properties asus_backlight_data = { .owner = THIS_MODULE, .get_brightness = read_brightness, .update_status = set_brightness_status, .max_brightness = 15, }; static void __exit asus_acpi_exit(void) { if (asus_backlight_device) backlight_device_unregister(asus_backlight_device); acpi_bus_unregister_driver(&asus_hotk_driver); remove_proc_entry(PROC_ASUS, acpi_root_dir); kfree(asus_info); return; } static int __init asus_acpi_init(void) static int __init asus_acpi_init(void) { { int result; int result; Loading Loading @@ -1370,17 +1402,15 @@ static int __init asus_acpi_init(void) return result; return result; } } return 0; asus_backlight_device = backlight_device_register("asus", NULL, &asus_backlight_data); if (IS_ERR(asus_backlight_device)) { printk(KERN_ERR "Could not register asus backlight device\n"); asus_backlight_device = NULL; asus_acpi_exit(); } } static void __exit asus_acpi_exit(void) return 0; { acpi_bus_unregister_driver(&asus_hotk_driver); remove_proc_entry(PROC_ASUS, acpi_root_dir); kfree(asus_info); return; } } module_init(asus_acpi_init); module_init(asus_acpi_init); Loading
drivers/acpi/ibm_acpi.c +886 −151 File changed.Preview size limit exceeded, changes collapsed. Show changes
drivers/acpi/toshiba_acpi.c +65 −23 Original line number Original line Diff line number Diff line Loading @@ -41,6 +41,8 @@ #include <linux/init.h> #include <linux/init.h> #include <linux/types.h> #include <linux/types.h> #include <linux/proc_fs.h> #include <linux/proc_fs.h> #include <linux/backlight.h> #include <asm/uaccess.h> #include <asm/uaccess.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h> Loading Loading @@ -210,6 +212,7 @@ static acpi_status hci_read1(u32 reg, u32 * out1, u32 * result) } } static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ; static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ; static struct backlight_device *toshiba_backlight_device; static int force_fan; static int force_fan; static int last_key_event; static int last_key_event; static int key_event_valid; static int key_event_valid; Loading Loading @@ -271,14 +274,23 @@ dispatch_write(struct file *file, const char __user * buffer, return result; return result; } } static char *read_lcd(char *p) static int get_lcd(struct backlight_device *bd) { { u32 hci_result; u32 hci_result; u32 value; u32 value; hci_read1(HCI_LCD_BRIGHTNESS, &value, &hci_result); hci_read1(HCI_LCD_BRIGHTNESS, &value, &hci_result); if (hci_result == HCI_SUCCESS) { if (hci_result == HCI_SUCCESS) { value = value >> HCI_LCD_BRIGHTNESS_SHIFT; return (value >> HCI_LCD_BRIGHTNESS_SHIFT); } else return -EFAULT; } static char *read_lcd(char *p) { int value = get_lcd(NULL); if (value >= 0) { p += sprintf(p, "brightness: %d\n", value); p += sprintf(p, "brightness: %d\n", value); p += sprintf(p, "brightness_levels: %d\n", p += sprintf(p, "brightness_levels: %d\n", HCI_LCD_BRIGHTNESS_LEVELS); HCI_LCD_BRIGHTNESS_LEVELS); Loading @@ -289,22 +301,34 @@ static char *read_lcd(char *p) return p; return p; } } static unsigned long write_lcd(const char *buffer, unsigned long count) static int set_lcd(int value) { { int value; u32 hci_result; u32 hci_result; if (sscanf(buffer, " brightness : %i", &value) == 1 && value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS) { value = value << HCI_LCD_BRIGHTNESS_SHIFT; value = value << HCI_LCD_BRIGHTNESS_SHIFT; hci_write1(HCI_LCD_BRIGHTNESS, value, &hci_result); hci_write1(HCI_LCD_BRIGHTNESS, value, &hci_result); if (hci_result != HCI_SUCCESS) if (hci_result != HCI_SUCCESS) return -EFAULT; return -EFAULT; } else { return -EINVAL; return 0; } } return count; static int set_lcd_status(struct backlight_device *bd) { return set_lcd(bd->props->brightness); } static unsigned long write_lcd(const char *buffer, unsigned long count) { int value; int ret = count; if (sscanf(buffer, " brightness : %i", &value) == 1 && value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS) ret = set_lcd(value); else ret = -EINVAL; return ret; } } static char *read_video(char *p) static char *read_video(char *p) Loading Loading @@ -506,6 +530,26 @@ static acpi_status __exit remove_device(void) return AE_OK; return AE_OK; } } static struct backlight_properties toshiba_backlight_data = { .owner = THIS_MODULE, .get_brightness = get_lcd, .update_status = set_lcd_status, .max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1, }; static void __exit toshiba_acpi_exit(void) { if (toshiba_backlight_device) backlight_device_unregister(toshiba_backlight_device); remove_device(); if (toshiba_proc_dir) remove_proc_entry(PROC_TOSHIBA, acpi_root_dir); return; } static int __init toshiba_acpi_init(void) static int __init toshiba_acpi_init(void) { { acpi_status status = AE_OK; acpi_status status = AE_OK; Loading Loading @@ -546,17 +590,15 @@ static int __init toshiba_acpi_init(void) remove_proc_entry(PROC_TOSHIBA, acpi_root_dir); remove_proc_entry(PROC_TOSHIBA, acpi_root_dir); } } return (ACPI_SUCCESS(status)) ? 0 : -ENODEV; toshiba_backlight_device = backlight_device_register("toshiba", NULL, &toshiba_backlight_data); if (IS_ERR(toshiba_backlight_device)) { printk(KERN_ERR "Could not register toshiba backlight device\n"); toshiba_backlight_device = NULL; toshiba_acpi_exit(); } } static void __exit toshiba_acpi_exit(void) return (ACPI_SUCCESS(status)) ? 0 : -ENODEV; { remove_device(); if (toshiba_proc_dir) remove_proc_entry(PROC_TOSHIBA, acpi_root_dir); return; } } module_init(toshiba_acpi_init); module_init(toshiba_acpi_init); Loading
