From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048683; b=MIcbanheUFJoi8VUXFzg3UBLzSqOs+3A0nwuhhHz6Ry4WnxlRhU62hncVJiJ4Dn5ZbAe kLKqonJO4H6mfWLXWW4zHa8WbPyCmtkOyTkBvXexptsGJbomZ/UHVIvcLzTE8GVW14ZbW FszU4HpCpGG94mQT3Pc4/6lAC1NzzdNOcy8TOKEH182J5T717N9IaVkM4bgcjrERRCTY0 JH/CYIXxuGJYU454jt+D5X35AG6dWOkw2dHlUkqLyUVOeyRHrxur5sIjYliSgI+STVINZ L7y2J+wiWtO4/J7R2jJstCaanmPmqrOPmeR0iPRH9163YZUeH855VnObMLtWl4Zd3mw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048683; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=Td3OqBe1NFhyDFJVCVStksDc54lak+/tCcaVjgvltQs=; b=14V3prA3e65rU4nbog02peaq6gskjHG897uoEL4I0Uf6FLBXLoseFA/+ZrfKAAvvgsnV bvysuYWXt8EKCzqlcadEHJqZlVxg4ajde5Jbv8hy3tjYKL4ywqA2J+6hRxqQTIgSeHysH MOOGWNs7UB4UsX1vGbNMLqhHPS8nYOw0f71jOJHyMtF0UAYg6bzR7vh9pK8RubTRfvs/s hOLKXPWsdwHYECSv0WTGFaAnBeSfNj00RUgJrzBKxJB74GGV1rOBpyIrCWxKArhmq19Tw luHA8NPYsE29GU6o2Oz7eAQ2NKlqeN0mE0dIiNciTT6K9R0DA4sKf4LgyhqtObZ5OJQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=dsYqpJqp; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBA1F606EE8A for ; Sat, 7 Nov 2026 10:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=dsYqpJqp Received: by smtp.kernel.org (Postfix) with ESMTPSA id 065AB1F0089F; Sat, 7 Nov 2026 10:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048682; bh=Td3OqBe1NFhyDFJVCVStksDc54lak+/tCcaVjgvltQs=; h=From:To:Cc:Subject:Date; b=dsYqpJqpX+/gqGY6dYmDgmhixbhfLEuWXjPlgm5m2p09a97WrHZq9j2e8dfjzpTWR Biq1l0dR/woYZDjXESqhed8bj9MsPt9mRRxiabdOY7KVnhn8ttGafhafJ+REoPT4Wt kx7BEyyOFoASJ1HBb0kiQLwWRaiaGspR7SQQuIINjIOU3TEBc2X66u+Ete4pRF9eLV G3Uj8pVW+NeQM7F1u/hOSY6voinhbNGaFFjOPUs8iMTLI40HdLWJanmQXsG5b2SMwW ifaBKPkSUKJ+neej66/iOpLwwmgokCWwVuH8RF5HP+G/KbnhyCp9ZwReoQhFSGoPlQ M8kgErgReVCfg== From: Sasha Levin To: w_armin@gmx.de, github@firefishy.com, linux@roeck-us.net Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] hwmon: (acpi_power_meter) Fix 18.45 TW bug" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:51:20 -0500 Message-ID: <20261107055120-failed-6.1-0b6eda22f9ab@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 0b6eda22f9ab67ddb2a872b0c3fc578ad9f4e27e # git commit -s git send-email --to '' --in-reply-to '20261107055120-failed-6.1-0b6eda22f9ab@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 0b6eda22f9ab67ddb2a872b0c3fc578ad9f4e27e Mon Sep 17 00:00:00 2001 From: Armin Wolf Date: Wed, 7 Oct 2026 01:45:34 +0200 Subject: [PATCH] hwmon: (acpi_power_meter) Fix 18.45 TW bug The ACPI specification says: "If an error occurs while obtaining the meter reading or if the value is not available then an Integer with all bits set is returned" This integer can also be 64-bit wide on ACPI 2.0 and later systems, so we have to check for that too. Compile-tested only. Reported-by: Grant Slater Closes: https://github.com/lm-sensors/lm-sensors/issues/460 Fixes: 1fefca6c57fb ("hwmon: (acpi_power_meter) Fix 4.29 MW bug") Cc: stable@vger.kernel.org Signed-off-by: Armin Wolf Link: https://patch.msgid.link/20261006234618.10943-1-W_Armin@gmx.de Signed-off-by: Guenter Roeck --- drivers/hwmon/acpi_power_meter.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index d8e8715094055..3891962f03db1 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -30,7 +31,12 @@ #define POWER_METER_CAN_NOTIFY (1 << 3) #define POWER_METER_IS_BATTERY (1 << 8) #define UNKNOWN_HYSTERESIS 0xFFFFFFFF -#define UNKNOWN_POWER 0xFFFFFFFF +/* + * ACPI integers can either be 32-bit or 64-bit wide, so + * we have to check for both values. + */ +#define UNKNOWN_POWER_32 U32_MAX +#define UNKNOWN_POWER_64 U64_MAX #define METER_NOTIFY_CONFIG 0x80 #define METER_NOTIFY_TRIP 0x81 @@ -452,7 +458,7 @@ static int power_meter_read(struct device *dev, enum hwmon_sensor_types type, ret = update_meter(res); if (ret) return ret; - if (res->power == UNKNOWN_POWER) + if (res->power == UNKNOWN_POWER_32 || res->power == UNKNOWN_POWER_64) return -ENODATA; *val = res->power * 1000; break; -- 2.53.0