Merge branch 'pci/resource' into next

* pci/resource: (26 commits)
  Revert "[PATCH] Insert GART region into resource map"
  PCI: Log IDE resource quirk in dmesg
  PCI: Change pci_bus_alloc_resource() type_mask to unsigned long
  PCI: Check all IORESOURCE_TYPE_BITS in pci_bus_alloc_from_region()
  resources: Set type in __request_region()
  PCI: Don't check resource_size() in pci_bus_alloc_resource()
  s390/PCI: Use generic pci_enable_resources()
  tile PCI RC: Use default pcibios_enable_device()
  sparc/PCI: Use default pcibios_enable_device() (Leon only)
  sh/PCI: Use default pcibios_enable_device()
  microblaze/PCI: Use default pcibios_enable_device()
  alpha/PCI: Use default pcibios_enable_device()
  PCI: Add "weak" generic pcibios_enable_device() implementation
  PCI: Don't enable decoding if BAR hasn't been assigned an address
  PCI: Mark 64-bit resource as IORESOURCE_UNSET if we only support 32-bit
  PCI: Don't try to claim IORESOURCE_UNSET resources
  PCI: Check IORESOURCE_UNSET before updating BAR
  PCI: Don't clear IORESOURCE_UNSET when updating BAR
  PCI: Mark resources as IORESOURCE_UNSET if we can't assign them
  PCI: Remove pci_find_parent_resource() use for allocation
  ...

1 files changed, 25 insertions, 12 deletions

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 5c060b152ce6..7eed671d5586 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -44,6 +44,9 @@ void pci_update_resource(struct pci_dev *dev, int resno)
         if (!res->flags)
                 return;
 
+        if (res->flags & IORESOURCE_UNSET)
+                return;
+
         /*
          * Ignore non-moveable resources.  This might be legacy resources for
          * which no functional BAR register exists or another important
@@ -101,11 +104,6 @@ void pci_update_resource(struct pci_dev *dev, int resno)
 
         if (disable)
                 pci_write_config_word(dev, PCI_COMMAND, cmd);
-
-        res->flags &= ~IORESOURCE_UNSET;
-        dev_dbg(&dev->dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx])\n",
-                resno, res, (unsigned long long)region.start,
-                (unsigned long long)region.end);
 }
 
 int pci_claim_resource(struct pci_dev *dev, int resource)
@@ -113,18 +111,23 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
         struct resource *res = &dev->resource[resource];
         struct resource *root, *conflict;
 
+        if (res->flags & IORESOURCE_UNSET) {
+                dev_info(&dev->dev, "can't claim BAR %d %pR: no address assigned\n",
+                         resource, res);
+                return -EINVAL;
+        }
+
         root = pci_find_parent_resource(dev, res);
         if (!root) {
-                dev_info(&dev->dev, "no compatible bridge window for %pR\n",
-                         res);
+                dev_info(&dev->dev, "can't claim BAR %d %pR: no compatible bridge window\n",
+                         resource, res);
                 return -EINVAL;
         }
 
         conflict = request_resource_conflict(root, res);
         if (conflict) {
-                dev_info(&dev->dev,
-                         "address space collision: %pR conflicts with %s %pR\n",
-                         res, conflict->name, conflict);
+                dev_info(&dev->dev, "can't claim BAR %d %pR: address conflict with %s %pR\n",
+                         resource, res, conflict->name, conflict);
                 return -EBUSY;
         }
 
@@ -263,6 +266,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
         resource_size_t align, size;
         int ret;
 
+        res->flags |= IORESOURCE_UNSET;
         align = pci_resource_alignment(dev, res);
         if (!align) {
                 dev_info(&dev->dev, "BAR %d: can't assign %pR "
@@ -282,6 +286,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
                 ret = pci_revert_fw_address(res, dev, resno, size);
 
         if (!ret) {
+                res->flags &= ~IORESOURCE_UNSET;
                 res->flags &= ~IORESOURCE_STARTALIGN;
                 dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res);
                 if (resno < PCI_BRIDGE_RESOURCES)
@@ -297,6 +302,7 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz
         resource_size_t new_size;
         int ret;
 
+        res->flags |= IORESOURCE_UNSET;
         if (!res->parent) {
                 dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR "
                          "\n", resno, res);
@@ -307,6 +313,7 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz
         new_size = resource_size(res) + addsize;
         ret = _pci_assign_resource(dev, resno, new_size, min_align);
         if (!ret) {
+                res->flags &= ~IORESOURCE_UNSET;
                 res->flags &= ~IORESOURCE_STARTALIGN;
                 dev_info(&dev->dev, "BAR %d: reassigned %pR\n", resno, res);
                 if (resno < PCI_BRIDGE_RESOURCES)
@@ -336,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;
                 }