From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 30 Apr 2014 00:33:09 +0000 (-0600)
Subject: PCI: Reject BAR above 4GB if dma_addr_t is too small
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d1a313e4b6ccbb61c746ee10ac198970516e9afc;p=linux-beck.git

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>
---

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);