AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-18 12:16:19 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pci/pm'

Browse Source 
- Allow runtime PM even if driver doesn't supply callbacks (Jarkko
    Nikula)

* pci/pm:
  PCI / PM: Allow runtime PM without callback functions
This commit is contained in:
Bjorn Helgaas 2019-01-02 15:31:05 -06:00
commit 6f7cebea6b
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/pci/pci-driver.c
View File

@ -1251,30 +1251,29 @@ static int pci_pm_runtime_suspend(struct device *dev)
return 0; return 0;
} }
if (!pm || !pm->runtime_suspend)
return -ENOSYS;
pci_dev->state_saved = false; pci_dev->state_saved = false;
error = pm->runtime_suspend(dev); if (pm && pm->runtime_suspend) {
if (error) { error = pm->runtime_suspend(dev);
/* /*
* -EBUSY and -EAGAIN is used to request the runtime PM core * -EBUSY and -EAGAIN is used to request the runtime PM core
* to schedule a new suspend, so log the event only with debug * to schedule a new suspend, so log the event only with debug
* log level. * log level.
*/ */
if (error == -EBUSY || error == -EAGAIN) if (error == -EBUSY || error == -EAGAIN) {
dev_dbg(dev, "can't suspend now (%pf returned %d)\n", dev_dbg(dev, "can't suspend now (%pf returned %d)\n",
pm->runtime_suspend, error); pm->runtime_suspend, error);
else return error;
} else if (error) {
dev_err(dev, "can't suspend (%pf returned %d)\n", dev_err(dev, "can't suspend (%pf returned %d)\n",
pm->runtime_suspend, error); pm->runtime_suspend, error);
return error;
return error; }
} }
pci_fixup_device(pci_fixup_suspend, pci_dev); pci_fixup_device(pci_fixup_suspend, pci_dev);
if (!pci_dev->state_saved && pci_dev->current_state != PCI_D0 if (pm && pm->runtime_suspend
&& !pci_dev->state_saved && pci_dev->current_state != PCI_D0
&& pci_dev->current_state != PCI_UNKNOWN) { && pci_dev->current_state != PCI_UNKNOWN) {
WARN_ONCE(pci_dev->current_state != prev, WARN_ONCE(pci_dev->current_state != prev,
"PCI PM: State of device not saved by %pF\n", "PCI PM: State of device not saved by %pF\n",
@ -1292,7 +1291,7 @@ static int pci_pm_runtime_suspend(struct device *dev)
static int pci_pm_runtime_resume(struct device *dev) static int pci_pm_runtime_resume(struct device *dev)
{ {
int rc; int rc = 0;
struct pci_dev *pci_dev = to_pci_dev(dev); struct pci_dev *pci_dev = to_pci_dev(dev);
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
@ -1306,14 +1305,12 @@ static int pci_pm_runtime_resume(struct device *dev)
if (!pci_dev->driver) if (!pci_dev->driver)
return 0; return 0;
if (!pm || !pm->runtime_resume)
return -ENOSYS;
pci_fixup_device(pci_fixup_resume_early, pci_dev); pci_fixup_device(pci_fixup_resume_early, pci_dev);
pci_enable_wake(pci_dev, PCI_D0, false); pci_enable_wake(pci_dev, PCI_D0, false);
pci_fixup_device(pci_fixup_resume, pci_dev); pci_fixup_device(pci_fixup_resume, pci_dev);
rc = pm->runtime_resume(dev); if (pm && pm->runtime_resume)
rc = pm->runtime_resume(dev);
pci_dev->runtime_d3cold = false; pci_dev->runtime_d3cold = false;