From: "Rafael J. Wysocki" <rjw@rjwysocki.net> To: Bjorn Helgaas <helgaas@kernel.org> Cc: Dexuan Cui <decui@microsoft.com>, "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Michael Kelley <mikelley@microsoft.com>, Sasha Levin <Alexander.Levin@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>, KY Srinivasan <kys@microsoft.com>, Stephen Hemminger <sthemmin@microsoft.com>, olaf@aepfle.de, apw@canonical.com, jasowang@redhat.com, vkuznets@redhat.com, marcelo.cerri@canonical.com, jackm@mellanox.com, linux-pci@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, driverdev-devel@linuxdriverproject.org, Bjorn Helgaas <bhelgaas@google.com> Subject: Re: [PATCH 4/7] PCI/PM: Run resume fixups before disabling wakeup events Date: Tue, 15 Oct 2019 19:21:39 +0200 [thread overview] Message-ID: <6808286.qxd3Zai2y5@kreacher> (raw) In-Reply-To: <20191014230016.240912-5-helgaas@kernel.org> On Tuesday, October 15, 2019 1:00:13 AM CEST Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > pci_pm_resume() and pci_pm_restore() call pci_pm_default_resume(), which > runs resume fixups before disabling wakeup events: > > static void pci_pm_default_resume(struct pci_dev *pci_dev) > { > pci_fixup_device(pci_fixup_resume, pci_dev); > pci_enable_wake(pci_dev, PCI_D0, false); > } > > pci_pm_runtime_resume() does both of these, but in the opposite order: > > pci_enable_wake(pci_dev, PCI_D0, false); > pci_fixup_device(pci_fixup_resume, pci_dev); > > We should always use the same ordering unless there's a reason to do > otherwise. Right. > Change pci_pm_runtime_resume() to call pci_pm_default_resume() > instead of open-coding this, so the fixups are always done before disabling > wakeup events. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> No concerns about this change, so Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/pci/pci-driver.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index 0c3086793e4e..55acb658273f 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -1345,8 +1345,7 @@ static int pci_pm_runtime_resume(struct device *dev) > return 0; > > pci_fixup_device(pci_fixup_resume_early, pci_dev); > - pci_enable_wake(pci_dev, PCI_D0, false); > - pci_fixup_device(pci_fixup_resume, pci_dev); > + pci_pm_default_resume(pci_dev); > > if (pm && pm->runtime_resume) > rc = pm->runtime_resume(dev); >
WARNING: multiple messages have this Message-ID (diff)
From: "Rafael J. Wysocki" <rjw@rjwysocki.net> To: Bjorn Helgaas <helgaas@kernel.org> Cc: driverdev-devel@linuxdriverproject.org, olaf@aepfle.de, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Stephen Hemminger <sthemmin@microsoft.com>, jackm@mellanox.com, Haiyang Zhang <haiyangz@microsoft.com>, "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, linux-hyperv@vger.kernel.org, Michael Kelley <mikelley@microsoft.com>, Sasha Levin <Alexander.Levin@microsoft.com>, marcelo.cerri@canonical.com, linux-pci@vger.kernel.org, apw@canonical.com, vkuznets@redhat.com, Bjorn Helgaas <bhelgaas@google.com>, jasowang@redhat.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/7] PCI/PM: Run resume fixups before disabling wakeup events Date: Tue, 15 Oct 2019 19:21:39 +0200 [thread overview] Message-ID: <6808286.qxd3Zai2y5@kreacher> (raw) In-Reply-To: <20191014230016.240912-5-helgaas@kernel.org> On Tuesday, October 15, 2019 1:00:13 AM CEST Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > pci_pm_resume() and pci_pm_restore() call pci_pm_default_resume(), which > runs resume fixups before disabling wakeup events: > > static void pci_pm_default_resume(struct pci_dev *pci_dev) > { > pci_fixup_device(pci_fixup_resume, pci_dev); > pci_enable_wake(pci_dev, PCI_D0, false); > } > > pci_pm_runtime_resume() does both of these, but in the opposite order: > > pci_enable_wake(pci_dev, PCI_D0, false); > pci_fixup_device(pci_fixup_resume, pci_dev); > > We should always use the same ordering unless there's a reason to do > otherwise. Right. > Change pci_pm_runtime_resume() to call pci_pm_default_resume() > instead of open-coding this, so the fixups are always done before disabling > wakeup events. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> No concerns about this change, so Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/pci/pci-driver.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index 0c3086793e4e..55acb658273f 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -1345,8 +1345,7 @@ static int pci_pm_runtime_resume(struct device *dev) > return 0; > > pci_fixup_device(pci_fixup_resume_early, pci_dev); > - pci_enable_wake(pci_dev, PCI_D0, false); > - pci_fixup_device(pci_fixup_resume, pci_dev); > + pci_pm_default_resume(pci_dev); > > if (pm && pm->runtime_resume) > rc = pm->runtime_resume(dev); > _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2019-10-15 17:21 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-14 23:00 [PATCH v3 0/7] PCI: PM: Move to D0 before calling pci_legacy_resume_early() Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-14 23:00 ` [PATCH 1/7] PCI/PM: Always return devices to D0 when thawing Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:15 ` Rafael J. Wysocki 2019-10-15 17:15 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 2/7] PCI/PM: Correct pci_pm_thaw_noirq() documentation Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:17 ` Rafael J. Wysocki 2019-10-15 17:17 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 3/7] PCI/PM: Clear PCIe PME Status even for legacy power management Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:20 ` Rafael J. Wysocki 2019-10-15 17:20 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 4/7] PCI/PM: Run resume fixups before disabling wakeup events Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:21 ` Rafael J. Wysocki [this message] 2019-10-15 17:21 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 5/7] PCI/PM: Make power management op coding style consistent Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:22 ` Rafael J. Wysocki 2019-10-15 17:22 ` Rafael J. Wysocki 2019-10-16 13:50 ` Dan Carpenter 2019-10-16 13:50 ` Dan Carpenter 2019-10-14 23:00 ` [PATCH 6/7] PCI/PM: Wrap long lines in documentation Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:23 ` Rafael J. Wysocki 2019-10-15 17:23 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 7/7] PCI/MSI: Move power state check out of pci_msi_supported() Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:24 ` Rafael J. Wysocki 2019-10-15 17:24 ` Rafael J. Wysocki 2019-10-15 18:24 ` [PATCH v3 0/7] PCI: PM: Move to D0 before calling pci_legacy_resume_early() Dexuan Cui 2019-10-15 18:24 ` Dexuan Cui 2019-10-15 18:42 ` Bjorn Helgaas 2019-10-15 18:42 ` Bjorn Helgaas
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=6808286.qxd3Zai2y5@kreacher \ --to=rjw@rjwysocki.net \ --cc=Alexander.Levin@microsoft.com \ --cc=apw@canonical.com \ --cc=bhelgaas@google.com \ --cc=decui@microsoft.com \ --cc=driverdev-devel@linuxdriverproject.org \ --cc=haiyangz@microsoft.com \ --cc=helgaas@kernel.org \ --cc=jackm@mellanox.com \ --cc=jasowang@redhat.com \ --cc=kys@microsoft.com \ --cc=linux-hyperv@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=marcelo.cerri@canonical.com \ --cc=mikelley@microsoft.com \ --cc=olaf@aepfle.de \ --cc=rafael.j.wysocki@intel.com \ --cc=sthemmin@microsoft.com \ --cc=vkuznets@redhat.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.