diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2008-10-18 14:23:52 -0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 18:13:10 -0400 |
| commit | 75700e53cd14ccc7a5a42547497dff11fe209186 (patch) | |
| tree | 33f4793b259d53147fe8c1064fd5470561ce6277 | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| download | kernel-crypto-75700e53cd14ccc7a5a42547497dff11fe209186.tar.gz kernel-crypto-75700e53cd14ccc7a5a42547497dff11fe209186.tar.xz kernel-crypto-75700e53cd14ccc7a5a42547497dff11fe209186.zip | |
ACPI: thinkpad-acpi: attempt to preserve fan state on resume
Attempt to preserve fan state across sleep and hibernation if the fan
control mode is enabled.
For safety reasons, only the PWM OFF (fan at 100%) or maximum
closed-loop level (level 7) are preserved. If the fan state was set
to anything else, it will not be restored.
Also, should the fan be at PWM OFF mode at resume, it will be left at
that state (but this is extremely unlikely, no ThinkPad firmware was
ever reported to do this).
For reference, the known states used for fan control upon resume by
the firmware are either "auto" or "level 7" depending on whether the
laptop wakes due to normal conditions or a thermal emergency.
Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=11331
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Richard Hartmann <richih.mailinglist@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 6b9300779a4..1dcf0660d8b 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c @@ -5983,6 +5983,52 @@ static void fan_exit(void) flush_workqueue(tpacpi_wq); } +static void fan_suspend(pm_message_t state) +{ + if (!fan_control_allowed) + return; + + /* Store fan status in cache */ + fan_get_status_safe(NULL); + if (tp_features.fan_ctrl_status_undef) + fan_control_desired_level = TP_EC_FAN_AUTO; +} + +static void fan_resume(void) +{ + u8 saved_fan_level; + u8 current_level = 7; + bool do_set = false; + + /* DSDT *always* updates status on resume */ + tp_features.fan_ctrl_status_undef = 0; + + saved_fan_level = fan_control_desired_level; + if (!fan_control_allowed || + (fan_get_status_safe(¤t_level) < 0)) + return; + + switch (fan_control_access_mode) { + case TPACPI_FAN_WR_ACPI_SFAN: + do_set = (saved_fan_level > current_level); + break; + case TPACPI_FAN_WR_ACPI_FANS: + case TPACPI_FAN_WR_TPEC: + do_set = ((saved_fan_level & TP_EC_FAN_FULLSPEED) || + (saved_fan_level == 7 && + !(current_level & TP_EC_FAN_FULLSPEED))); + break; + default: + return; + } + if (do_set) { + printk(TPACPI_NOTICE + "restoring fan level to 0x%02x\n", + saved_fan_level); + fan_set_level_safe(saved_fan_level); + } +} + static int fan_read(char *p) { int len = 0; @@ -6174,6 +6220,8 @@ static struct ibm_struct fan_driver_data = { .read = fan_read, .write = fan_write, .exit = fan_exit, + .suspend = fan_suspend, + .resume = fan_resume, }; /**************************************************************************** |