Browse Source

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: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Ingo Molnar 16 years ago
parent
commit
104bafcfab
2 changed files with 4 additions and 4 deletions
  1. 2 2
      arch/x86/pci/i386.c
  2. 2 2
      drivers/pci/setup-res.c

+ 2 - 2
arch/x86/pci/i386.c

@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
 				pr = pci_find_parent_resource(dev, r);
 				pr = pci_find_parent_resource(dev, r);
 				if (!r->start || !pr ||
 				if (!r->start || !pr ||
 				    request_resource(pr, r) < 0) {
 				    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.
 					 * Something is wrong with the region.
 					 * Invalidate the resource to prevent
 					 * Invalidate the resource to prevent
@@ -170,7 +170,7 @@ static void __init pcibios_allocate_resources(int pass)
 					r->flags, disabled, pass);
 					r->flags, disabled, pass);
 				pr = pci_find_parent_resource(dev, r);
 				pr = pci_find_parent_resource(dev, r);
 				if (!pr || request_resource(pr, r) < 0) {
 				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 */
 					/* We'll assign a new address later */
 					r->end -= r->start;
 					r->end -= r->start;
 					r->start = 0;
 					r->start = 0;

+ 2 - 2
drivers/pci/setup-res.c

@@ -134,7 +134,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
 
 
 	align = resource_alignment(res);
 	align = resource_alignment(res);
 	if (!align) {
 	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",
 			"alignment) %pR flags %#lx\n",
 			resno, res, res->flags);
 			resno, res, res->flags);
 		return -EINVAL;
 		return -EINVAL;
@@ -157,7 +157,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
 	}
 	}
 
 
 	if (ret) {
 	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);
 			resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
 	} else {
 	} else {
 		res->flags &= ~IORESOURCE_STARTALIGN;
 		res->flags &= ~IORESOURCE_STARTALIGN;