[PATCH RFC v4 13/21] PCI: Include fixed BARs into the bus size calculating

[Sergey Miroshnichenko]

The only difference between the fixed and movable BARs is an offset
preservation during the release+reassign procedure on PCIe rescan.

When fixed BARs are included into the result of pbus_size_mem(), these
BARs can be restricted: assign them to direct parents only.

Signed-off-by: Sergey Miroshnichenko <s.miroshniche...@yadro.com>
---
 drivers/pci/setup-bus.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 551108f48df7..9d93f2b32bf1 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1007,12 +1007,20 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
                        struct resource *r = &dev->resource[i];
                        resource_size_t r_size;
 
-                       if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) ||
+                       if (r->parent ||
                            ((r->flags & mask) != type &&
                             (r->flags & mask) != type2 &&
                             (r->flags & mask) != type3))
                                continue;
                        r_size = resource_size(r);
+
+                       if (r->flags & IORESOURCE_PCI_FIXED) {
+                               if (pci_movable_bars_enabled())
+                                       size += r_size;
+
+                               continue;
+                       }
+
 #ifdef CONFIG_PCI_IOV
                        /* put SRIOV requested res to the optional list */
                        if (realloc_head && i >= PCI_IOV_RESOURCES &&
@@ -1351,6 +1359,8 @@ static void pdev_assign_fixed_resources(struct pci_dev 
*dev)
                while (b && !r->parent) {
                        assign_fixed_resource_on_bus(b, r);
                        b = b->parent;
+                       if (!r->parent && pci_movable_bars_enabled())
+                               break;
                }
        }
 }
-- 
2.20.1