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
This commit is contained in:
commit
acc886ec93
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue