From patchwork Tue Jun 17 07:09:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 4364411 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 54FDFBEEAA for ; Tue, 17 Jun 2014 07:11:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89DCF202BE for ; Tue, 17 Jun 2014 07:10:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0F21202AE for ; Tue, 17 Jun 2014 07:10:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754165AbaFQHK5 (ORCPT ); Tue, 17 Jun 2014 03:10:57 -0400 Received: from mga03.intel.com ([143.182.124.21]:7035 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754078AbaFQHK4 (ORCPT ); Tue, 17 Jun 2014 03:10:56 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 17 Jun 2014 00:10:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,492,1400050800"; d="scan'208";a="446376890" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.37.18]) by azsmga001.ch.intel.com with ESMTP; 17 Jun 2014 00:10:53 -0700 From: Lan Tianyu To: rjw@rjwysocki.net, lenb@kernel.org, naszar@ya.ru, rientjes@google.com Cc: Lan Tianyu , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Subject: [PATCH V2] ACPI/Battery: Retry to get Battery information if failed during probing Date: Tue, 17 Jun 2014 15:09:54 +0800 Message-Id: <1402988994-27067-1-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some machines'(E,G 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. Reported-and-tested-by: naszar Reference: https://bugzilla.kernel.org/show_bug.cgi?id=75581 Cc: Signed-off-by: Lan Tianyu --- Change since V2: Change code style and add comment. drivers/acpi/battery.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index e48fc98..8ed93a3 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #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,9 +1136,20 @@ 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); + + /* + * 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. + */ + while ((result = acpi_battery_update(battery, false)) && retry--) + msleep(20); if (result) goto fail; + #ifdef CONFIG_ACPI_PROCFS_POWER result = acpi_battery_add_fs(device); #endif