svn commit: r218968 - head/sys/dev/pci

[John Baldwin]

Author: jhb
Date: Wed Feb 23 12:58:50 2011
New Revision: 218968
URL: http://svn.freebsd.org/changeset/base/218968

Log:
  Properly handle BARs bigger than 4G.  The '1' was treated as an int
  causing the size calculation to be truncated to the size of an int
  (32-bits on all current architectures).
  
  Submitted by:	Anish  akgupt3 of gmail
  MFC after:	1 week

Modified:
  head/sys/dev/pci/pci.c

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Wed Feb 23 12:56:25 2011	(r218967)
+++ head/sys/dev/pci/pci.c	Wed Feb 23 12:58:50 2011	(r218968)
@@ -2549,13 +2549,13 @@ pci_add_map(device_t bus, device_t dev, 
 			return (barlen);
 	}
 
-	count = 1 << mapsize;
+	count = (pci_addr_t)1 << mapsize;
 	if (basezero || base == pci_mapbase(testval)) {
 		start = 0;	/* Let the parent decide. */
 		end = ~0ULL;
 	} else {
 		start = base;
-		end = base + (1 << mapsize) - 1;
+		end = base + count - 1;
 	}
 	resource_list_add(rl, type, reg, start, end, count);
 
@@ -3764,7 +3764,7 @@ pci_reserve_map(device_t dev, device_t c
 	 * situation where we might allocate the excess to
 	 * another driver, which won't work.
 	 */
-	count = 1UL << mapsize;
+	count = (pci_addr_t)1 << mapsize;
 	if (RF_ALIGNMENT(flags) < mapsize)
 		flags = (flags & ~RF_ALIGNMENT_MASK) | RF_ALIGNMENT_LOG2(mapsize);
 	if (PCI_BAR_MEM(testval) && (testval & PCIM_BAR_MEM_PREFETCH))