svn commit: r238689 - stable/9/sys/dev/sym

[Marius Strobl]

Author: marius
Date: Sun Jul 22 14:32:49 2012
New Revision: 238689
URL: http://svn.freebsd.org/changeset/base/238689

Log:
  MFC: r238621
  
  Revert the use of BUS_DMA_ALLOCNOW when creating the DMA tag for user
  data introduced in r236061 (MFC'ed to stable/9 in r237186). Using that
  flag doesn't make that much sense on this case as the DMA maps using
  it are also created during sym_pci_attach(). Moreover, due to the
  maxsegsz parameter used, doing so may exhaust the bounce pages pool
  on architectures requiring bounce pages. [1]
  While at it, use a slightly more appropriate maxsegsz parameter.
  
  PR:		169526
  Submitted by:	Mike Watters [1]
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/sym/sym_hipd.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/isp/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/dev/sym/sym_hipd.c
==============================================================================
--- stable/9/sys/dev/sym/sym_hipd.c	Sun Jul 22 14:31:42 2012	(r238688)
+++ stable/9/sys/dev/sym/sym_hipd.c	Sun Jul 22 14:32:49 2012	(r238689)
@@ -8537,8 +8537,8 @@ sym_pci_attach(device_t dev)
 	 */
 	if (bus_dma_tag_create(np->bus_dmat, 1, SYM_CONF_DMA_BOUNDARY,
 	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
-	    BUS_SPACE_MAXSIZE, SYM_CONF_MAX_SG, SYM_CONF_DMA_BOUNDARY,
-	    BUS_DMA_ALLOCNOW, busdma_lock_mutex, &np->mtx, &np->data_dmat)) {
+	    BUS_SPACE_MAXSIZE_32BIT, SYM_CONF_MAX_SG, SYM_CONF_DMA_BOUNDARY,
+	    0, busdma_lock_mutex, &np->mtx, &np->data_dmat)) {
 		device_printf(dev, "failed to create DMA tag.\n");
 		goto attach_failed;
 	}