From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 2 Aug 2005 21:55:40 +0000 (-0700)
Subject: pci: make bus resource start address override minimum IO address
X-Git-Tag: v2.6.13-rc6~80
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=688d191821de7893043f5a37970472627aaffa4e;p=linux-2.6

pci: make bus resource start address override minimum IO address

The reason we have PCIBIOS_MIN_IO and PCIBIOS_MIN_CARDBUS_IO is because
we want to protect badly documented motherboard PCI resources and thus
don't want to allocate new resources in low IO/MEM space.

However, if we have already discovered a PCI bridge with a specified
resource base, that should override that decision.

This change will allow us to move the "careful" region upwards without
resulting in problems allocating resources in low mappings.  This was
brought on by us having allocated a bus resource at 0x1000, conflicting
with a undocumented VAIO Sony PI resources.
---

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index fedae89d8f..fb9a11243d 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -60,7 +60,9 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
 			continue;
 
 		/* Ok, try it out.. */
-		ret = allocate_resource(r, res, size, min, -1, align,
+		ret = allocate_resource(r, res, size,
+					r->start ? : min,
+					-1, align,
 					alignf, alignf_data);
 		if (ret == 0)
 			break;