svn commit: r235631 - in stable/7/sys/dev: advansys amr an arcmsr
asr buslogic ciss cxgb dpt hifn hptiop hptmv ida if_ndis iir
ips mfi mlx mly twe
Sean Bruno
sbruno at FreeBSD.org
Fri May 18 21:40:18 UTC 2012
Author: sbruno
Date: Fri May 18 21:40:17 2012
New Revision: 235631
URL: http://svn.freebsd.org/changeset/base/235631
Log:
MFC 232854,232874,232882,232883,232886 for bus_get_dma_tag()
Modified:
stable/7/sys/dev/advansys/adv_pci.c
stable/7/sys/dev/advansys/adw_pci.c
stable/7/sys/dev/amr/amr_pci.c
stable/7/sys/dev/an/if_an_pci.c
stable/7/sys/dev/arcmsr/arcmsr.c
stable/7/sys/dev/asr/asr.c
stable/7/sys/dev/buslogic/bt_pci.c
stable/7/sys/dev/ciss/ciss.c
stable/7/sys/dev/cxgb/cxgb_sge.c
stable/7/sys/dev/dpt/dpt_pci.c
stable/7/sys/dev/hifn/hifn7751.c
stable/7/sys/dev/hptiop/hptiop.c
stable/7/sys/dev/hptmv/entry.c
stable/7/sys/dev/ida/ida_pci.c
stable/7/sys/dev/if_ndis/if_ndis_pci.c
stable/7/sys/dev/iir/iir_pci.c
stable/7/sys/dev/ips/ips_pci.c
stable/7/sys/dev/mfi/mfi_pci.c
stable/7/sys/dev/mlx/mlx_pci.c
stable/7/sys/dev/mly/mly.c
stable/7/sys/dev/twe/twe_freebsd.c
Directory Properties:
stable/7/sys/ (props changed)
Modified: stable/7/sys/dev/advansys/adv_pci.c
==============================================================================
--- stable/7/sys/dev/advansys/adv_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/advansys/adv_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -189,7 +189,7 @@ adv_pci_attach(device_t dev)
/* Allocate a dmatag for our transfer DMA maps */
/* XXX Should be a child of the PCI bus dma tag */
error = bus_dma_tag_create(
- /* parent */ NULL,
+ /* parent */ bus_get_dma_tag(dev),
/* alignment */ 1,
/* boundary */ 0,
/* lowaddr */ ADV_PCI_MAX_DMA_ADDR,
Modified: stable/7/sys/dev/advansys/adw_pci.c
==============================================================================
--- stable/7/sys/dev/advansys/adw_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/advansys/adw_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -260,7 +260,7 @@ adw_pci_attach(device_t dev)
/* Allocate a dmatag for our transfer DMA maps */
/* XXX Should be a child of the PCI bus dma tag */
error = bus_dma_tag_create(
- /* parent */ NULL,
+ /* parent */ bus_get_dma_tag(dev),
/* alignment */ 1,
/* boundary */ 0,
/* lowaddr */ ADW_PCI_MAX_DMA_ADDR,
Modified: stable/7/sys/dev/amr/amr_pci.c
==============================================================================
--- stable/7/sys/dev/amr/amr_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/amr/amr_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -277,7 +277,7 @@ amr_pci_attach(device_t dev)
/*
* Allocate the parent bus DMA tag appropriate for PCI.
*/
- if (bus_dma_tag_create(NULL, /* parent */
+ if (bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */
1, 0, /* alignment,boundary */
AMR_IS_SG64(sc) ?
BUS_SPACE_MAXADDR :
Modified: stable/7/sys/dev/an/if_an_pci.c
==============================================================================
--- stable/7/sys/dev/an/if_an_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/an/if_an_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -206,7 +206,7 @@ an_attach_pci(dev)
sc->an_mem_aux_bhandle = rman_get_bushandle(sc->mem_aux_res);
/* Allocate DMA region */
- 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_32BIT, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/arcmsr/arcmsr.c
==============================================================================
--- stable/7/sys/dev/arcmsr/arcmsr.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/arcmsr/arcmsr.c Fri May 18 21:40:17 2012 (r235631)
@@ -3396,7 +3396,7 @@ static u_int32_t arcmsr_initialize(devic
return ENOMEM;
}
}
- if(bus_dma_tag_create( /*parent*/ NULL,
+ if(bus_dma_tag_create( /*PCI parent*/ bus_get_dma_tag(dev),
/*alignemnt*/ 1,
/*boundary*/ 0,
/*lowaddr*/ BUS_SPACE_MAXADDR,
Modified: stable/7/sys/dev/asr/asr.c
==============================================================================
--- stable/7/sys/dev/asr/asr.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/asr/asr.c Fri May 18 21:40:17 2012 (r235631)
@@ -2331,7 +2331,7 @@ asr_alloc_dma(Asr_softc_t *sc)
dev = sc->ha_dev;
- if (bus_dma_tag_create(NULL, /* parent */
+ if (bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */
1, 0, /* algnmnt, boundary */
BUS_SPACE_MAXADDR_32BIT, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/buslogic/bt_pci.c
==============================================================================
--- stable/7/sys/dev/buslogic/bt_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/buslogic/bt_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -173,7 +173,7 @@ bt_pci_attach(device_t dev)
/* Allocate a dmatag for our CCB DMA maps */
/* XXX Should be a child of the PCI bus dma tag */
- if (bus_dma_tag_create( /* parent */ NULL,
+ if (bus_dma_tag_create( /* PCI parent */ bus_get_dma_tag(dev),
/* alignemnt */ 1,
/* boundary */ 0,
/* lowaddr */ BUS_SPACE_MAXADDR_32BIT,
Modified: stable/7/sys/dev/ciss/ciss.c
==============================================================================
--- stable/7/sys/dev/ciss/ciss.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/ciss/ciss.c Fri May 18 21:40:17 2012 (r235631)
@@ -698,7 +698,7 @@ ciss_init_pci(struct ciss_softc *sc)
* Note that "simple" adapters can only address within a 32-bit
* span.
*/
- if (bus_dma_tag_create(NULL, /* parent */
+ if (bus_dma_tag_create(bus_get_dma_tag(sc->ciss_dev),/* PCI parent */
1, 0, /* alignment, boundary */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- stable/7/sys/dev/cxgb/cxgb_sge.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/cxgb/cxgb_sge.c Fri May 18 21:40:17 2012 (r235631)
@@ -426,7 +426,7 @@ t3_sge_alloc(adapter_t *sc)
{
/* The parent tag. */
- if (bus_dma_tag_create( NULL, /* parent */
+ if (bus_dma_tag_create( bus_get_dma_tag(sc->dev),/* PCI parent */
1, 0, /* algnmnt, boundary */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/dpt/dpt_pci.c
==============================================================================
--- stable/7/sys/dev/dpt/dpt_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/dpt/dpt_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -133,7 +133,7 @@ dpt_pci_attach (device_t dev)
/* Allocate a dmatag representing the capabilities of this attachment */
/* XXX Should be a child of the PCI bus dma tag */
- if (bus_dma_tag_create( /* parent */ NULL,
+ if (bus_dma_tag_create( /* PCI parent */ bus_get_dma_tag(dev),
/* alignemnt */ 1,
/* boundary */ 0,
/* lowaddr */ BUS_SPACE_MAXADDR_32BIT,
Modified: stable/7/sys/dev/hifn/hifn7751.c
==============================================================================
--- stable/7/sys/dev/hifn/hifn7751.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/hifn/hifn7751.c Fri May 18 21:40:17 2012 (r235631)
@@ -454,7 +454,7 @@ hifn_attach(device_t dev)
* Setup the area where the Hifn DMA's descriptors
* and associated data structures.
*/
- if (bus_dma_tag_create(NULL, /* parent */
+ if (bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */
1, 0, /* alignment,boundary */
BUS_SPACE_MAXADDR_32BIT, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/hptiop/hptiop.c
==============================================================================
--- stable/7/sys/dev/hptiop/hptiop.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/hptiop/hptiop.c Fri May 18 21:40:17 2012 (r235631)
@@ -1367,7 +1367,7 @@ static int hptiop_attach(device_t dev)
mtx_init(&hba->lock, "hptioplock", NULL, MTX_DEF);
#endif
- if (bus_dma_tag_create(NULL,/* parent */
+ if (bus_dma_tag_create(bus_get_dma_tag(dev),/* PCI parent */
1, /* alignment */
0, /* boundary */
BUS_SPACE_MAXADDR, /* lowaddr */
Modified: stable/7/sys/dev/hptmv/entry.c
==============================================================================
--- stable/7/sys/dev/hptmv/entry.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/hptmv/entry.c Fri May 18 21:40:17 2012 (r235631)
@@ -1325,7 +1325,7 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
_vbus_p->OsExt = (void *)pAdapter;
pMvSataAdapter->IALData = pAdapter;
- if (bus_dma_tag_create(NULL,/* parent */
+ if (bus_dma_tag_create(bus_get_dma_tag(pAdapter->hpt_dev),/* parent */
4, /* alignment */
BUS_SPACE_MAXADDR_32BIT+1, /* boundary */
BUS_SPACE_MAXADDR, /* lowaddr */
Modified: stable/7/sys/dev/ida/ida_pci.c
==============================================================================
--- stable/7/sys/dev/ida/ida_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/ida/ida_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -269,7 +269,7 @@ ida_pci_attach(device_t dev)
}
error = bus_dma_tag_create(
- /* parent */ NULL,
+ /* parent */ bus_get_dma_tag(dev),
/* alignment */ 1,
/* boundary */ 0,
/* lowaddr */ BUS_SPACE_MAXADDR_32BIT,
Modified: stable/7/sys/dev/if_ndis/if_ndis_pci.c
==============================================================================
--- stable/7/sys/dev/if_ndis/if_ndis_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/if_ndis/if_ndis_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -287,7 +287,7 @@ ndis_attach_pci(dev)
* Allocate the parent bus DMA tag appropriate for PCI.
*/
#define NDIS_NSEG_NEW 32
- error = bus_dma_tag_create(NULL, /* parent */
+ error = bus_dma_tag_create(bus_get_dma_tag(dev),/* PCI parent */
1, 0, /* alignment, boundary */
BUS_SPACE_MAXADDR_32BIT,/* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/iir/iir_pci.c
==============================================================================
--- stable/7/sys/dev/iir/iir_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/iir/iir_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -319,7 +319,8 @@ iir_pci_attach(device_t dev)
/* Allocate a dmatag representing the capabilities of this attachment */
/* XXX Should be a child of the PCI bus dma tag */
- if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0,
+ if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev),
+ /*alignemnt*/1, /*boundary*/0,
/*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
/*highaddr*/BUS_SPACE_MAXADDR,
/*filter*/NULL, /*filterarg*/NULL,
Modified: stable/7/sys/dev/ips/ips_pci.c
==============================================================================
--- stable/7/sys/dev/ips/ips_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/ips/ips_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -135,7 +135,7 @@ static int ips_pci_attach(device_t dev)
device_printf(dev, "irq setup failed\n");
goto error;
}
- if (bus_dma_tag_create( /* parent */ NULL,
+ if (bus_dma_tag_create( /* PCI parent */bus_get_dma_tag(dev),
/* alignemnt */ 1,
/* boundary */ 0,
/* lowaddr */ BUS_SPACE_MAXADDR_32BIT,
Modified: stable/7/sys/dev/mfi/mfi_pci.c
==============================================================================
--- stable/7/sys/dev/mfi/mfi_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/mfi/mfi_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -211,7 +211,7 @@ mfi_pci_attach(device_t dev)
error = ENOMEM;
/* Allocate parent DMA tag */
- if (bus_dma_tag_create( NULL, /* parent */
+ if (bus_dma_tag_create( bus_get_dma_tag(dev), /* PCI parent */
1, 0, /* algnmnt, boundary */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/mlx/mlx_pci.c
==============================================================================
--- stable/7/sys/dev/mlx/mlx_pci.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/mlx/mlx_pci.c Fri May 18 21:40:17 2012 (r235631)
@@ -191,7 +191,7 @@ mlx_pci_attach(device_t dev)
/*
* Allocate the parent bus DMA tag appropriate for PCI.
*/
- error = bus_dma_tag_create(NULL, /* parent */
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */
1, 0, /* alignment, boundary */
BUS_SPACE_MAXADDR_32BIT, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/mly/mly.c
==============================================================================
--- stable/7/sys/dev/mly/mly.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/mly/mly.c Fri May 18 21:40:17 2012 (r235631)
@@ -393,7 +393,7 @@ mly_pci_attach(struct mly_softc *sc)
*
* Note that all of these controllers are 64-bit capable.
*/
- if (bus_dma_tag_create(NULL, /* parent */
+ if (bus_dma_tag_create(bus_get_dma_tag(sc->mly_dev),/* PCI parent */
1, 0, /* alignment, boundary */
BUS_SPACE_MAXADDR_32BIT, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: stable/7/sys/dev/twe/twe_freebsd.c
==============================================================================
--- stable/7/sys/dev/twe/twe_freebsd.c Fri May 18 20:43:48 2012 (r235630)
+++ stable/7/sys/dev/twe/twe_freebsd.c Fri May 18 21:40:17 2012 (r235631)
@@ -228,7 +228,7 @@ twe_attach(device_t dev)
/*
* Allocate the parent bus DMA tag appropriate for PCI.
*/
- if (bus_dma_tag_create(NULL, /* parent */
+ if (bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */
1, 0, /* alignment, boundary */
BUS_SPACE_MAXADDR_32BIT, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
More information about the svn-src-stable
mailing list