From: Thomas Gleixner <tglx@linutronix.de>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Bjorn Helgaas <helgaas@kernel.org>,
Maarten Lankhorst <dev@mblankhorst.nl>,
Michal Hocko <mhocko@kernel.org>,
Andy Lutomirski <luto@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
the arch/x86 maintainers <x86@kernel.org>,
Daniel Vetter <daniel.vetter@intel.com>,
Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-pci@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: Linux 4.15-rc2: Regression in resume from ACPI S3
Date: Thu, 14 Dec 2017 16:52:22 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1712141648190.4998@nanos> (raw)
In-Reply-To: <5115041.vUGA3IjvdM@aspire.rjw.lan>
On Thu, 14 Dec 2017, Rafael J. Wysocki wrote:
> The problem here is that pci_pm_thaw_noirq() calls pci_restore_state() which
> in fact requires the device to be in D0, so the caller should put it into
> D0 instead of trying to "update" its power state.
>
> [Note that the PCI layer doesn't put devices into low-power states during the
> hibernation's "freeze" transition, but drivers can legitimately do that in
> their "freeze" callbacks which was overlooked in that code and that's what
> i915 does.]
>
> So IMO what we need is the change below. I'm going to test it shortly,
> but please give it a go too.
So now this looks more reasonable:
irq_migrate_all_off_this_cpu: Mask 125 pci_msi_mask_irq+0x0/0x10
__pci_write_msi_msg: 0000:00:02.0 00000000fee0100c 0000412a
__pci_write_msi_msg: Not written
...
device_pm_callback_start: i915 0000:00:02.0, parent: pci0000:00, noirq bus [thaw]
pci_pm_thaw_noirq <-dpm_run_callback
__pci_write_msi_msg: 0000:00:02.0 00000000fee0100c 0000412a
device_pm_callback_end: i915 0000:00:02.0, err=0
...
resume_irqs: Resume 125
...
irq_handler_entry: irq=125 name=i915
Thanks,
tglx
> ---
> drivers/pci/pci-driver.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> Index: linux-pm/drivers/pci/pci-driver.c
> ===================================================================
> --- linux-pm.orig/drivers/pci/pci-driver.c
> +++ linux-pm/drivers/pci/pci-driver.c
> @@ -1027,7 +1027,12 @@ static int pci_pm_thaw_noirq(struct devi
> if (pci_has_legacy_pm_support(pci_dev))
> return pci_legacy_resume_early(dev);
>
> - pci_update_current_state(pci_dev, PCI_D0);
> + /*
> + * pci_restore_state() requires the device to be in D0 (because of MSI
> + * restoration among other things), so force it into D0 in case the
> + * driver's "freeze" callbacks put it into a low-power state directly.
> + */
> + pci_set_power_state(pci_dev, PCI_D0);
> pci_restore_state(pci_dev);
>
> if (drv && drv->pm && drv->pm->thaw_noirq)
>
>
next prev parent reply other threads:[~2017-12-14 15:52 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-03 16:22 Linux 4.15-rc2 Linus Torvalds
2017-12-04 22:25 ` Linux 4.15-rc2: Regression in resume from ACPI S3 Rafael J. Wysocki
2017-12-04 22:36 ` Linus Torvalds
2017-12-04 22:38 ` Thomas Gleixner
2017-12-04 22:41 ` Rafael J. Wysocki
2017-12-05 0:25 ` Rafael J. Wysocki
2017-12-09 10:33 ` Pavel Machek
2017-12-09 11:41 ` Pavel Machek
[not found] ` <CA+55aFw8tuoJ2gcXx3K2sKFf2Y9hXX4naMVQNqGOUivnjwhjkg@mail.gmail.com>
2017-12-09 22:01 ` Pavel Machek
[not found] ` <CA+55aFySAdiBZhZ0PSDjH5PuvPPcMsBRXbxCkObfm1eY7gHDbQ@mail.gmail.com>
2017-12-10 16:23 ` Pavel Machek
2017-12-10 16:37 ` Linus Torvalds
2017-12-10 18:56 ` Pavel Machek
2017-12-10 20:30 ` Linus Torvalds
2017-12-10 20:43 ` Pavel Machek
2017-12-10 21:28 ` Linus Torvalds
2017-12-10 21:35 ` Pavel Machek
2017-12-12 17:27 ` Linus Torvalds
2017-12-12 18:05 ` Andy Lutomirski
2017-12-12 18:36 ` Linus Torvalds
2017-12-12 22:10 ` Andy Lutomirski
2017-12-12 22:33 ` Linus Torvalds
2017-12-12 23:10 ` Andy Lutomirski
2017-12-13 11:16 ` Jarkko Nikula
2017-12-13 12:40 ` Ingo Molnar
2017-12-13 18:50 ` Andy Lutomirski
2017-12-10 21:38 ` [PATCH] Fix resume on x86-32 machines Pavel Machek
2017-12-10 21:58 ` Andy Lutomirski
2017-12-10 22:20 ` Pavel Machek
2017-12-11 9:25 ` Jarkko Nikula
2017-12-11 14:22 ` Rafael J. Wysocki
2017-12-11 14:43 ` Rafael J. Wysocki
2017-12-11 14:59 ` Jarkko Nikula
2017-12-11 18:31 ` Linus Torvalds
2017-12-11 18:41 ` Andy Lutomirski
2017-12-11 19:12 ` Linus Torvalds
2017-12-14 20:38 ` Pavel Machek
2017-12-14 20:47 ` Linus Torvalds
2017-12-14 21:20 ` Andy Lutomirski
2017-12-14 22:22 ` Pavel Machek
2017-12-11 15:13 ` Ingo Molnar
2017-12-11 16:26 ` Andy Lutomirski
2017-12-11 14:09 ` Linux 4.15-rc2: Regression in resume from ACPI S3 Zhang Rui
2017-12-11 16:28 ` Andy Lutomirski
2017-12-12 8:00 ` Pavel Machek
2017-12-06 12:15 ` Michal Hocko
2017-12-06 12:23 ` Thomas Gleixner
2017-12-06 14:04 ` Rafael J. Wysocki
2017-12-06 12:31 ` Maarten Lankhorst
2017-12-06 12:46 ` Thomas Gleixner
2017-12-06 13:09 ` Maarten Lankhorst
2017-12-06 14:15 ` Thomas Gleixner
2017-12-07 13:33 ` Maarten Lankhorst
2017-12-08 10:30 ` Thomas Gleixner
2017-12-13 15:57 ` Thomas Gleixner
2017-12-13 16:23 ` Bjorn Helgaas
2017-12-13 16:41 ` Thomas Gleixner
2017-12-13 17:45 ` Linus Torvalds
2017-12-13 18:19 ` Thomas Gleixner
2017-12-13 20:52 ` Thomas Gleixner
2017-12-13 21:06 ` Thomas Gleixner
2017-12-13 22:48 ` Rafael J. Wysocki
2017-12-14 11:54 ` Thomas Gleixner
2017-12-14 12:12 ` Rafael J. Wysocki
2017-12-14 12:30 ` Thomas Gleixner
2017-12-14 15:30 ` Rafael J. Wysocki
2017-12-14 15:52 ` Thomas Gleixner [this message]
2017-12-14 15:54 ` Rafael J. Wysocki
2017-12-14 16:17 ` Maarten Lankhorst
2017-12-15 2:07 ` [PATCH] PCI / PM: Force devices to D0 in pci_pm_thaw_noirq() Rafael J. Wysocki
2017-12-15 14:28 ` Rafael J. Wysocki
2017-12-15 18:30 ` Bjorn Helgaas
2017-12-15 23:44 ` Rafael J. Wysocki
2017-12-14 13:24 ` Linux 4.15-rc2: Regression in resume from ACPI S3 Thomas Gleixner
2017-12-14 19:03 ` Linus Torvalds
2017-12-14 22:36 ` Thomas Gleixner
2017-12-14 22:47 ` Linus Torvalds
2017-12-15 9:05 ` Thomas Gleixner
2017-12-15 0:34 ` Rafael J. Wysocki
2017-12-13 22:39 ` Rafael J. Wysocki
2017-12-13 23:26 ` Rafael J. Wysocki
2017-12-07 7:55 ` Michal Hocko
2017-12-10 20:30 ` Michal Hocko
2018-02-21 18:36 ` Linux 4.15-rc2 Eugene Syromiatnikov
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=alpine.DEB.2.20.1712141648190.4998@nanos \
--to=tglx@linutronix.de \
--cc=bhelgaas@google.com \
--cc=daniel.vetter@intel.com \
--cc=dev@mblankhorst.nl \
--cc=helgaas@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mhocko@kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
--cc=torvalds@linux-foundation.org \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).