Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE6BEC3526C for ; Mon, 15 Nov 2021 19:40:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2CB961AA7 for ; Mon, 15 Nov 2021 19:40:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346905AbhKOThP (ORCPT ); Mon, 15 Nov 2021 14:37:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:40036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239235AbhKOR4B (ORCPT ); Mon, 15 Nov 2021 12:56:01 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5BEF463329; Mon, 15 Nov 2021 17:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636997623; bh=r5aRhNSwkqy0DGgrFIo4D4wyRlFHC3vlayN/tYCI0S0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IKp5v78tq3GdMBLBFePdr199M1t3/fn1wr3lEzW0aqntu+vjasrCaV7lHIjp/NjKk fNZizLkGwcg1AeDPC40hQRyFApj7QAbt1/tvPUfAWYyvlgwsuHxEawnso9YpkTk3+H FZzKxVXjvv4xpWfRB3URRlVcUwvdlduyQrYSB02Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Andr=C3=A9=20Almeida?= , Hans de Goede , Sebastian Reichel , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.10 214/575] ACPI: battery: Accept charges over the design capacity as full Date: Mon, 15 Nov 2021 17:58:59 +0100 Message-Id: <20211115165351.119170886@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165343.579890274@linuxfoundation.org> References: <20211115165343.579890274@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: André Almeida [ Upstream commit 2835f327bd1240508db2c89fe94a056faa53c49a ] Some buggy firmware and/or brand new batteries can support a charge that's slightly over the reported design capacity. In such cases, the kernel will report to userspace that the charging state of the battery is "Unknown", when in reality the battery charge is "Full", at least from the design capacity point of view. Make the fallback condition accepts capacities over the designed capacity so userspace knows that is full. Signed-off-by: André Almeida Reviewed-by: Hans de Goede Reviewed-by: Sebastian Reichel Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/battery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 08ee1c7b12e00..e04352c1dc2ce 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -174,7 +174,7 @@ static int acpi_battery_is_charged(struct acpi_battery *battery) return 1; /* fallback to using design values for broken batteries */ - if (battery->design_capacity == battery->capacity_now) + if (battery->design_capacity <= battery->capacity_now) return 1; /* we don't do any sort of metric based on percentages */ -- 2.33.0