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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DEB0C433F5 for ; Wed, 24 Nov 2021 12:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244314AbhKXNBz (ORCPT ); Wed, 24 Nov 2021 08:01:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:40406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344690AbhKXM7t (ORCPT ); Wed, 24 Nov 2021 07:59:49 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 02E7F61078; Wed, 24 Nov 2021 12:34:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637757252; bh=NEX9F5tlQR/ZiiWHVqR4NwwF82136ZtSd4RehFPZPQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ffDEu187PDe9cyWbQvl7vDti4pDkyPS94HiTl5Yjpkb+fdizl46yBwWf+J7bFRPJZ tUqvpWQy7ljOTYWxcV3fHFmKvBGRuHTAMY3LR2i7y2J0Vvw5FHlRKO2GASTaYZhXuR MiXEbFTYPrUfuISdQRiy+7FC8E1A3DsTU/5Wl/eg= 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 4.19 107/323] ACPI: battery: Accept charges over the design capacity as full Date: Wed, 24 Nov 2021 12:54:57 +0100 Message-Id: <20211124115722.577442193@linuxfoundation.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211124115718.822024889@linuxfoundation.org> References: <20211124115718.822024889@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 674a0e92b798f..0bbf8b453ebf2 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -198,7 +198,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