summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-04-30 02:33:09 +0200
committerBjorn Helgaas <bhelgaas@google.com>2014-05-23 18:47:19 +0200
commitd1a313e4b6ccbb61c746ee10ac198970516e9afc (patch)
treee068d34fbd33e5e56322c438f71de2497ac2423a /drivers/pci
parentPCI: Fail safely if we can't handle BARs larger than 4GB (diff)
downloadlinux-d1a313e4b6ccbb61c746ee10ac198970516e9afc.tar.xz
linux-d1a313e4b6ccbb61c746ee10ac198970516e9afc.zip
PCI: Reject BAR above 4GB if dma_addr_t is too small
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index c7f8b717c2e7..afae3bf405fa 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -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);