Author: marius
Date: Sun Jul 22 14:33:04 2012
New Revision: 238690
URL: http://svn.freebsd.org/changeset/base/238690

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/8 in r237187). 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]

Modified:
  stable/8/sys/dev/sym/sym_hipd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)
  stable/8/sys/dev/sound/   (props changed)
  stable/8/sys/dev/sound/pci/   (props changed)

Modified: stable/8/sys/dev/sym/sym_hipd.c
==============================================================================
--- stable/8/sys/dev/sym/sym_hipd.c     Sun Jul 22 14:32:49 2012        
(r238689)
+++ stable/8/sys/dev/sym/sym_hipd.c     Sun Jul 22 14:33:04 2012        
(r238690)
@@ -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;
        }
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to