From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B3992E54BB; Tue, 15 Jul 2025 13:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752586232; cv=none; b=sy5ILQlIwNRluCmKGmY+Q+mAW+FmUlFQBJ/QRqIy2v3tPGwjpv4K4SsuBAkggYdWcu6OuAOcS8ug/ahrJxbeNZL1yLyfzWrj6T4XlUQhFWSR3nPSMaJ66Wa3huD0Is56FwV/lVfyRRlQTHOurZOvTqElreACT0oUK95CXFLiVE8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752586232; c=relaxed/simple; bh=JbC3kwtG/Lw9pQyDjUC5IprlUeBW5JuOJo8pGOQArRM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nK+ENeLIA5b6xTF+5nFyMaa3wBvmayaPwEYpjWWIxe8AghfXJuJkJ29YoQKc7D/3OppZXVFDqPwHWCT6Drgmhouf1Bd7RdoLxlnzJC5phnuJcK1SfTuOwXvKVg6l4VHMi4KOvst+DtOZ0uls6BG0FURQzQdqzLyJduM64xrLX3w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=g2jWbHLz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="g2jWbHLz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9139DC4CEE3; Tue, 15 Jul 2025 13:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752586231; bh=JbC3kwtG/Lw9pQyDjUC5IprlUeBW5JuOJo8pGOQArRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g2jWbHLzzU8pbUnFdSB+Me+juY4rIb4vBExVlEtgVTeBMnN0n/+JpupVzBZFoBU7w mW68dLeyqqx6TqfFDGSS0Td/5tIlegi4Rz51TlhAu0Q9iWdcD8yV6fmpTdqF0Dk9Hd EPTT/m2vhoFO4lXBI0BCic92cAxWy+0uI8TU1w98= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Matthew Schwartz , "Rafael J. Wysocki" Subject: [PATCH 5.15 34/77] Revert "ACPI: battery: negate current when discharging" Date: Tue, 15 Jul 2025 15:13:33 +0200 Message-ID: <20250715130753.078005817@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130751.668489382@linuxfoundation.org> References: <20250715130751.668489382@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki commit de1675de39aa945bad5937d1fde4df3682670639 upstream. Revert commit 234f71555019 ("ACPI: battery: negate current when discharging") breaks not one but several userspace implementations of battery monitoring: Steam and MangoHud. Perhaps it breaks more, but those are the two that have been tested. Reported-by: Matthew Schwartz Closes: https://lore.kernel.org/linux-acpi/87C1B2AF-D430-4568-B620-14B941A8ABA4@linux.dev/ Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/battery.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -250,23 +250,10 @@ static int acpi_battery_get_property(str break; case POWER_SUPPLY_PROP_CURRENT_NOW: case POWER_SUPPLY_PROP_POWER_NOW: - if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN) { + if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN) ret = -ENODEV; - break; - } - - val->intval = battery->rate_now * 1000; - /* - * When discharging, the current should be reported as a - * negative number as per the power supply class interface - * definition. - */ - if (psp == POWER_SUPPLY_PROP_CURRENT_NOW && - (battery->state & ACPI_BATTERY_STATE_DISCHARGING) && - acpi_battery_handle_discharging(battery) - == POWER_SUPPLY_STATUS_DISCHARGING) - val->intval = -val->intval; - + else + val->intval = battery->rate_now * 1000; break; case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: