Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75646e75 authored by Lan Tianyu's avatar Lan Tianyu Committed by Rafael J. Wysocki
Browse files

ACPI / battery: Retry to get battery information if failed during probing 

Some machines (eg. Lenovo Z480) ECs are not stable during boot up
and causes battery driver fails to be loaded 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.

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


Reported-and-tested-by: default avatarnaszar <naszar@ya.ru>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: default avatarLan Tianyu <tianyu.lan@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent cd3de83f

drivers/acpi/battery.c

+26 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/suspend.h>

#include <linux/delay.h>

#include <asm/unaligned.h>



#ifdef CONFIG_ACPI_PROCFS_POWER
@@ -1151,6 +1152,28 @@ static struct dmi_system_id bat_dmi_table[] = { 
	{},

};



/*

 * Some machines'(E,G Lenovo Z480) ECs are not stable

 * during boot up and this causes battery driver fails to be

 * probed due to failure of getting battery information

 * from EC sometimes. After several retries, the operation

 * may work. So add retry code here and 20ms sleep between

 * every retries.

 */

static int acpi_battery_update_retry(struct acpi_battery *battery)

{

	int retry, ret;



	for (retry = 5; retry; retry--) {

		ret = acpi_battery_update(battery, false);

		if (!ret)

			break;



		msleep(20);

	}

	return ret;

}



static int acpi_battery_add(struct acpi_device *device)

{

	int result = 0;
@@ -1169,9 +1192,11 @@ 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);

	result = acpi_battery_update(battery, false);



	result = acpi_battery_update_retry(battery);

	if (result)

		goto fail;



#ifdef CONFIG_ACPI_PROCFS_POWER

	result = acpi_battery_add_fs(device);

#endif