Skip to content

Commit 688d191

Browse files
author
Linus Torvalds
committed
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.
1 parent d7ed538 commit 688d191

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/pci/bus.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
6060
continue;
6161

6262
/* Ok, try it out.. */
63-
ret = allocate_resource(r, res, size, min, -1, align,
63+
ret = allocate_resource(r, res, size,
64+
r->start ? : min,
65+
-1, align,
6466
alignf, alignf_data);
6567
if (ret == 0)
6668
break;

0 commit comments

Comments
 (0)