public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ACPI/Battery: Retry to get Battery information if failed during probing
@ 2014-06-12  6:02 Lan Tianyu
  2014-06-12  6:55 ` David Rientjes
  0 siblings, 1 reply; 13+ messages in thread
From: Lan Tianyu @ 2014-06-12  6:02 UTC (permalink / raw)
  To: rjw, lenb, naszar; +Cc: Lan Tianyu, linux-acpi, linux-kernel, stable

Some machines'(E,G Lenovo Z480) ECs are not stable during boot up
and causes battery driver fails to be probed due to failure of getting
battery information from EC sometimes. After several retries, the
operation will work. This patch is to retry to get battery information 5
times if the first try fails.

Reported-and-tested-by: naszar <naszar@ya.ru>
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=75581
Cc: stable@vger.kernel.org
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
---
 drivers/acpi/battery.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index e48fc98..485009d 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -34,6 +34,7 @@
 #include <linux/dmi.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
+#include <linux/delay.h>
 #include <asm/unaligned.h>
 
 #ifdef CONFIG_ACPI_PROCFS_POWER
@@ -1119,7 +1120,7 @@ static struct dmi_system_id bat_dmi_table[] = {
 
 static int acpi_battery_add(struct acpi_device *device)
 {
-	int result = 0;
+	int result = 0, retry = 5;
 	struct acpi_battery *battery = NULL;
 
 	if (!device)
@@ -1135,7 +1136,16 @@ static int acpi_battery_add(struct acpi_device *device)
 	mutex_init(&battery->sysfs_lock);
 	if (acpi_has_method(battery->device->handle, "_BIX"))
 		set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
+
+retry_get_info:
 	result = acpi_battery_update(battery, false);
+
+	if (result && retry) {
+		msleep(20);
+		retry--;
+		goto retry_get_info;
+	}
+
 	if (result)
 		goto fail;
 #ifdef CONFIG_ACPI_PROCFS_POWER
-- 
1.8.4.rc0.1.g8f6a3e5.dirty


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2014-06-17  1:28 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-12  6:02 [PATCH] ACPI/Battery: Retry to get Battery information if failed during probing Lan Tianyu
2014-06-12  6:55 ` David Rientjes
2014-06-12  7:19   ` Lan Tianyu
2014-06-12  7:26     ` David Rientjes
2014-06-12  8:14       ` Lan Tianyu
2014-06-12 21:17         ` David Rientjes
2014-06-13  2:25           ` Lan Tianyu
2014-06-13 21:46             ` David Rientjes
2014-06-16  2:12               ` Lan Tianyu
2014-06-16  2:35                 ` Zheng, Lv
2014-06-16  2:43                   ` Lan Tianyu
2014-06-17  1:27                 ` David Rientjes
2014-06-17  1:27                   ` Lan Tianyu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox