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 3BE132D4B40; Tue, 31 Mar 2026 17:01:04 +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=1774976464; cv=none; b=hINEiukTfR7n0KX/eduJdtn2Qh5vpDJN+sjFTpi8k/V/V4+0N2JOpIYdZAaLvTn9gkv4CL8BoxoluzF2RupwZTvtWNxFuVUkpPebO1J+dgbFmz3v8BBKH9FILgorElg0em1InDDccR/wAHYgaYunK0GTp+9ej6pop0kKcFcoS74= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774976464; c=relaxed/simple; bh=XfA+yUbG12p7sTAzySZ1HBAH14S35AdY4OB0TkhwNpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tU4GtMj4yVsNBg7fsYrteDHZaJcRNHZesTVGYVCjK3Ahh0BglxKLxsW+V1X7qaTLk8gGgXXTGVZ2HGfOvv+oY4iZ6IqSJFxrrNocUapR4EfDBdq2sWdptEGlw13gfNQ0HH08l3ojFtTLVhziVyYOwnI37MU+gfXQA1ne+nqyuYE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oyT8i6t8; 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="oyT8i6t8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDE90C19423; Tue, 31 Mar 2026 17:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774976464; bh=XfA+yUbG12p7sTAzySZ1HBAH14S35AdY4OB0TkhwNpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oyT8i6t8ZWNPrFwVuorv2vVsB/Du1gnDvjkSg9HcCOMCDSlEaRscWHDuGnxCkMiN4 v3o8MMwG33oxEo8CKGTlV5vXzzGaie9MbXK/pc99OOV0GbDZV0B0V4g0X/VGVpogaV NpThMJQV5Z9IaEhLHvL8wb5KgmH2UIwJf+Nw7InI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David McFarland , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.18 103/309] platform/x86: intel-hid: disable wakeup_mode during hibernation Date: Tue, 31 Mar 2026 18:20:06 +0200 Message-ID: <20260331161757.278144617@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161753.468533260@linuxfoundation.org> References: <20260331161753.468533260@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: David McFarland [ Upstream commit e02ea3ae8ee40d5835a845884c7b161a27c10bcb ] Add a freeze handler which clears wakeup_mode. This fixes aborted hibernation on Dell Precision 3880. Wakeup event detected during hibernation, rolling back This system sends power button events during hibernation, even when triggered by software. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218634 Fixes: 0c4cae1bc00d ("PM: hibernate: Avoid missing wakeup events during hibernation") Signed-off-by: David McFarland Link: https://patch.msgid.link/20260205231629.1336348-1-corngood@gmail.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/x86/intel/hid.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c index f2b309f6e458a..c5e80887d0cb0 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -432,6 +432,14 @@ static int intel_hid_pl_suspend_handler(struct device *device) return 0; } +static int intel_hid_pl_freeze_handler(struct device *device) +{ + struct intel_hid_priv *priv = dev_get_drvdata(device); + + priv->wakeup_mode = false; + return intel_hid_pl_suspend_handler(device); +} + static int intel_hid_pl_resume_handler(struct device *device) { intel_hid_pm_complete(device); @@ -446,7 +454,7 @@ static int intel_hid_pl_resume_handler(struct device *device) static const struct dev_pm_ops intel_hid_pl_pm_ops = { .prepare = intel_hid_pm_prepare, .complete = intel_hid_pm_complete, - .freeze = intel_hid_pl_suspend_handler, + .freeze = intel_hid_pl_freeze_handler, .thaw = intel_hid_pl_resume_handler, .restore = intel_hid_pl_resume_handler, .suspend = intel_hid_pl_suspend_handler, -- 2.51.0