PCI: Check whether bridges allow access to extended config space

Even if a device supports extended config space, i.e., it is a PCI-X Mode 2
or a PCI Express device, the extended space may not be accessible if
there's a conventional PCI bus in the path to it.

We currently figure that out in pci_cfg_space_size() by reading the first
dword of extended config space.  On most platforms that returns ~0 data if
the space is inaccessible, but it may set error bits in PCI status
registers, and on some platforms it causes exceptions that we currently
don't recover from.

For example, a PCIe-to-conventional PCI bridge treats config transactions
with a non-zero Extended Register Address as an Unsupported Request on PCIe
and a received Master-Abort on the destination bus (see PCI Express to
PCI/PCI-X Bridge spec, r1.0, sec 4.1.3).

A sample case is a LS1043A CPU (NXP QorIQ Layerscape) platform with the
following bus topology:

  LS1043 PCIe Root Port
    -> PEX8112 PCIe-to-PCI bridge (doesn't support ext cfg on PCI side)
      -> PMC slot connector (for legacy PMC modules)

With a PMC module topology as follows:

  PMC connector
    -> PCI-to-PCIe bridge
      -> PCIe switch (4 ports)
        -> 4 PCIe devices (one on each port)

The PCIe devices on the PMC module support extended config space, but we
can't reach it because the PEX8112 can't generate accesses to the extended
space on its secondary bus.  Attempts to access it cause Unsupported
Request errors, which result in synchronous aborts on this platform.

To avoid these errors, check whether bridges are capable of generating
extended config space addresses on their secondary interfaces.  If they
can't, we restrict devices below the bridge to only the 256-byte
PCI-compatible config space.

Signed-off-by: Gilles Buloz <gilles.buloz@kontron.com>
[bhelgaas: changelog, rework patch so bus_flags testing is all in
pci_bridge_child_ext_cfg_accessible()]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index ac91b6f..dcc41de 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -882,6 +882,45 @@ free:
        return err;
 }
 
+static bool pci_bridge_child_ext_cfg_accessible(struct pci_dev *bridge)
+{
+       int pos;
+       u32 status;
+
+       /*
+        * If extended config space isn't accessible on a bridge's primary
+        * bus, we certainly can't access it on the secondary bus.
+        */
+       if (bridge->bus->bus_flags & PCI_BUS_FLAGS_NO_EXTCFG)
+               return false;
+
+       /*
+        * PCIe Root Ports and switch ports are PCIe on both sides, so if
+        * extended config space is accessible on the primary, it's also
+        * accessible on the secondary.
+        */
+       if (pci_is_pcie(bridge) &&
+           (pci_pcie_type(bridge) == PCI_EXP_TYPE_ROOT_PORT ||
+            pci_pcie_type(bridge) == PCI_EXP_TYPE_UPSTREAM ||
+            pci_pcie_type(bridge) == PCI_EXP_TYPE_DOWNSTREAM))
+               return true;
+
+       /*
+        * For the other bridge types:
+        *   - PCI-to-PCI bridges
+        *   - PCIe-to-PCI/PCI-X forward bridges
+        *   - PCI/PCI-X-to-PCIe reverse bridges
+        * extended config space on the secondary side is only accessible
+        * if the bridge supports PCI-X Mode 2.
+        */
+       pos = pci_find_capability(bridge, PCI_CAP_ID_PCIX);
+       if (!pos)
+               return false;
+
+       pci_read_config_dword(bridge, pos + PCI_X_STATUS, &status);
+       return status & (PCI_X_STATUS_266MHZ | PCI_X_STATUS_533MHZ);
+}
+
 static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
                                           struct pci_dev *bridge, int busnr)
 {
@@ -923,6 +962,16 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
        pci_set_bus_of_node(child);
        pci_set_bus_speed(child);
 
+       /*
+        * Check whether extended config space is accessible on the child
+        * bus.  Note that we currently assume it is always accessible on
+        * the root bus.
+        */
+       if (!pci_bridge_child_ext_cfg_accessible(bridge)) {
+               child->bus_flags |= PCI_BUS_FLAGS_NO_EXTCFG;
+               pci_info(child, "extended config space not accessible\n");
+       }
+
        /* Set up default resource pointers and names */
        for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
                child->resource[i] = &bridge->resource[PCI_BRIDGE_RESOURCES+i];
@@ -1393,6 +1442,9 @@ int pci_cfg_space_size(struct pci_dev *dev)
        u32 status;
        u16 class;
 
+       if (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_EXTCFG)
+               return PCI_CFG_SPACE_SIZE;
+
        class = dev->class >> 8;
        if (class == PCI_CLASS_BRIDGE_HOST)
                return pci_cfg_space_size_ext(dev);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 73178a2..5eb97e1 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -217,6 +217,7 @@ enum pci_bus_flags {
        PCI_BUS_FLAGS_NO_MSI    = (__force pci_bus_flags_t) 1,
        PCI_BUS_FLAGS_NO_MMRBC  = (__force pci_bus_flags_t) 2,
        PCI_BUS_FLAGS_NO_AERSID = (__force pci_bus_flags_t) 4,
+       PCI_BUS_FLAGS_NO_EXTCFG = (__force pci_bus_flags_t) 8,
 };
 
 /* Values from Link Status register, PCIe r3.1, sec 7.8.8 */