diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-09 22:06:48 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-09 22:06:48 -0800 |
| commit | d8675c149da424158c1867bf6f9c7ece5cee53de (patch) | |
| tree | c355c9340421475460b0ab49f12f218e0ec2ce46 | |
| parent | 10dc161b22a6bcd1d8f0dcceff7a6917fe305167 (diff) | |
| parent | 4f3f403a2e89b16cc06882cac71d8d5c0a310441 (diff) | |
Merge "msm: pcie: always recover cfg space during resume"
| -rw-r--r-- | drivers/pci/host/pci-msm.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/drivers/pci/host/pci-msm.c b/drivers/pci/host/pci-msm.c index a741c9c7d115..0ecf64f4afe9 100644 --- a/drivers/pci/host/pci-msm.c +++ b/drivers/pci/host/pci-msm.c @@ -6865,17 +6865,24 @@ static int msm_pcie_pm_resume(struct pci_dev *dev, dev->bus->number, dev->bus->primary); if (!(options & MSM_PCIE_CONFIG_NO_CFG_RESTORE)) { - PCIE_DBG(pcie_dev, - "RC%d: entry of PCI framework restore state\n", - pcie_dev->rc_idx); + if (pcie_dev->saved_state) { + PCIE_DBG(pcie_dev, + "RC%d: entry of PCI framework restore state\n", + pcie_dev->rc_idx); - pci_load_and_free_saved_state(dev, - &pcie_dev->saved_state); - pci_restore_state(dev); + pci_load_and_free_saved_state(dev, + &pcie_dev->saved_state); + pci_restore_state(dev); - PCIE_DBG(pcie_dev, - "RC%d: exit of PCI framework restore state\n", - pcie_dev->rc_idx); + PCIE_DBG(pcie_dev, + "RC%d: exit of PCI framework restore state\n", + pcie_dev->rc_idx); + } else { + PCIE_DBG(pcie_dev, + "RC%d: restore rc config space using shadow recovery\n", + pcie_dev->rc_idx); + msm_pcie_cfg_recover(pcie_dev, true); + } } } |