svn commit: r233705 - in stable/9/sys: dev/twa i386/conf

[John Baldwin]

Author: jhb
Date: Fri Mar 30 17:38:28 2012
New Revision: 233705
URL: http://svn.freebsd.org/changeset/base/233705

Log:
  MFC 232669:
  Use bus_get_dma_tag() to inherit the 4G boundary restriction from the
  parent PCI bus and remove the home-grown version in this driver.

Modified:
  stable/9/sys/dev/twa/tw_osl.h
  stable/9/sys/dev/twa/tw_osl_freebsd.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/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)

Modified: stable/9/sys/dev/twa/tw_osl.h
==============================================================================
--- stable/9/sys/dev/twa/tw_osl.h	Fri Mar 30 17:03:06 2012	(r233704)
+++ stable/9/sys/dev/twa/tw_osl.h	Fri Mar 30 17:38:28 2012	(r233705)
@@ -55,12 +55,6 @@
 #define TW_OSLI_MAX_NUM_IOS		(TW_OSLI_MAX_NUM_REQUESTS - 2)
 #define TW_OSLI_MAX_NUM_AENS		0x100
 
-#ifdef PAE
-#define	TW_OSLI_DMA_BOUNDARY		(1u << 31)
-#else
-#define	TW_OSLI_DMA_BOUNDARY		((bus_size_t)((uint64_t)1 << 32))
-#endif
-
 /* Possible values of req->state. */
 #define TW_OSLI_REQ_STATE_INIT		0x0	/* being initialized */
 #define TW_OSLI_REQ_STATE_BUSY		0x1	/* submitted to CL */

Modified: stable/9/sys/dev/twa/tw_osl_freebsd.c
==============================================================================
--- stable/9/sys/dev/twa/tw_osl_freebsd.c	Fri Mar 30 17:03:06 2012	(r233704)
+++ stable/9/sys/dev/twa/tw_osl_freebsd.c	Fri Mar 30 17:38:28 2012	(r233705)
@@ -562,9 +562,9 @@ tw_osli_alloc_mem(struct twa_softc *sc)
 	}
 
 	/* Create the parent dma tag. */
-	if (bus_dma_tag_create(NULL,			/* parent */
+	if (bus_dma_tag_create(bus_get_dma_tag(sc->bus_dev), /* parent */
 				sc->alignment,		/* alignment */
-				TW_OSLI_DMA_BOUNDARY,	/* boundary */
+				0,			/* boundary */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR, 	/* highaddr */
 				NULL, NULL, 		/* filter, filterarg */