Skip to content

Commit

Permalink
pci: make bus resource start address override minimum IO address
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Linus Torvalds committed Aug 2, 2005
1 parent d7ed538 commit 688d191
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/pci/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 688d191

Please sign in to comment.