From nobody Sat Feb 7 07:10:31 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 C5C401F3BA2; Sat, 18 Oct 2025 14:22:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760797329; cv=none; b=UJKPDvUfuyzmutVChSKA/1zGeMPHokTB3aPie2PHJuvE46IfHlbGMXSk3buLLrat6AiKRp5oXe1ZYYtaTUvMs0Gv3EGIAdULyQ3fyi1DHN1tKt10mTvMVmE7OFfm55ohwAeQ/f+bAlhKodEmOjPAgDVHtRaRCBb2aa8CFNe/aJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760797329; c=relaxed/simple; bh=9Yp3lWJoa834+XZ6vTMNTzs2BLUob7J+OnRKmzYu8r0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sc4D6CluVf9/zh7XtM7gVlkBkO1THPCUbewJdVeitg5jJM1o2rewE7qZx8gwIxlaMLnqUajV550t4cgQhG1GzfwCAlOmWDYoFXZAVVrPf2eA6ni8PlvJ2KfRpozQnsf7KobSLyiVl7qA0S84BTCrGIuQKPT1CSlbLaJ6T/nrlHs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Y3QQWzRp; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Y3QQWzRp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1760797324; bh=9Yp3lWJoa834+XZ6vTMNTzs2BLUob7J+OnRKmzYu8r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y3QQWzRpxO5IXGn61zAoOcjSsRL2U/BnlLMfr1ZqcQIkJo8SUdnBE9ixNQqXmS4r8 ZEZPXXCbr+bQKuUAoAE5ZwjiOLeV2kbo5WtHXxBDCuzfzuM2OsNWqpRVAbB+hYoJoX 2g7ETOuTnXtnUZgVHxD7hdg0LJtUhVDXeGaTEH2KZdixmrq7iqJpKZAs+/wtK4/j62 4uqz5ME8UoQcjq7fR3zdbpQwv/sC0K54CycwqzXKP3nSIlEa3/lZ9N5IsKA2YNGU1I xcyQysrXeTFjgA7k48QwaEsAAr8EvhTyVYAJVpdWumWiG10wCjBQ87q1KcYS+NyRY1 OEi415JhXtxeA== Received: from mt.tail9873f4.ts.net (unknown [144.48.130.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by bali.collaboradmins.com (Postfix) with ESMTPSA id 957E617E124A; Sat, 18 Oct 2025 16:22:01 +0200 (CEST) From: Muhammad Usama Anjum To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , Danilo Krummrich , Dmitry Torokhov , Thomas Gleixner , Peter Zijlstra , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-input@vger.kernel.org Cc: Muhammad Usama Anjum , kernel@collabora.com, superm1@kernel.org Subject: [RFC 2/4] ACPI: button: Cancel hibernation if button is pressed during hibernation Date: Sat, 18 Oct 2025 19:21:05 +0500 Message-ID: <20251018142114.897445-3-usama.anjum@collabora.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251018142114.897445-1-usama.anjum@collabora.com> References: <20251018142114.897445-1-usama.anjum@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" acpi_pm_wakeup_event() is called from acpi_button_notify() which is called when power button is pressed. But system doesn't wake up as pm_wakeup_dev_event() isn't called with hard parameter set in case of hibernation. It gets set only for s2idle cases. Call acpi_pm_wakeup_event() if power button is pressed and hibernation is in progress. Set the hard parameter such that pm_system_wakeup() gets called which increments pm_abort_suspend counter. Hence hibernation would be cancelled as in hibernation path, this counter is checked if it should be aborted. Signed-off-by: Muhammad Usama Anjum --- drivers/acpi/button.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 0a70260401882..4a2575c0c44e3 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #define ACPI_BUTTON_CLASS "button" #define ACPI_BUTTON_FILE_STATE "state" @@ -458,11 +459,16 @@ static void acpi_button_notify(acpi_handle handle, u3= 2 event, void *data) acpi_pm_wakeup_event(&device->dev); =20 button =3D acpi_driver_data(device); - if (button->suspended || event =3D=3D ACPI_BUTTON_NOTIFY_WAKE) - return; - input =3D button->input; keycode =3D test_bit(KEY_SLEEP, input->keybit) ? KEY_SLEEP : KEY_POWER; + if (event =3D=3D ACPI_BUTTON_NOTIFY_STATUS && keycode =3D=3D KEY_POWER && + hibernation_in_progress()) { + pm_wakeup_dev_event(&device->dev, 0, true); + return; + } + + if (button->suspended || event =3D=3D ACPI_BUTTON_NOTIFY_WAKE) + return; =20 input_report_key(input, keycode, 1); input_sync(input); --=20 2.47.3