[FIX PATCH V2] ACPI/AC: Add sleep quirk for Thinkpad e530

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thinkpad e530 bios notify ac device first and then sleep
a specific time before doing actual operations in the
EC event handler(_Qxx). This will cause AC driver report
wrong AC state by ACPI proc event.

Method (_Q27, 0, NotSerialized)
{
      Notify (AC, 0x80)
      Sleep (0x03E8)
      Store (Zero, PWRS)
      PNOT ()
}

This patch is to add a specific delay in the ac driver's
notify handler before acpi_ac_get_state() in order to
get right AC state. The delay is set via 
ac_sleep_before_get_state_ms. For thinkpad e530, 1s delay
is enough.

https://bugzilla.kernel.org/show_bug.cgi?id=45221

Signed-off-by: Lan Tianyu <tianyu.lan@xxxxxxxxx>
---
Change since v1:
	Replace ac_flag_sleep_for_get_state with
ac_sleep_before_get_state_ms to indicate the delay.
Set ac_sleep_before_get_state_ms to 1000 in the
thinkpad_e530_quirk().

 drivers/acpi/ac.c |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 6d5bf64..9075feb 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -28,6 +28,8 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/dmi.h>
+#include <linux/delay.h>
 #ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -74,6 +76,8 @@ static int acpi_ac_resume(struct device *dev);
 #endif
 static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);
 
+static int ac_sleep_before_get_state_ms;
+
 static struct acpi_driver acpi_ac_driver = {
 	.name = "ac",
 	.class = ACPI_AC_CLASS,
@@ -252,6 +256,15 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
 	case ACPI_AC_NOTIFY_STATUS:
 	case ACPI_NOTIFY_BUS_CHECK:
 	case ACPI_NOTIFY_DEVICE_CHECK:
+		/* Some buggy bios notify ac device first and then sleep
+		 * a specific time before doing actual operations in the
+		 * EC event handler(_Qxx). This will cause the AC state
+		 * reported by ACPI event wrong. So add a specific sleep here
+		 * to ensure get correct state.
+		 */
+		if (ac_sleep_before_get_state_ms > 0)
+			msleep(ac_sleep_before_get_state_ms);
+
 		acpi_ac_get_state(ac);
 		acpi_bus_generate_proc_event(device, event, (u32) ac->state);
 		acpi_bus_generate_netlink_event(device->pnp.device_class,
@@ -264,6 +277,24 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
 	return;
 }
 
+static int thinkpad_e530_quirk(const struct dmi_system_id *d)
+{
+	ac_sleep_before_get_state_ms = 1000;
+	return 0;
+}
+
+static struct dmi_system_id __initdata ac_dmi_table[] = {
+	{
+	.callback = thinkpad_e530_quirk,
+	.ident = "thinkpad e530",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		DMI_MATCH(DMI_PRODUCT_NAME, "32597CG"),
+		},
+	},
+	{},
+};
+
 static int acpi_ac_add(struct acpi_device *device)
 {
 	int result = 0;
@@ -312,6 +343,7 @@ static int acpi_ac_add(struct acpi_device *device)
 		kfree(ac);
 	}
 
+	dmi_check_system(ac_dmi_table);
 	return result;
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux IBM ACPI]     [Linux Power Management]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux