diff options
| author | Peter Chubb <peterc@gelato.unsw.edu.au> | 2008-10-13 11:49:04 +1100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-10-20 10:54:30 -0700 |
| commit | e354597cce8d219d135d65e585dc4f30323486b9 (patch) | |
| tree | dbf2a270f874c5ef56250021927de9ce56392e35 /drivers/pci/probe.c | |
| parent | 557848c3c03ad1d1e66cb3b5b06698e3a9ebc33c (diff) | |
| download | kernel_samsung_smdk4412-e354597cce8d219d135d65e585dc4f30323486b9.zip kernel_samsung_smdk4412-e354597cce8d219d135d65e585dc4f30323486b9.tar.gz kernel_samsung_smdk4412-e354597cce8d219d135d65e585dc4f30323486b9.tar.bz2 | |
PCI: fix 64-vbit prefetchable memory resource BARs
Since patch 6ac665c63dcac8fcec534a1d224ecbb8b867ad59 my infiniband
controller hasn't worked. This is because it has 64-bit prefetchable
memory, which was mistakenly being taken to be 32-bit memory. The
resource flags in this case are PCI_BASE_ADDRESS_MEM_TYPE_64 |
PCI_BASE_ADDRESS_MEM_PREFETCH.
This patch checks only for the PCI_BASE_ADDRESS_MEM_TYPE_64 bit; thus
whether the region is prefetchable or not is ignored. This fixes my
Infiniband.
Reviewed-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/probe.c')
| -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 f6754e8..49599ac 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -217,7 +217,7 @@ static inline enum pci_bar_type decode_bar(struct resource *res, u32 bar) res->flags = bar & ~PCI_BASE_ADDRESS_MEM_MASK; - if (res->flags == PCI_BASE_ADDRESS_MEM_TYPE_64) + if (res->flags & PCI_BASE_ADDRESS_MEM_TYPE_64) return pci_bar_mem64; return pci_bar_mem32; } |