From patchwork Sat Sep 17 22:56:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Lambley X-Patchwork-Id: 9337413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6ACE76077F for ; Sat, 17 Sep 2016 22:57:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EA4628EE8 for ; Sat, 17 Sep 2016 22:57:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EEF228EEB; Sat, 17 Sep 2016 22:57:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B08DA28EE8 for ; Sat, 17 Sep 2016 22:57:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754746AbcIQW5A (ORCPT ); Sat, 17 Sep 2016 18:57:00 -0400 Received: from smtp.the-lambleys.org.uk ([212.47.234.164]:39696 "EHLO smtp.the-lambleys.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754719AbcIQW47 (ORCPT ); Sat, 17 Sep 2016 18:56:59 -0400 Received: from localhost.localdomain (host-89-241-117-198.as13285.net [89.241.117.198]) by smtp.the-lambleys.org.uk (Postfix) with ESMTPSA id 9B604260C6D; Sat, 17 Sep 2016 22:56:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=davel.me.uk; s=mail; t=1474153015; bh=TNnHJ5JK9hJUK5qZE9Evk6tDWdBm2cS4xTZvdnd1djs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j9lJoJee/Ek/jxWeCGzl4GyzkeUpwGaGS839BTNVCD4xr/Lca3WrxOu2CP5PtSPDz zlWiQLmGbZhtGHJYlYO8F/t5kQXZmLPKzx1U8IU/qEXD5XkHGuCKaAgpLA6bnyn9Ul 4cyT2olFMaYloQap4/9M08j74ULz9IxTUTJykcLY= From: Dave Lambley To: linux-acpi@vger.kernel.org Cc: Dave Lambley , "Rafael J. Wysocki" , Len Brown Subject: [PATCH] If _BIX fails, retry with _BIF. Date: Sat, 17 Sep 2016 23:56:42 +0100 Message-Id: <1474153002-13904-1-git-send-email-linux@davel.me.uk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1AE640813FDE7649BE1B193DEA596E886A184E5E@SHSMSX101.ccr.corp.intel.com> References: <1AE640813FDE7649BE1B193DEA596E886A184E5E@SHSMSX101.ccr.corp.intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Lenovo Yoga 300 laptop's firmware advertises that it provides the _BIX method. Unfortunately (some versions of?) the implementation return badly-formed data. [ 21.712228] ACPI Exception: AE_AML_PACKAGE_LIMIT, Index (0x000000010) is beyond end of object (length 0xD) (20160422/exoparg2-427) [ 21.712244] ACPI Error: Method parse/execution failed [\_SB.PCI0.LPCB.H_EC.BAT1._BIX] (Node ffff95f8ff0b20f0), AE_AML_PACKAGE_LIMIT (2016042 2/psparse-542) The _BIF method does succeed. Signed-off-by: Dave Lambley Cc: "Rafael J. Wysocki" CC: Len Brown Signed-off-by: Dave Lambley --- drivers/acpi/battery.c | 68 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index ab23479..71ae7e7 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -430,39 +430,24 @@ static int acpi_battery_get_status(struct acpi_battery *battery) return 0; } -static int acpi_battery_get_info(struct acpi_battery *battery) + +int extract_battery_info(const int use_bix, + struct acpi_battery *battery, + const struct acpi_buffer *buffer) { int result = -EFAULT; - acpi_status status = 0; - char *name = test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags) ? - "_BIX" : "_BIF"; - - struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - if (!acpi_battery_present(battery)) - return 0; - mutex_lock(&battery->lock); - status = acpi_evaluate_object(battery->device->handle, name, - NULL, &buffer); - mutex_unlock(&battery->lock); - - if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s", name)); - return -ENODEV; - } - - if (battery_bix_broken_package) - result = extract_package(battery, buffer.pointer, + if (use_bix && battery_bix_broken_package) + result = extract_package(battery, buffer->pointer, extended_info_offsets + 1, ARRAY_SIZE(extended_info_offsets) - 1); - else if (test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags)) - result = extract_package(battery, buffer.pointer, + else if (use_bix) + result = extract_package(battery, buffer->pointer, extended_info_offsets, ARRAY_SIZE(extended_info_offsets)); else - result = extract_package(battery, buffer.pointer, + result = extract_package(battery, buffer->pointer, info_offsets, ARRAY_SIZE(info_offsets)); - kfree(buffer.pointer); if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)) battery->full_charge_capacity = battery->design_capacity; if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) && @@ -483,6 +468,41 @@ static int acpi_battery_get_info(struct acpi_battery *battery) return result; } +static int acpi_battery_get_info(struct acpi_battery *battery) +{ + acpi_status status = 0; + const int xinfo = test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags); + int use_bix; + + if (!acpi_battery_present(battery)) + return 0; + + + for (use_bix = xinfo ? 1 : 0; use_bix >= 0; use_bix--) { + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; + + mutex_lock(&battery->lock); + status = acpi_evaluate_object(battery->device->handle, + use_bix ? "_BIX":"_BIF", + NULL, &buffer); + mutex_unlock(&battery->lock); + + if (ACPI_FAILURE(status)) { + ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s", + use_bix ? "_BIX":"_BIF")); + } else { + const int result = extract_battery_info(use_bix, + battery, + &buffer); + + kfree(buffer.pointer); + return result; + } + } + + return -ENODEV; +} + static int acpi_battery_get_state(struct acpi_battery *battery) { int result = 0;