Skip to content

Commit

Permalink
PCI: Indicate optional resource assignment failures
Browse files Browse the repository at this point in the history
Add pci_dbg() to note that an assignment failure was for an optional
resource and reword existing message about resource resize to say the
change was optional.

Link: https://lore.kernel.org/r/20241216175632.4175-22-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Tested-by: Xiaochun Lee <lixc17@lenovo.com>
Ilpo Järvinen authored and Bjorn Helgaas committed Feb 18, 2025
1 parent b3281eb commit 07854e0
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/pci/setup-bus.c
Original file line number Diff line number Diff line change
@@ -273,13 +273,17 @@ static void reassign_resources_sorted(struct list_head *realloc_head,
align = add_res->min_align;
if (!resource_size(res)) {
resource_set_range(res, align, add_size);
if (pci_assign_resource(dev, idx))
if (pci_assign_resource(dev, idx)) {
pci_dbg(dev,
"%s %pR: ignoring failure in optional allocation\n",
res_name, res);
reset_resource(res);
}
} else {
res->flags |= add_res->flags &
(IORESOURCE_STARTALIGN|IORESOURCE_SIZEALIGN);
if (pci_reassign_resource(dev, idx, add_size, align))
pci_info(dev, "%s %pR: failed to add %llx\n",
pci_info(dev, "%s %pR: failed to add optional %llx\n",
res_name, res,
(unsigned long long) add_size);
}

0 comments on commit 07854e0

Please sign in to comment.