From owner-p4-projects@FreeBSD.ORG  Sat Apr  8 06:17:21 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5F02B16A405; Sat,  8 Apr 2006 06:17:21 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3AD6316A402
	for <perforce@freebsd.org>; Sat,  8 Apr 2006 06:17:21 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CF23A43D55
	for <perforce@freebsd.org>; Sat,  8 Apr 2006 06:17:20 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k386HK6a008330
	for <perforce@freebsd.org>; Sat, 8 Apr 2006 06:17:20 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k386HKPW008327
	for perforce@freebsd.org; Sat, 8 Apr 2006 06:17:20 GMT
	(envelope-from jmg@freebsd.org)
Date: Sat, 8 Apr 2006 06:17:20 GMT
Message-Id: <200604080617.k386HKPW008327@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94792 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Apr 2006 06:17:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=94792

Change 94792 by jmg@jmg_carbon-60 on 2006/04/08 06:16:58

	teach ata and em about new parent tags..

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/dev/ata/ata-dma.c#3 edit
.. //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#3 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/dev/ata/ata-dma.c#3 (text+ko) ====

@@ -96,7 +96,7 @@
     struct ata_channel *ch = device_get_softc(dev);
     struct ata_dc_cb_args ccba;
 
-    if (bus_dma_tag_create(NULL, ch->dma->alignment, 0,
+    if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0,
 			   BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR,
 			   NULL, NULL, ch->dma->max_iosize,
 			   ATA_DMA_ENTRIES, ch->dma->segsize,

==== //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#3 (text+ko) ====

@@ -2242,7 +2242,7 @@
 {
 	int error;
 
-	error = bus_dma_tag_create(NULL,		/* parent */
+	error = bus_dma_tag_create(bus_get_dma_tag(sc->dev),	/* parent */
 				E1000_DBA_ALIGN, 0,	/* alignment, bounds */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR,	/* highaddr */
@@ -2346,7 +2346,7 @@
 	 * Setup DMA descriptor areas.
 	 */
 	size = roundup2(sc->hw.max_frame_size, MCLBYTES);
-	if ((error = bus_dma_tag_create(NULL,		/* parent */
+	if ((error = bus_dma_tag_create(bus_get_dma_tag(dev),	/* parent */
 				1, 0,			/* alignment, bounds */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR,	/* highaddr */
@@ -2732,7 +2732,7 @@
 
 	bzero(sc->rx_buffer_area, sizeof(struct em_buffer) * sc->num_rx_desc);
 
-	error = bus_dma_tag_create(NULL,		/* parent */
+	error = bus_dma_tag_create(bus_get_dma_tag(dev),	/* parent */
 				1, 0,			/* alignment, bounds */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR,	/* highaddr */