diff options
| author | Wei Yang <weiyang@linux.vnet.ibm.com> | 2013-09-06 09:45:58 +0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-25 15:44:58 -0600 |
| commit | 3ad94b0d795c50836160781e63ee6bb752766aaf (patch) | |
| tree | 20cf9003c1aa3b1124cd6d0a1878a0568bf45d0f /drivers/pci/setup-bus.c | |
| parent | 77a0dfcd8a4d9a93a21c8be56eaeb65cd69b351d (diff) | |
| download | op-kernel-dev-3ad94b0d795c50836160781e63ee6bb752766aaf.zip op-kernel-dev-3ad94b0d795c50836160781e63ee6bb752766aaf.tar.gz | |
PCI: Pass type, width, and prefetchability for window alignment
When calculating window_alignment(), type information like IORESOURCE_MEM
and IORESOURCE_PREFETCH may not be enough. For example, on powernv, we
need to know whether the window is 64-bit or not.
This patch passes the full resource type (res->flags) for window alignment.
[bhelgaas: changelog]
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 8df686c..4ce83b2 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -982,7 +982,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, } min_align = calculate_mem_align(aligns, max_order); - min_align = max(min_align, window_alignment(bus, b_res->flags & mask)); + min_align = max(min_align, window_alignment(bus, b_res->flags)); size0 = calculate_memsize(size, min_size, 0, resource_size(b_res), min_align); if (children_add_size > add_size) add_size = children_add_size; |
