OSDN Git Service

PCI: Don't enable decoding if BAR hasn't been assigned an address
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 26 Feb 2014 18:26:00 +0000 (11:26 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 19 Mar 2014 21:00:14 +0000 (15:00 -0600)
Don't enable memory or I/O decoding if we haven't assigned or claimed the
BAR's resource.

If we enable decoding for a BAR that hasn't been assigned an address, we'll
likely cause bus conflicts.  This declines to enable decoding for resources
with IORESOURCE_UNSET.

Note that drivers can use pci_enable_device_io() or pci_enable_device_mem()
if they only care about specific types of BARs.  In that case, we don't
bother checking whether the corresponding resources are assigned or
claimed.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/setup-res.c

index 6e44313..7eed671 100644 (file)
@@ -343,9 +343,15 @@ int pci_enable_resources(struct pci_dev *dev, int mask)
                                (!(r->flags & IORESOURCE_ROM_ENABLE)))
                        continue;
 
+               if (r->flags & IORESOURCE_UNSET) {
+                       dev_err(&dev->dev, "can't enable device: BAR %d %pR not assigned\n",
+                               i, r);
+                       return -EINVAL;
+               }
+
                if (!r->parent) {
-                       dev_err(&dev->dev, "device not available "
-                               "(can't reserve %pR)\n", r);
+                       dev_err(&dev->dev, "can't enable device: BAR %d %pR not claimed\n",
+                               i, r);
                        return -EINVAL;
                }