Merge "msm: pcie: always recover cfg space during resume" (395919d8) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/pci/host/pci-msm.c

+16 −9

Original line number	Diff line number	Diff line
		@@ -6512,6 +6512,7 @@ static int msm_pcie_pm_resume(struct pci_dev *dev,
		dev->bus->number, dev->bus->primary);

		if (!(options & MSM_PCIE_CONFIG_NO_CFG_RESTORE)) {
		if (pcie_dev->saved_state) {
		PCIE_DBG(pcie_dev,
		"RC%d: entry of PCI framework restore state\n",
		pcie_dev->rc_idx);
		@@ -6523,6 +6524,12 @@ static int msm_pcie_pm_resume(struct pci_dev *dev,
		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);
		}
		}

		if (pcie_dev->bridge_found) {