| Message ID | 20240228075316.7404-2-drake@endlessos.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [v3,1/2] PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge | expand |
[+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@endlessos.org> > Signed-off-by: Daniel Drake <drake@endlessos.org> Rafael, if you're OK with this, I can queue both patches for v6.9. > --- > drivers/acpi/sleep.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c > index 808484d112097..728acfeb774d8 100644 > --- a/drivers/acpi/sleep.c > +++ b/drivers/acpi/sleep.c > @@ -385,18 +385,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { > DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"), > }, > }, > - /* > - * ASUS B1400CEAE hangs on resume from suspend (see > - * https://bugzilla.kernel.org/show_bug.cgi?id=215742). > - */ > - { > - .callback = init_default_s3, > - .ident = "ASUS B1400CEAE", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), > - DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK B1400CEAE"), > - }, > - }, > {}, > }; > > -- > 2.39.2 >
On Wed, Feb 28, 2024 at 11:26 PM Bjorn Helgaas <helgaas@kernel.org> 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@endlessos.org> > > Signed-off-by: Daniel Drake <drake@endlessos.org> > > 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@kernel.org to both. Thanks!
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@kernel.org> 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@endlessos.org> > > > Signed-off-by: Daniel Drake <drake@endlessos.org> > > > > 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@kernel.org > > to both. Both patches applied with Rafael's ack to pci/pm for v6.9, thanks! Bjorn
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 808484d112097..728acfeb774d8 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -385,18 +385,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"), }, }, - /* - * ASUS B1400CEAE hangs on resume from suspend (see - * https://bugzilla.kernel.org/show_bug.cgi?id=215742). - */ - { - .callback = init_default_s3, - .ident = "ASUS B1400CEAE", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK B1400CEAE"), - }, - }, {}, };