PCI: Reject BAR above 4GB if dma_addr_t is too small
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 30 Apr 2014 00:33:09 +0000 (18:33 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 23 May 2014 16:47:19 +0000 (10:47 -0600)
We can only handle BARs above 4GB if dma_addr_t (not resource_size_t) is 64
bits wide.  If we have a 64-bit resource_size_t and a 32-bit dma_addr_t,
we can't deal with BARs above 4GB.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/probe.c

index c7f8b717c2e76530053a74d29cc6152b664f131c..afae3bf405fa53ff49a04d30925850392c091545 100644 (file)
@@ -253,7 +253,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                        goto out;
                }
 
-               if ((sizeof(resource_size_t) < 8) && l) {
+               if ((sizeof(dma_addr_t) < 8) && l) {
                        /* Address above 32-bit boundary; disable the BAR */
                        pci_write_config_dword(dev, pos, 0);
                        pci_write_config_dword(dev, pos + 4, 0);