Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c0df937 authored by Yan He's avatar Yan He
Browse files

msm: pcie: improve the mechanism for config space recovery 



The PCIe link could be down during config space saving. Improve
the saving and restoring mechanism to handle this situation.

CRs-fixed: 677102
Change-Id: I3fd50952624b178872e7975832410af725ca623e
Signed-off-by: default avatarYan He <yanhe@codeaurora.org>
parent 29fdcf36

arch/arm/mach-msm/pcie.c

+12 −1
Original line number Diff line number Diff line
@@ -392,7 +392,11 @@ static inline int msm_pcie_oper_conf(struct pci_bus *bus, u32 devfn, int oper, 
		writel_relaxed(wr_val, config_base + word_offset);

		wmb(); /* ensure config data is written to hardware register */



		if (dev->shadow_en) {

		if (rd_val == PCIE_LINK_DOWN) {

			PCIE_ERR(dev,

				"Read of RC%d %d:0x%02x + 0x%04x[%d] is all FFs\n",

				rc_idx, bus->number, devfn, where, size);

		} else if (dev->shadow_en) {

			if (rc)

				dev->rc_shadow[word_offset / 4] = wr_val;

			else
@@ -2239,7 +2243,14 @@ int msm_pcie_recover_config(struct pci_dev *dev) 
		msm_pcie_cfg_recover(pcie_dev, true);

		PCIE_DBG(pcie_dev, "Recover EP of RC%d\n", pcie_dev->rc_idx);

		msm_pcie_cfg_recover(pcie_dev, false);

		PCIE_DBG(pcie_dev,

			"Refreshing the saved config space in PCI framework for RC%d and its EP\n",

			pcie_dev->rc_idx);

		pci_save_state(pcie_dev->dev);

		pci_save_state(dev);

		pcie_dev->shadow_en = true;

		PCIE_DBG(pcie_dev, "Turn on shadow for RC%d\n",

			pcie_dev->rc_idx);

	} else {

		PCIE_ERR(pcie_dev,

			"PCIe: the link of RC%d is not up yet; can't recover config space.\n",