diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-04-29 20:33:09 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-23 12:47:19 -0400 |
commit | d1a313e4b6ccbb61c746ee10ac198970516e9afc (patch) | |
tree | e068d34fbd33e5e56322c438f71de2497ac2423a | |
parent | 23b13bc76f359e99140baf083dc44314f4eb1b87 (diff) |
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>
-rw-r--r-- | drivers/pci/probe.c | 2 |
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, | |||
253 | goto out; | 253 | goto out; |
254 | } | 254 | } |
255 | 255 | ||
256 | if ((sizeof(resource_size_t) < 8) && l) { | 256 | if ((sizeof(dma_addr_t) < 8) && l) { |
257 | /* Address above 32-bit boundary; disable the BAR */ | 257 | /* Address above 32-bit boundary; disable the BAR */ |
258 | pci_write_config_dword(dev, pos, 0); | 258 | pci_write_config_dword(dev, pos, 0); |
259 | pci_write_config_dword(dev, pos + 4, 0); | 259 | pci_write_config_dword(dev, pos + 4, 0); |