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=1794047809; b=1cv17BfU5/aginL2E44Zz/6AlrUSDD+6XvmPXev6FR0OM2xUk3/UzOBdiEPkGZDfv2JH gyRltOfKMaUIwgaebUzjHCyn95L5shILaX4BrM5+qXWl+V2Lk03tXIryrY3dn/6IcoIoj PqIEtudNd24AYqspyqRZbvc+p/Nmj3p3Gt+EaGx94kq8H/z1W2GvDZG4LyTkk0oX3V3Bp RF8vtTIa1wxcVX0QO9kjsKr0mUnHmoXat87BhovPk09cTh7kmBH3NCM0XM0coGFTnq4z3 lHOfvELkLM8q8R/g71UXoMSB/HjdFeFMOE9jfC6fdPEmTjw3eJkjTo1LOxUPB/m/nEg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794047809; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=nvFya33XQ35amLkVL/oY8zLBypPDRxTtPWmI4x0X77I=; b=ZjEropFrFJ5Wbd+/u3vVKMF7U7o1P+/4qnNINj/c7fxrsaw1ampPxW5MniucwnrFEJ6L dlshDji9r/TZElhzT2LMh9E1LeoFdF2z64/D8P6ks/Zr++e0xm7HdifHG0Y8U2hc3pPFd h09b5mIeBEYrj6n8Q/wYsBXwHNLZdMz+SvDMYWF9Cos496kl2pmRp72sT3SC04Kdq50RP 1kFmkUfknFVgOaI0x8GqM+lj0z1G8Xgr1r41kdRpIPIW1tySdR93u6E4u0SNKi1E9bX6H pkjvLi3a4iBz995Idujg0k78tqephRAA8Gjq3XxB3XKgzkkHQW6KKht11HOsdlcPAgg== 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=HNLMZQUE; 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 AF5ED606A326 for ; Sat, 7 Nov 2026 10:36:48 +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=HNLMZQUE Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAA5D1F0089F; Sat, 7 Nov 2026 10:36:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794047808; bh=nvFya33XQ35amLkVL/oY8zLBypPDRxTtPWmI4x0X77I=; h=From:To:Cc:Subject:Date; b=HNLMZQUEYeO+N0gm2PAWT/DsVno9pZ5alQd29Ig138CDAmgY+Yj/6s3v2KfBumv7h ap7z3d6jZyxhfM/EI3Q5eksg0v4sWL8fEW/dha/9aFuYFfbRgiZn9rkKcHtZGIfslj t1GkAxGgYDP8Qf3xmqh2xM4xSGAcicoWeKZuXXnUkUV661XgUpmgO2ycBbOCq2exjK U/uU3566BBWZvwzUqSDSy/VaRFt8k9US9JWwCb17gHK4g+DD+KMYfWo7yOKB0jZ4of 3gSC2pruX5GolSXyKjFy8Ni1oy7jQKMHcrkU6NrBMzl1ASuz6AHGXDPCW8XoV6RTkV CPsT7Gm7BSTUA== 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.6-stable tree Date: Sat, 7 Nov 2026 05:36:46 -0500 Message-ID: <20261107053646-failed-6.6-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.6-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.6.y git checkout FETCH_HEAD git cherry-pick -x 0b6eda22f9ab67ddb2a872b0c3fc578ad9f4e27e # git commit -s git send-email --to '' --in-reply-to '20261107053646-failed-6.6-0b6eda22f9ab@kernel.org' --subject-prefix 'PATCH 6.6.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