Will use this flag for system suspend in addition to runtime suspend.
Signed-off-by: Huang Ying <ying.hu...@intel.com>
---
drivers/pci/pci-driver.c | 2 +-
drivers/pci/pci.c | 6 +++---
include/linux/pci.h | 7 +++----
3 files changed, 7 insertions(+), 8 deletions(-)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1036,7 +1036,7 @@ static int pci_pm_runtime_resume(struct
rc = pm->runtime_resume(dev);
- pci_dev->runtime_d3cold = false;
+ pci_dev->set_d3cold = false;
return rc;
}
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -681,7 +681,7 @@ static void __pci_start_power_transition
* devices powered on/off by corresponding bridge,
* because have already delayed for the bridge.
*/
- if (dev->runtime_d3cold) {
+ if (dev->set_d3cold) {
msleep(dev->d3cold_delay);
/*
* When powering on a bridge from D3cold, the
@@ -1833,7 +1833,7 @@ int pci_finish_runtime_suspend(struct pc
if (target_state == PCI_POWER_ERROR)
return -EIO;
- dev->runtime_d3cold = target_state == PCI_D3cold;
+ dev->set_d3cold = target_state == PCI_D3cold;
__pci_enable_wake(dev, target_state, true, pci_dev_run_wake(dev));
@@ -1841,7 +1841,7 @@ int pci_finish_runtime_suspend(struct pc
if (error) {
__pci_enable_wake(dev, target_state, true, false);
- dev->runtime_d3cold = false;
+ dev->set_d3cold = false;
}
return error;
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -263,10 +263,9 @@ struct pci_dev {
unsigned int mmio_always_on:1; /* disallow turning off io/mem
decoding during bar sizing */
unsigned int wakeup_prepared:1;
- unsigned int runtime_d3cold:1; /* whether go through runtime
- D3cold, not set for devices
- powered on/off by the
- corresponding bridge */
+ unsigned int set_d3cold:1; /* whether go through runtime D3cold,
+ not set for devices powered on/off
+ by the corresponding bridge */
unsigned int d3_delay; /* D3->D0 transition time in ms */
unsigned int d3cold_delay; /* D3cold->D0 transition time in ms */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
