diff options
| author | Rajvi Jingar <rajvi.jingar@linux.intel.com> | 2022-08-30 03:49:12 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-09-12 15:30:18 -0500 |
| commit | 4c00cba122f3f3ae54aa5a3a1aec3afc7a2e6f94 (patch) | |
| tree | 39af54e375c3c17fbf126ac53082aa1d664d5d16 /drivers/pci/pci-driver.c | |
| parent | c01163dbd1b8aa016c163ff4bf3a2e90311504f1 (diff) | |
| download | linux-stable-4c00cba122f3f3ae54aa5a3a1aec3afc7a2e6f94.tar.gz linux-stable-4c00cba122f3f3ae54aa5a3a1aec3afc7a2e6f94.tar.bz2 linux-stable-4c00cba122f3f3ae54aa5a3a1aec3afc7a2e6f94.zip | |
PCI/PM: Simplify pci_pm_suspend_noirq()
We always want to save the device state unless the driver has already done
it. Rearrange the checking in pci_pm_suspend_noirq() to make this more
clear. No functional change intended.
[bhelgaas: commit log, rewrap comment]
Link: https://lore.kernel.org/r/20220830104913.1620539-1-rajvi.jingar@linux.intel.com
Signed-off-by: Rajvi Jingar <rajvi.jingar@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 5d8c37c3e15a..107d77f3c846 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -873,20 +873,15 @@ static int pci_pm_suspend_noirq(struct device *dev) } } - if (pci_dev->skip_bus_pm) { + if (!pci_dev->state_saved) { + pci_save_state(pci_dev); + /* - * Either the device is a bridge with a child in D0 below it, or - * the function is running for the second time in a row without - * going through full resume, which is possible only during - * suspend-to-idle in a spurious wakeup case. The device should - * be in D0 at this point, but if it is a bridge, it may be - * necessary to save its state. + * If the device is a bridge with a child in D0 below it, + * it needs to stay in D0, so check skip_bus_pm to avoid + * putting it into a low-power state in that case. */ - if (!pci_dev->state_saved) - pci_save_state(pci_dev); - } else if (!pci_dev->state_saved) { - pci_save_state(pci_dev); - if (pci_power_manageable(pci_dev)) + if (!pci_dev->skip_bus_pm && pci_power_manageable(pci_dev)) pci_prepare_to_sleep(pci_dev); } |