Commit c1787c3e authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/keystone' 

- Set the 'ti,keystone-pcie' mode so v3.65a devices work in Root Complex
  mode (Kishon Vijay Abraham I)

- Try to avoid unrecoverable SError for attempts to issue config
  transactions when the link is down; this is racy but the best we can do
  (Kishon Vijay Abraham I)

* pci/controller/keystone:
  PCI: keystone: Add link up check to ks_pcie_other_map_bus()
  PCI: keystone: Set mode as Root Complex for "ti,keystone-pcie" compatible
parents 5c8bd7f2 9e9ec8d8

drivers/pci/controller/dwc/pci-keystone.c

+12 −0
Original line number Diff line number Diff line
@@ -455,6 +455,17 @@ static void __iomem *ks_pcie_other_map_bus(struct pci_bus *bus, 
	struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);

	u32 reg;



	/*

	 * Checking whether the link is up here is a last line of defense

	 * against platforms that forward errors on the system bus as

	 * SError upon PCI configuration transactions issued when the link

	 * is down. This check is racy by definition and does not stop

	 * the system from triggering an SError if the link goes down

	 * after this check is performed.

	 */

	if (!dw_pcie_link_up(pci))

		return NULL;



	reg = CFG_BUS(bus->number) | CFG_DEVICE(PCI_SLOT(devfn)) |

		CFG_FUNC(PCI_FUNC(devfn));

	if (!pci_is_root_bus(bus->parent))
@@ -1093,6 +1104,7 @@ static int ks_pcie_am654_set_mode(struct device *dev, 


static const struct ks_pcie_of_data ks_pcie_rc_of_data = {

	.host_ops = &ks_pcie_host_ops,

	.mode = DW_PCIE_RC_TYPE,

	.version = DW_PCIE_VER_365A,

};