On Thu, Feb 29, 2024 at 06:38:01PM +0100, Rafael J. Wysocki wrote: > On Wed, Feb 28, 2024 at 11:26 PM Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote: > > > > [+to Rafael] > > > > On Wed, Feb 28, 2024 at 08:53:16AM +0100, Daniel Drake wrote: > > > This reverts commit d52848620de00cde4a3a5df908e231b8c8868250, which > > > was originally put in place to work around a s2idle failure on this > > > platform where the NVMe device was inaccessible upon resume. > > > > > > After extended testing, we found that the firmware's implementation of > > > S3 is buggy and intermittently fails to wake up the system. We need > > > to revert to s2idle mode. > > > > > > The NVMe issue has now been solved more precisely in the commit titled > > > "PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge" > > > > > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=215742 > > > Acked-by: Jian-Hong Pan <jhp@xxxxxxxxxxxxx> > > > Signed-off-by: Daniel Drake <drake@xxxxxxxxxxxxx> > > > > Rafael, if you're OK with this, I can queue both patches for v6.9. > > Yes, please! > > Feel free to add > > Acked-by: Rafael J. Wysocki <rafael@xxxxxxxxxx > > to both. Both patches applied with Rafael's ack to pci/pm for v6.9, thanks! Bjorn