diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2014-08-22 18:15:07 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-30 13:56:46 -0600 |
| commit | d61b0e87d2dfba3706dbbd6c7c6fd41c3d845685 (patch) | |
| tree | a8ff1a5687b2874e5e155488e7f0a26964238830 /drivers/pci | |
| parent | 8d38821cbcf51292cd5a23469d03bd38932a3ba9 (diff) | |
| download | op-kernel-dev-d61b0e87d2dfba3706dbbd6c7c6fd41c3d845685.zip op-kernel-dev-d61b0e87d2dfba3706dbbd6c7c6fd41c3d845685.tar.gz | |
PCI: Add missing MEM_64 mask in pci_assign_unassigned_bridge_resources()
In 5b28541552ef ("PCI: Restrict 64-bit prefetchable bridge windows to
64-bit resources"), we added IORESOURCE_MEM_64 to the mask in
pci_assign_unassigned_root_bus_resources(), but not to the mask in
pci_assign_unassigned_bridge_resources().
Add IORESOURCE_MEM_64 to the pci_assign_unassigned_bridge_resources() type
mask.
Fixes: 5b28541552ef ("PCI: Restrict 64-bit prefetchable bridge windows to 64-bit resources")
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org # v3.16+
Diffstat (limited to 'drivers/pci')
| -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 6373985..0482235 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1652,7 +1652,7 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge) struct pci_dev_resource *fail_res; int retval; unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM | - IORESOURCE_PREFETCH; + IORESOURCE_PREFETCH | IORESOURCE_MEM_64; again: __pci_bus_size_bridges(parent, &add_list); |
