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

[John Baldwin]

Author: jhb
Date: Thu Mar  5 15:28:46 2009
New Revision: 189400
URL: http://svn.freebsd.org/changeset/base/189400

Log:
  Honor the prefetchable flag in memory BARs by setting the RF_PREFETCHABLE
  flag when calling bus_alloc_resource() to allocate resources from a parent
  PCI bridge.  For PCI-PCI bridges this asks the bridge to satisfy the
  request using the prefetchable memory range rather than the normal
  memory range.
  
  Reviewed by:	imp
  Reported by:	scottl
  MFC after:	1 week

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

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Thu Mar  5 12:04:42 2009	(r189399)
+++ head/sys/dev/pci/pci.c	Thu Mar  5 15:28:46 2009	(r189400)
@@ -2313,9 +2313,11 @@ pci_add_map(device_t pcib, device_t bus,
 	PCIB_WRITE_CONFIG(pcib, b, s, f, reg, map, 4);
 	PCIB_WRITE_CONFIG(pcib, b, s, f, PCIR_COMMAND, cmd, 2);
 
-	if (PCI_BAR_MEM(map))
+	if (PCI_BAR_MEM(map)) {
 		type = SYS_RES_MEMORY;
-	else
+		if (map & PCIM_BAR_MEM_PREFETCH)
+			prefetch = 1;
+	} else
 		type = SYS_RES_IOPORT;
 	ln2size = pci_mapsize(testval);
 	ln2range = pci_maprange(testval);
@@ -3488,6 +3490,8 @@ pci_alloc_map(device_t dev, device_t chi
 	count = 1UL << 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))
+		flags |= RF_PREFETCHABLE;
 
 	/*
 	 * Allocate enough resource, and then write back the