diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-03-07 21:39:01 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-03-19 22:00:16 +0100 |
| commit | aa11fc58dc71c27701b1f9a529a36a38d4337722 (patch) | |
| tree | 626a75fa7f73d6c078c637a0404f4079b61be2f3 /drivers/pci/bus.c | |
| parent | resources: Set type in __request_region() (diff) | |
| download | linux-aa11fc58dc71c27701b1f9a529a36a38d4337722.tar.xz linux-aa11fc58dc71c27701b1f9a529a36a38d4337722.zip | |
PCI: Check all IORESOURCE_TYPE_BITS in pci_bus_alloc_from_region()
When allocating space from a bus resource, i.e., from apertures leading to
this bus, make sure the entire resource type matches. The previous code
assumed the IORESOURCE_TYPE_BITS field was a bitmask with only a single bit
set, but this is not true. IORESOURCE_TYPE_BITS is really an enumeration,
and we have to check all the bits.
See 72dcb1197228 ("resources: Add register address resource type").
No functional change. If we used this path for allocating IRQs, DMA
channels, or bus numbers, this would fix a bug because those types are
indistinguishable when masked by IORESOURCE_IO | IORESOURCE_MEM. But we
don't, so this shouldn't make any difference.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/bus.c')
| -rw-r--r-- | drivers/pci/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 38901665c770..e3bdc88668ec 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -144,7 +144,7 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, struct resource *r, avail; resource_size_t max; - type_mask |= IORESOURCE_IO | IORESOURCE_MEM; + type_mask |= IORESOURCE_TYPE_BITS; pci_bus_for_each_resource(bus, r, i) { if (!r) |