PCI: generic: Allocate config space windows after limiting bus number…

… range The number of config space windows allocated for the host bridge depends on how many bus numbers are below the bridge. Instead of first allocating the windows and then limiting the bus resource, this patch reshuffles the code so that if any limitation is applied to the bus resource, it is taken into account in the windows allocation. [bhelgaas: changelog] Signed-off-by: Lorenzo Pieralisi <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Acked-by: Will Deacon <[email protected]>
cujomalainey · Nov 5, 2014 · a5525b2 · a5525b2
1 parent f114040
commit a5525b2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
@@ -276,17 +276,17 @@ static int gen_pci_parse_map_cfg_windows(struct gen_pci *pci)
  return err;
  }
 
- pci->cfg.win = devm_kcalloc(dev, resource_size(&pci->cfg.bus_range),
- sizeof(*pci->cfg.win), GFP_KERNEL);
- if (!pci->cfg.win)
- return -ENOMEM;
-
  /* Limit the bus-range to fit within reg */
  bus_max = pci->cfg.bus_range.start +
  (resource_size(&pci->cfg.res) >> pci->cfg.ops->bus_shift) - 1;
  pci->cfg.bus_range.end = min_t(resource_size_t, pci->cfg.bus_range.end,
  bus_max);
 
+ pci->cfg.win = devm_kcalloc(dev, resource_size(&pci->cfg.bus_range),
+ sizeof(*pci->cfg.win), GFP_KERNEL);
+ if (!pci->cfg.win)
+ return -ENOMEM;
+
  /* Map our Configuration Space windows */
  if (!devm_request_mem_region(dev, pci->cfg.res.start,
  resource_size(&pci->cfg.res),