diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:34:24 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:34:24 -0500 |
| commit | acc886ec934980a45ae8962dbe88e221a40c77a2 (patch) | |
| tree | 96483d89d16002a6eab6adebd850de1047bd293e | |
| parent | c6a7a77cc4e62a2d9011f282ba69ffcafa7efdcc (diff) | |
| parent | ea00353f36b64375518662a8ad15e39218a1f324 (diff) | |
Merge branch 'pci/pm' into next
* pci/pm:
PCI: Freeze PME scan before suspending devices
PCI/PM: Don't sleep at all when d3_delay or d3cold_delay is zero
| -rw-r--r-- | drivers/pci/pci.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d8b5c37cecd3..2f8f0f516305 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -66,7 +66,8 @@ static void pci_dev_d3_sleep(struct pci_dev *dev) if (delay < pci_pm_d3_delay) delay = pci_pm_d3_delay; - msleep(delay); + if (delay) + msleep(delay); } #ifdef CONFIG_PCI_DOMAINS @@ -827,7 +828,8 @@ static void __pci_start_power_transition(struct pci_dev *dev, pci_power_t state) * because have already delayed for the bridge. */ if (dev->runtime_d3cold) { - msleep(dev->d3cold_delay); + if (dev->d3cold_delay) + msleep(dev->d3cold_delay); /* * When powering on a bridge from D3cold, the * whole hierarchy may be powered on into @@ -1782,8 +1784,8 @@ static void pci_pme_list_scan(struct work_struct *work) } } if (!list_empty(&pci_pme_list)) - schedule_delayed_work(&pci_pme_work, - msecs_to_jiffies(PME_TIMEOUT)); + queue_delayed_work(system_freezable_wq, &pci_pme_work, + msecs_to_jiffies(PME_TIMEOUT)); mutex_unlock(&pci_pme_list_mutex); } @@ -1848,8 +1850,9 @@ void pci_pme_active(struct pci_dev *dev, bool enable) mutex_lock(&pci_pme_list_mutex); list_add(&pme_dev->list, &pci_pme_list); if (list_is_singular(&pci_pme_list)) - schedule_delayed_work(&pci_pme_work, - msecs_to_jiffies(PME_TIMEOUT)); + queue_delayed_work(system_freezable_wq, + &pci_pme_work, + msecs_to_jiffies(PME_TIMEOUT)); mutex_unlock(&pci_pme_list_mutex); } else { mutex_lock(&pci_pme_list_mutex); |