PCI: Add missing MEM_64 mask in pci_assign_unassigned_bridge_resources()
authorYinghai Lu <yinghai@kernel.org>
Sat, 23 Aug 2014 01:15:07 +0000 (18:15 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 30 Sep 2014 19:56:46 +0000 (13:56 -0600)
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+
drivers/pci/setup-bus.c

index 6373985..0482235 100644 (file)
@@ -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);