PCI: Distribute available resources for root buses, too

Previously we distributed spare resources only upon hot-add, so if the
initial root bus scan found devices that had not been fully configured by
the BIOS, we allocated only enough resources to cover what was then
present. If some of those devices were hotplug bridges, we did not leave
any additional resource space for future expansion.

Distribute the available resources for root buses, too, to make this work
the same way as the normal hotplug case.

A previous commit to do this was reverted due to a regression reported by
Jonathan Cameron:

  e96e27fc6f79 ("PCI: Distribute available resources for root buses, too")
  5632e2beaf9d ("Revert "PCI: Distribute available resources for root buses, too"")

This commit changes pci_bridge_resources_not_assigned() to work with
bridges that do not have all the resource windows programmed by the boot
firmware (previously we expected all I/O, memory and prefetchable memory
were programmed).

Link: https://bugzilla.kernel.org/show_bug.cgi?id=216000
Link: https://lore.kernel.org/r/20220905080232.36087-5-mika.westerberg@linux.intel.com
Link: https://lore.kernel.org/r/20230131092405.29121-4-mika.westerberg@linux.intel.com
Reported-by: Chris Chiu <chris.chiu@canonical.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index b7b8dddb77722ab7da2698ca5ec3b4d312c6456a..c690572b10ce7b9d5bf672256f4e52dfa8de52e8 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1770,7 +1770,10 @@ static void adjust_bridge_window(struct pci_dev *bridge, struct resource *res,
        }
 
        res->end = res->start + new_size - 1;
-       remove_from_list(add_list, res);
+
+       /* If the resource is part of the add_list, remove it now */
+       if (add_list)
+               remove_from_list(add_list, res);
 }
 
 static void remove_dev_resource(struct resource *avail, struct pci_dev *dev,
@@ -1972,6 +1975,8 @@ static void pci_bridge_distribute_available_resources(struct pci_dev *bridge,
        if (!bridge->is_hotplug_bridge)
                return;
 
+       pci_dbg(bridge, "distributing available resources\n");
+
        /* Take the initial extra resources from the hotplug port */
        available_io = bridge->resource[PCI_BRIDGE_IO_WINDOW];
        available_mmio = bridge->resource[PCI_BRIDGE_MEM_WINDOW];
@@ -1983,6 +1988,54 @@ static void pci_bridge_distribute_available_resources(struct pci_dev *bridge,
                                               available_mmio_pref);
 }
 
+static bool pci_bridge_resources_not_assigned(struct pci_dev *dev)
+{
+       const struct resource *r;
+
+       /*
+        * If the child device's resources are not yet assigned it means we
+        * are configuring them (not the boot firmware), so we should be
+        * able to extend the upstream bridge resources in the same way we
+        * do with the normal hotplug case.
+        */
+       r = &dev->resource[PCI_BRIDGE_IO_WINDOW];
+       if (r->flags && !(r->flags & IORESOURCE_STARTALIGN))
+               return false;
+       r = &dev->resource[PCI_BRIDGE_MEM_WINDOW];
+       if (r->flags && !(r->flags & IORESOURCE_STARTALIGN))
+               return false;
+       r = &dev->resource[PCI_BRIDGE_PREF_MEM_WINDOW];
+       if (r->flags && !(r->flags & IORESOURCE_STARTALIGN))
+               return false;
+
+       return true;
+}
+
+static void
+pci_root_bus_distribute_available_resources(struct pci_bus *bus,
+                                           struct list_head *add_list)
+{
+       struct pci_dev *dev, *bridge = bus->self;
+
+       for_each_pci_bridge(dev, bus) {
+               struct pci_bus *b;
+
+               b = dev->subordinate;
+               if (!b)
+                       continue;
+
+               /*
+                * Need to check "bridge" here too because it is NULL
+                * in case of root bus.
+                */
+               if (bridge && pci_bridge_resources_not_assigned(dev))
+                       pci_bridge_distribute_available_resources(bridge,
+                                                                 add_list);
+               else
+                       pci_root_bus_distribute_available_resources(b, add_list);
+       }
+}
+
 /*
  * First try will not touch PCI bridge res.
  * Second and later try will clear small leaf bridge res.
@@ -2022,6 +2075,8 @@ again:
         */
        __pci_bus_size_bridges(bus, add_list);
 
+       pci_root_bus_distribute_available_resources(bus, add_list);
+
        /* Depth last, allocate resources and update the hardware. */
        __pci_bus_assign_resources(bus, add_list, &fail_head);
        if (add_list)