| From e354597cce8d219d135d65e585dc4f30323486b9 Mon Sep 17 00:00:00 2001 |
| From: Peter Chubb <peterc@gelato.unsw.edu.au> |
| Date: Mon, 13 Oct 2008 11:49:04 +1100 |
| Subject: PCI: fix 64-vbit prefetchable memory resource BARs |
| |
| From: Peter Chubb <peterc@gelato.unsw.edu.au> |
| |
| commit e354597cce8d219d135d65e585dc4f30323486b9 upstream. |
| |
| 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> |
| Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/pci/probe.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/pci/probe.c |
| +++ b/drivers/pci/probe.c |
| @@ -219,7 +219,7 @@ static inline enum pci_bar_type decode_b |
| |
| 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; |
| } |
