From: "Mario Limonciello (AMD)" <superm1@kernel.org>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: "Pavel Machek" <pavel@kernel.org>, "Len Brown" <lenb@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Danilo Krummrich" <dakr@kernel.org>,
"Christian König" <christian.koenig@amd.com>,
"James E . J . Bottomley" <James.Bottomley@HansenPartnership.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
"Steven Rostedt" <rostedt@goodmis.org>,
linux-pm@vger.kernel.org (open list:HIBERNATION (aka Software
Suspend, aka swsusp)),
amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM
DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS),
linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM),
linux-scsi@vger.kernel.org (open list:SCSI SUBSYSTEM),
linux-usb@vger.kernel.org (open list:USB SUBSYSTEM),
linux-trace-kernel@vger.kernel.org (open list:TRACING),
"AceLan Kao" <acelan.kao@canonical.com>,
"Kai-Heng Feng" <kaihengf@nvidia.com>,
"Mark Pearson" <mpearson-lenovo@squebb.ca>,
"Merthan Karakaş" <m3rthn.k@gmail.com>,
"Eric Naim" <dnaim@cachyos.org>,
"Mario Limonciello (AMD)" <superm1@kernel.org>
Subject: [PATCH v6 04/11] USB: Pass PMSG_POWEROFF event to suspend_common() for poweroff with S4 flow
Date: Sun, 17 Aug 2025 21:00:54 -0500 [thread overview]
Message-ID: <20250818020101.3619237-5-superm1@kernel.org> (raw)
In-Reply-To: <20250818020101.3619237-1-superm1@kernel.org>
If powering off the system with the S4 flow USB wakeup sources should
be ignored. Add a new callback hcd_pci_poweroff() which will differentiate
whether target state is S5 and pass PMSG_POWEROFF as the message so that
suspend_common() will avoid doing wakeups.
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
---
v6:
* Fix LKP robot issue without CONFIG_PM_SLEEP
v5:
* New patch
v4:
* https://lore.kernel.org/linux-pci/20250616175019.3471583-1-superm1@kernel.org/
Fix lkp robot issue
---
drivers/usb/core/hcd-pci.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index cd223475917ef..921d1d0940016 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -6,6 +6,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
+#include <linux/pm.h>
#include <linux/usb.h>
#include <linux/usb/hcd.h>
@@ -531,6 +532,13 @@ static int hcd_pci_freeze(struct device *dev)
return suspend_common(dev, PMSG_FREEZE);
}
+static int hcd_pci_poweroff(struct device *dev)
+{
+ if (system_state == SYSTEM_HALT || system_state == SYSTEM_POWER_OFF)
+ return suspend_common(dev, PMSG_POWEROFF);
+ return suspend_common(dev, PMSG_SUSPEND);
+}
+
static int hcd_pci_suspend_noirq(struct device *dev)
{
struct pci_dev *pci_dev = to_pci_dev(dev);
@@ -602,6 +610,7 @@ static int hcd_pci_restore(struct device *dev)
#define hcd_pci_suspend NULL
#define hcd_pci_freeze NULL
#define hcd_pci_suspend_noirq NULL
+#define hcd_pci_poweroff NULL
#define hcd_pci_poweroff_late NULL
#define hcd_pci_resume_noirq NULL
#define hcd_pci_resume NULL
@@ -639,7 +648,7 @@ const struct dev_pm_ops usb_hcd_pci_pm_ops = {
.freeze_noirq = check_root_hub_suspended,
.thaw_noirq = NULL,
.thaw = hcd_pci_resume,
- .poweroff = hcd_pci_suspend,
+ .poweroff = hcd_pci_poweroff,
.poweroff_late = hcd_pci_poweroff_late,
.poweroff_noirq = hcd_pci_suspend_noirq,
.restore_noirq = hcd_pci_resume_noirq,
--
2.43.0
next prev parent reply other threads:[~2025-08-18 2:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-18 2:00 [PATCH v6 00/11] Improvements to S5 power consumption Mario Limonciello (AMD)
2025-08-18 2:00 ` [PATCH v6 01/11] PM: Introduce new PMSG_POWEROFF event Mario Limonciello (AMD)
2025-08-18 2:00 ` [PATCH v6 02/11] scsi: Add PM_EVENT_POWEROFF into suspend callbacks Mario Limonciello (AMD)
2025-08-18 2:00 ` [PATCH v6 03/11] usb: sl811-hcd: " Mario Limonciello (AMD)
2025-08-18 2:00 ` Mario Limonciello (AMD) [this message]
2025-08-18 10:50 ` [PATCH v6 04/11] USB: Pass PMSG_POWEROFF event to suspend_common() for poweroff with S4 flow Oliver Neukum
2025-08-18 11:24 ` Mario Limonciello
2025-08-18 2:00 ` [PATCH v6 05/11] PCI: PM: Disable device wakeups when halting system through " Mario Limonciello (AMD)
2025-08-18 2:00 ` [PATCH v6 06/11] PCI: PM: Split out code from pci_pm_suspend_noirq() into helper Mario Limonciello (AMD)
2025-08-18 2:00 ` [PATCH v6 07/11] PCI: PM: Run bridge power up actions as part of restore phase Mario Limonciello (AMD)
2025-08-18 2:00 ` [PATCH v6 08/11] PCI: PM: Use pci_power_manageable() in pci_pm_poweroff_noirq() Mario Limonciello (AMD)
2025-08-18 2:00 ` [PATCH v6 09/11] PCI: Put PCIe bridges with downstream devices into D3 at hibernate Mario Limonciello (AMD)
2025-08-18 2:01 ` [PATCH v6 10/11] drm/amd: Avoid evicting resources at S5 Mario Limonciello (AMD)
2025-08-18 2:01 ` [PATCH v6 11/11] PM: Use hibernate flows for system power off Mario Limonciello (AMD)
2025-09-03 4:41 ` [PATCH v6 00/11] Improvements to S5 power consumption Mario Limonciello
2025-09-03 11:14 ` Rafael J. Wysocki
2025-09-06 12:20 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250818020101.3619237-5-superm1@kernel.org \
--to=superm1@kernel.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=acelan.kao@canonical.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=bhelgaas@google.com \
--cc=christian.koenig@amd.com \
--cc=dakr@kernel.org \
--cc=dnaim@cachyos.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=kaihengf@nvidia.com \
--cc=lenb@kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=m3rthn.k@gmail.com \
--cc=martin.petersen@oracle.com \
--cc=mpearson-lenovo@squebb.ca \
--cc=pavel@kernel.org \
--cc=rafael@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).