Commit 0b26cd69 authored Sep 21, 2015 by Bjorn Helgaas Committed by Bjorn Helgaas Sep 23, 2015

PCI: Clear IORESOURCE_UNSET when reverting to firmware-assigned address

If pci_assign_resource() fails to assign space for a BAR, we may restore
the BAR to whatever firmware left there at boot-time (this depends on
whether the arch implements pcibios_retrieve_fw_addr()). The messages we
print are not as useful as they could be:

pci 0000:00:01.0: BAR 15: assigned [mem 0xc0000000-0xc01fffff 64bit pref]
pci 0000:01:00.0: BAR 0: no space for [mem size 0x10000000 pref]
pci 0000:01:00.0: BAR 0: trying firmware assignment [mem size 0x10000000 pref]
pci 0000:01:00.0: BAR 0: [mem size 0x10000000 pref] conflicts with PCI Bus 0000:00 [mem 0xc0000000-0xffffffff window]

The last two lines should contain the actual BAR address, not the size.
Clear IORESOURCE_UNSET so we print the address. If requesting the
firmware-assigned resource fails, mark it IORESOURCE_UNSET again.

This is a cosmetic change to clarify the message: previously, if
pci_revert_fw_address() succeeded, pci_assign_resource() cleared
IORESOURCE_UNSET anyway, so this isn't really a functional change.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=85491#c50

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent 6ff33f39

drivers/pci/setup-res.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,7 @@ static int pci_revert_fw_address(struct resource res, struct pci_dev dev,
		end = res->end;
		res->start = fw_addr;
		res->end = res->start + size - 1;
		res->flags &= ~IORESOURCE_UNSET;

		root = pci_find_parent_resource(dev, res);
		if (!root) {
		@@ -194,6 +195,7 @@ static int pci_revert_fw_address(struct resource res, struct pci_dev dev,
		resno, res, conflict->name, conflict);
		res->start = start;
		res->end = end;
		res->flags \|= IORESOURCE_UNSET;
		return -EBUSY;
		}
		return 0;

Admin message