Commit 104bafcf authored by Ingo Molnar's avatar Ingo Molnar Committed by Jesse Barnes
Browse files

PCI: Don't carp about BAR allocation failures in quiet boot 



These are easy to trigger (more or less harmlessly) with multiple video
cards, since the ROM BAR will typically not be given any space by the
BIOS bridge setup.  No reason to punish quiet boot for this.

Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent a367f74c

arch/x86/pci/i386.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 
				pr = pci_find_parent_resource(dev, r);

				if (!r->start || !pr ||

				    request_resource(pr, r) < 0) {

					dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);

					dev_info(&dev->dev, "BAR %d: can't allocate resource\n", idx);

					/*

					 * Something is wrong with the region.

					 * Invalidate the resource to prevent
@@ -170,7 +170,7 @@ static void __init pcibios_allocate_resources(int pass) 
					r->flags, disabled, pass);

				pr = pci_find_parent_resource(dev, r);

				if (!pr || request_resource(pr, r) < 0) {

					dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);

					dev_info(&dev->dev, "BAR %d: can't allocate resource\n", idx);

					/* We'll assign a new address later */

					r->end -= r->start;

					r->start = 0;

drivers/pci/setup-res.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno) 


	align = resource_alignment(res);

	if (!align) {

		dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "

		dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "

			"alignment) %pR flags %#lx\n",

			resno, res, res->flags);

		return -EINVAL;
@@ -157,7 +157,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno) 
	}



	if (ret) {

		dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",

		dev_info(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",

			resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);

	} else {

		res->flags &= ~IORESOURCE_STARTALIGN;

CRA Git | Maintained and supported by SUSTech CRA and CCSE