From: "Francisco Beltrán Millalén" <fbeltranmillalen@gmail.com>
To: bhelgaas@google.com, linux-pci@vger.kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] usb: hcd-pci: Honour pci_save_state() failure
Date: Thu, 24 Sep 2026 09:42:18 -0300 [thread overview]
Message-ID: <20260924124221.12374-2-fbeltranmillalen@gmail.com> (raw)
In-Reply-To: <20260924124221.12374-1-fbeltranmillalen@gmail.com>
hcd_pci_suspend_noirq() calls pci_save_state() and ignores its return
value, then goes on to call pci_prepare_to_sleep(). pci_save_state()
can fail -- it already propagates failures from pci_save_pcie_state()
and friends -- and when it does there is no saved state to restore
later, so putting the device into a low-power state only makes matters
worse: the subsequent transition fails too, and the PCI core then warns
that the callback returned without saving the state.
Check the return value. If the state could not be saved, leave the
device alone and return success, so the rest of the system can still
suspend. Leaving the power state untouched also means the PCI core has
nothing to complain about.
Signed-off-by: Francisco Beltrán Millalén <fbeltranmillalen@gmail.com>
---
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -541,7 +541,17 @@
if (retval)
return retval;
- pci_save_state(pci_dev);
+ /*
+ * If the controller is already inaccessible, there is no state to
+ * save and nothing to put into a low-power state. Leaving the power
+ * state alone also keeps the PCI core from warning that this callback
+ * returned without saving the state.
+ */
+ retval = pci_save_state(pci_dev);
+ if (retval) {
+ dev_dbg(dev, "--> not suspending, device inaccessible\n");
+ return 0;
+ }
/* If the root hub is dead rather than suspended, disallow remote
* wakeup. usb_hc_died() should ensure that both hosts are marked as
next prev parent reply other threads:[~2026-09-24 12:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-24 12:42 [PATCH 0/4] PCI/PM: Do not save or restore the config space of an inaccessible device Francisco Beltrán Millalén
2026-09-24 12:42 ` Francisco Beltrán Millalén [this message]
2026-09-24 15:30 ` [PATCH 1/4] usb: hcd-pci: Honour pci_save_state() failure Alan Stern
2026-09-24 12:42 ` [PATCH 2/4] PCI/PM: Do not save the config space of an inaccessible device Francisco Beltrán Millalén
2026-09-24 12:42 ` [PATCH 3/4] PCI/PM: Do not restore a config space snapshot that is all ones Francisco Beltrán Millalén
2026-09-24 12:42 ` [PATCH 4/4] PCI: Do not mistake an absent device for an active link Francisco Beltrán Millalén
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=20260924124221.12374-2-fbeltranmillalen@gmail.com \
--to=fbeltranmillalen@gmail.com \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.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
all inboxes | Powered by JetHome®