@@ -294,6 +294,8 @@ struct pci_bus *pci_bus_get(struct pci_bus *bus);
void pci_bus_put(struct pci_bus *bus);
bool pci_dev_bar_fixed(struct pci_dev *dev, struct resource *res);
+bool pci_dev_bar_enabled(const struct pci_dev *dev, int idx);
+bool pci_bus_check_bars_assigned(struct pci_bus *bus, bool complete_set);
/* PCIe link information from Link Capabilities 2 */
#define PCIE_LNKCAP2_SLS2SPEED(lnkcap2) \
@@ -412,6 +414,7 @@ static inline bool pci_dev_is_disconnected(const struct pci_dev *dev)
/* pci_dev priv_flags */
#define PCI_DEV_ADDED 0
+#define PCI_DEV_DISABLED_BARS 1
static inline void pci_dev_assign_added(struct pci_dev *dev, bool added)
{
@@ -35,6 +35,13 @@ static struct resource busn_resource = {
LIST_HEAD(pci_root_buses);
EXPORT_SYMBOL(pci_root_buses);
+/*
+ * This flag is used during pci_rescan_bus(), protected by pci_rescan_remove_lock:
+ * it indicates which BARs should be reassigned: every one, or only those which
+ * were assigned before the rescan.
+ */
+static bool pci_try_failed_bars = true;
+
static LIST_HEAD(pci_domain_busn_res_list);
struct pci_domain_busn_res {
@@ -43,6 +50,41 @@ struct pci_domain_busn_res {
int domain_nr;
};
+static void pci_dev_disable_bars(struct pci_dev *dev)
+{
+ assign_bit(PCI_DEV_DISABLED_BARS, &dev->priv_flags, true);
+}
+
+static void pci_dev_enable_bars(struct pci_dev *dev)
+{
+ assign_bit(PCI_DEV_DISABLED_BARS, &dev->priv_flags, false);
+}
+
+static bool pci_dev_bars_enabled(const struct pci_dev *dev)
+{
+ if (pci_try_failed_bars)
+ return true;
+
+ return !(test_bit(PCI_DEV_DISABLED_BARS, &dev->priv_flags));
+}
+
+bool pci_dev_bar_enabled(const struct pci_dev *dev, int idx)
+{
+ if (idx >= PCI_BRIDGE_RESOURCES)
+ return true;
+
+ if (pci_try_failed_bars)
+ return true;
+
+ if (test_bit(PCI_DEV_DISABLED_BARS, &dev->priv_flags))
+ return false;
+
+ if (!pci_dev_is_added(dev))
+ return true;
+
+ return dev->res_mask & (1 << idx);
+}
+
static struct resource *get_pci_domain_busn_res(int domain_nr)
{
struct pci_domain_busn_res *r;
@@ -3204,6 +3246,24 @@ bool pci_dev_bar_fixed(struct pci_dev *dev, struct resource *res)
return true;
}
+static unsigned int pci_dev_count_res_mask(struct pci_dev *dev)
+{
+ unsigned int res_mask = 0;
+ int i;
+
+ for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
+ struct resource *r = &dev->resource[i];
+
+ if (!r->flags || !r->parent ||
+ (r->flags & IORESOURCE_UNSET))
+ continue;
+
+ res_mask |= (1 << i);
+ }
+
+ return res_mask;
+}
+
static void pci_bus_rescan_prepare(struct pci_bus *bus)
{
struct pci_dev *dev;
@@ -3216,6 +3276,9 @@ static void pci_bus_rescan_prepare(struct pci_bus *bus)
list_for_each_entry(dev, &bus->devices, bus_list) {
struct pci_bus *child = dev->subordinate;
+ dev->res_mask = pci_dev_count_res_mask(dev);
+ pci_dev_enable_bars(dev);
+
if (child)
pci_bus_rescan_prepare(child);
@@ -3269,6 +3332,118 @@ static void pci_setup_bridges(struct pci_bus *bus)
pci_setup_bridge(bus);
}
+static struct pci_dev *pci_find_next_new_device(struct pci_bus *bus)
+{
+ struct pci_dev *dev;
+
+ if (!bus)
+ return NULL;
+
+ list_for_each_entry(dev, &bus->devices, bus_list) {
+ struct pci_bus *child_bus = dev->subordinate;
+
+ if (child_bus) {
+ struct pci_dev *next_new_dev;
+
+ next_new_dev = pci_find_next_new_device(child_bus);
+ if (next_new_dev)
+ return next_new_dev;
+ }
+
+ if (!pci_dev_is_added(dev) && pci_dev_bars_enabled(dev))
+ return dev;
+ }
+
+ return NULL;
+}
+
+/**
+ * pci_bus_check_bars_assigned - check BARs under the bridge
+ * @bus: Parent PCI bus
+ * @complete_set: check every BAR, otherwise only those assigned before
+ *
+ * Returns true if every BAR is assigned.
+ */
+bool pci_bus_check_bars_assigned(struct pci_bus *bus, bool complete_set)
+{
+ struct pci_dev *dev;
+ bool good = true;
+
+ if (!bus)
+ return false;
+
+ list_for_each_entry(dev, &bus->devices, bus_list) {
+ struct pci_bus *child = dev->subordinate;
+
+ if (complete_set) {
+ int i;
+
+ for (i = 0; i < PCI_BRIDGE_RESOURCES; ++i) {
+ struct resource *r = &dev->resource[i];
+
+ if (!(r->flags & IORESOURCE_UNSET))
+ continue;
+
+ pci_warn(dev, "BAR %d: requested but not assigned: %pR\n",
+ i, r);
+ good = false;
+ }
+ } else {
+ unsigned int res_mask;
+
+ if (!pci_dev_bars_enabled(dev))
+ continue;
+
+ res_mask = pci_dev_count_res_mask(dev);
+
+ if (dev->res_mask & ~res_mask) {
+ pci_err(dev, "Non-re-enabled resources found: 0x%x -> 0x%x\n",
+ dev->res_mask, res_mask);
+ good = false;
+ }
+ }
+
+ if (child && !pci_bus_check_bars_assigned(child, complete_set))
+ good = false;
+ }
+
+ return good;
+}
+
+static void pci_reassign_root_bus_resources(struct pci_bus *root)
+{
+ do {
+ struct pci_dev *next_new_dev;
+
+ pci_assign_unassigned_root_bus_resources(root);
+
+ if (pci_bus_check_bars_assigned(root, pci_try_failed_bars))
+ break;
+
+ if (pci_try_failed_bars) {
+ dev_warn(&root->dev, "failed to assign all BARs, retry without those failed before\n");
+
+ pci_bus_release_root_bridge_resources(root);
+ pci_try_failed_bars = false;
+ continue;
+ }
+
+ next_new_dev = pci_find_next_new_device(root);
+ if (!next_new_dev) {
+ dev_err(&root->dev, "failed to reassign BARs even after ignoring all the hot-added devices, reload the kernel with pci=no_movable_bars\n");
+ break;
+ }
+
+ dev_warn(&root->dev, "failed to reassign BARs, disable the next hot-added device %s and retry\n",
+ dev_name(&next_new_dev->dev));
+
+ pci_dev_disable_bars(next_new_dev);
+ pci_bus_release_root_bridge_resources(root);
+ } while (true);
+
+ pci_try_failed_bars = true;
+}
+
/**
* pci_rescan_bus - Scan a PCI bus for devices
* @bus: PCI bus to scan
@@ -3292,7 +3467,7 @@ unsigned int pci_rescan_bus(struct pci_bus *bus)
max = pci_scan_child_bus(root);
pci_bus_release_root_bridge_resources(root);
- pci_assign_unassigned_root_bus_resources(root);
+ pci_reassign_root_bus_resources(root);
pci_setup_bridges(root);
pci_bus_rescan_done(root);
@@ -139,7 +139,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
if (r->flags & IORESOURCE_PCI_FIXED)
continue;
- if (!(r->flags) || r->parent)
+ if (!(r->flags) || r->parent || !pci_dev_bar_enabled(dev, i))
continue;
r_align = pci_resource_alignment(dev, r);
@@ -897,7 +897,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
struct resource *r = &dev->resource[i];
unsigned long r_size;
- if (r->parent || !(r->flags & IORESOURCE_IO))
+ if (r->parent || !(r->flags & IORESOURCE_IO) ||
+ !pci_dev_bar_enabled(dev, i))
continue;
r_size = resource_size(r);
@@ -1017,6 +1018,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
resource_size_t r_size;
if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) ||
+ !pci_dev_bar_enabled(dev, i) ||
((r->flags & mask) != type &&
(r->flags & mask) != type2 &&
(r->flags & mask) != type3))
@@ -472,6 +472,8 @@ int pci_enable_resources(struct pci_dev *dev, int mask)
if ((i == PCI_ROM_RESOURCE) &&
(!(r->flags & IORESOURCE_ROM_ENABLE)))
continue;
+ if (!pci_dev_bar_enabled(dev, i))
+ continue;
if (r->flags & IORESOURCE_UNSET) {
pci_err(dev, "can't enable device: BAR %d %pR not assigned\n",
@@ -382,6 +382,7 @@ struct pci_dev {
*/
unsigned int irq;
struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
+ unsigned int res_mask; /* Bitmask of assigned resources */
bool match_driver; /* Skip attaching driver */
When movable BARs are enabled, the PCI subsystem at first releases all the bridge windows and then attempts to assign resources both to previously working devices and to the newly hot-added ones, with the same priority. If a hot-added device gets its BARs first, this may lead to lack of space for already working devices, which is unacceptable. If that happens, mark one of the new devices with the newly introduced flag PCI_DEV_DISABLED_BARS (if it is not yet marked) and retry the BAR recalculation. The worst case would be no BARs for hot-added devices, while all the rest just continue working. The algorithm is simple and it doesn't retry different subsets of hot-added devices in case of a failure, e.g. if there are no space to allocate BARs for both hot-added devices A and B, but is enough for just A, the A will be marked with PCI_DEV_DISABLED_BARS first, then (after the next failure) - B. As a result, A will not get BARs while it could. This issue is only relevant when hot-adding two and more devices simultaneously. Add a new res_mask bitmask to the struct pci_dev for storing the indices of assigned BARs. When preparing to the next rescan, all PCI_DEV_DISABLED_BARS marks are unset, so the kernel can retry to assign them. Before a rescan, some working devices may have assigned only part of their BARs - for example, if BIOS didn't allocate them. With this patch, the kernel assigns BARs in three steps: - first try every BAR, even those that weren't assigned before; - if that fails, retry without those failed BARs; - if that fails, retry without one of hotplugged devices. Signed-off-by: Sergei Miroshnichenko <s.miroshnichenko@yadro.com> --- drivers/pci/pci.h | 3 + drivers/pci/probe.c | 177 +++++++++++++++++++++++++++++++++++++++- drivers/pci/setup-bus.c | 6 +- drivers/pci/setup-res.c | 2 + include/linux/pci.h | 1 + 5 files changed, 186 insertions(+), 3 deletions(-)