From owner-p4-projects@FreeBSD.ORG Wed May 24 00:48:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BB9B16A4F1; Wed, 24 May 2006 00:48:25 +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 77F7416A4D9 for ; Wed, 24 May 2006 00:48:24 +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 26CE743D45 for ; Wed, 24 May 2006 00:48:24 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4O0lZYi029366 for ; Wed, 24 May 2006 00:47:35 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4O0lZCT029363 for perforce@freebsd.org; Wed, 24 May 2006 00:47:35 GMT (envelope-from jmg@freebsd.org) Date: Wed, 24 May 2006 00:47:35 GMT Message-Id: <200605240047.k4O0lZCT029363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 97708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 00:48:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=97708 Change 97708 by jmg@jmg_carbon-60 on 2006/05/24 00:46:52 make ahc and ahd sun4v friendly by properly pulling in the necessary parent tag... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/ahc_eisa.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/ahc_isa.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/ahc_pci.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/ahd_pci.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/ahc_eisa.c#3 (text+ko) ==== @@ -131,8 +131,8 @@ /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1, - /*boundary*/0, + error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev), + /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/ahc_isa.c#3 (text+ko) ==== @@ -254,8 +254,8 @@ /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the VLB/ISA bus dma tag */ - error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1, - /*boundary*/0, + error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev), + /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/ahc_pci.c#3 (text+ko) ==== @@ -107,8 +107,8 @@ /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1, - /*boundary*/0, + error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev), + /*alignment*/1, /*boundary*/0, (ahc->flags & AHC_39BIT_ADDRESSING) ? 0x7FFFFFFFFFLL : BUS_SPACE_MAXADDR_32BIT, ==== //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/ahd_pci.c#3 (text+ko) ==== @@ -109,8 +109,8 @@ /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = aic_dma_tag_create(ahd, /*parent*/NULL, /*alignment*/1, - /*boundary*/0, + error = aic_dma_tag_create(ahd, /*parent*/bus_get_dma_tag(dev), + /*alignment*/1, /*boundary*/0, (ahd->flags & AHD_39BIT_ADDRESSING) ? 0x7FFFFFFFFF : BUS_SPACE_MAXADDR_32BIT,