Index: sys/arm/allwinner/a10_codec.c =================================================================== --- sys/arm/allwinner/a10_codec.c +++ sys/arm/allwinner/a10_codec.c @@ -1093,8 +1093,7 @@ } sc->dmasize = 131072; - error = bus_dma_tag_create( - bus_get_dma_tag(dev), + error = bus_dma_tag_create_device(dev, 4, sc->dmasize, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/allwinner/a10_hdmiaudio.c =================================================================== --- sys/arm/allwinner/a10_hdmiaudio.c +++ sys/arm/allwinner/a10_hdmiaudio.c @@ -376,8 +376,7 @@ sc->dmasize = pcm_getbuffersize(dev, DMABUF_MIN, DMABUF_DEFAULT, DMABUF_MAX); - error = bus_dma_tag_create( - bus_get_dma_tag(dev), + error = bus_dma_tag_create_device(dev, 4, sc->dmasize, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/allwinner/a31_dmac.c =================================================================== --- sys/arm/allwinner/a31_dmac.c +++ sys/arm/allwinner/a31_dmac.c @@ -220,8 +220,7 @@ } /* Descriptor DMA */ - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag */ + error = bus_dma_tag_create_device(dev, DESC_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/allwinner/aw_mmc.c =================================================================== --- sys/arm/allwinner/aw_mmc.c +++ sys/arm/allwinner/aw_mmc.c @@ -632,8 +632,7 @@ int error; /* Allocate the DMA descriptor memory. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->aw_dev), /* parent */ + error = bus_dma_tag_create_device(sc->aw_dev, AW_MMC_DMA_ALIGN, 0, /* align, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -662,8 +661,7 @@ return (sc->aw_dma_map_err); /* Create the DMA map for data transfers. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->aw_dev), /* parent */ + error = bus_dma_tag_create_device(sc->aw_dev, AW_MMC_DMA_ALIGN, 0, /* align, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/allwinner/if_awg.c =================================================================== --- sys/arm/allwinner/if_awg.c +++ sys/arm/allwinner/if_awg.c @@ -1699,8 +1699,7 @@ sc = device_get_softc(dev); /* Setup TX ring */ - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag */ + error = bus_dma_tag_create_device(dev, DESC_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1734,8 +1733,7 @@ sc->tx.desc_ring[i].next = htole32(sc->tx.desc_ring_paddr + DESC_OFF(TX_NEXT(i))); - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1761,8 +1759,7 @@ } /* Setup RX ring */ - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag */ + error = bus_dma_tag_create_device(dev, DESC_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1792,8 +1789,7 @@ return (error); } - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/amlogic/aml8726/aml8726_mmc.c =================================================================== --- sys/arm/amlogic/aml8726/aml8726_mmc.c +++ sys/arm/amlogic/aml8726/aml8726_mmc.c @@ -724,7 +724,7 @@ AML_MMC_LOCK_INIT(sc); - error = bus_dma_tag_create(bus_get_dma_tag(dev), AML_MMC_ALIGN_DMA, 0, + error = bus_dma_tag_create_device(dev, AML_MMC_ALIGN_DMA, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, AML_MMC_MAX_DMA, 1, AML_MMC_MAX_DMA, 0, NULL, NULL, &sc->dmatag); if (error) Index: sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c =================================================================== --- sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c +++ sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c @@ -902,7 +902,7 @@ AML_SDXC_LOCK_INIT(sc); - error = bus_dma_tag_create(bus_get_dma_tag(dev), AML_SDXC_ALIGN_DMA, 0, + error = bus_dma_tag_create_device(dev, AML_SDXC_ALIGN_DMA, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, AML_SDXC_MAX_DMA, 1, AML_SDXC_MAX_DMA, 0, NULL, NULL, &sc->dmatag); if (error) Index: sys/arm/broadcom/bcm2835/bcm2835_dma.c =================================================================== --- sys/arm/broadcom/bcm2835/bcm2835_dma.c +++ sys/arm/broadcom/bcm2835/bcm2835_dma.c @@ -253,7 +253,7 @@ * has a full 32-bit register dedicated to this address, so we do not * need to bother with the per-SoC peripheral restrictions. */ - err = bus_dma_tag_create(bus_get_dma_tag(dev), + err = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct bcm_dma_cb), 1, Index: sys/arm/broadcom/bcm2835/bcm2835_mbox.c =================================================================== --- sys/arm/broadcom/bcm2835/bcm2835_mbox.c +++ sys/arm/broadcom/bcm2835/bcm2835_mbox.c @@ -315,7 +315,7 @@ void *buf; int err; - err = bus_dma_tag_create(bus_get_dma_tag(dev), 16, 0, + err = bus_dma_tag_create_device(dev, 16, 0, bcm283x_dmabus_peripheral_lowaddr(), BUS_SPACE_MAXADDR, NULL, NULL, len, 1, len, 0, NULL, NULL, tag); if (err != 0) { Index: sys/arm/broadcom/bcm2835/bcm2835_sdhci.c =================================================================== --- sys/arm/broadcom/bcm2835/bcm2835_sdhci.c +++ sys/arm/broadcom/bcm2835/bcm2835_sdhci.c @@ -332,7 +332,7 @@ } /* Allocate bus_dma resources. */ - err = bus_dma_tag_create(bus_get_dma_tag(dev), + err = bus_dma_tag_create_device(dev, 1, 0, bcm283x_dmabus_peripheral_lowaddr(), BUS_SPACE_MAXADDR, NULL, NULL, BCM_DMA_MAXSIZE, ALLOCATED_DMA_SEGS, BCM_SDHCI_BUFFER_SIZE, Index: sys/arm/freescale/imx/imx6_ipu.c =================================================================== --- sys/arm/freescale/imx/imx6_ipu.c +++ sys/arm/freescale/imx/imx6_ipu.c @@ -990,8 +990,7 @@ /* * Now allocate framebuffer memory */ - err = bus_dma_tag_create( - bus_get_dma_tag(sc->sc_dev), + err = bus_dma_tag_create_device(sc->sc_dev, 4, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/freescale/imx/imx6_ssi.c =================================================================== --- sys/arm/freescale/imx/imx6_ssi.c +++ sys/arm/freescale/imx/imx6_ssi.c @@ -780,8 +780,7 @@ * Modulo feature allows setup circular buffer. */ - err = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), + err = bus_dma_tag_create_device(sc->dev, 4, sc->dma_size, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/freescale/vybrid/vf_sai.c =================================================================== --- sys/arm/freescale/vybrid/vf_sai.c +++ sys/arm/freescale/vybrid/vf_sai.c @@ -730,8 +730,7 @@ * Modulo feature allows setup circular buffer. */ - err = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), + err = bus_dma_tag_create_device(sc->dev, 4, sc->dma_size, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/ti/am335x/am335x_lcd.c =================================================================== --- sys/arm/ti/am335x/am335x_lcd.c +++ sys/arm/ti/am335x/am335x_lcd.c @@ -647,8 +647,7 @@ /* * Now allocate framebuffer memory */ - err = bus_dma_tag_create( - bus_get_dma_tag(sc->sc_dev), + err = bus_dma_tag_create_device(sc->sc_dev, 4, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/ti/cpsw/if_cpsw.c =================================================================== --- sys/arm/ti/cpsw/if_cpsw.c +++ sys/arm/ti/cpsw/if_cpsw.c @@ -853,8 +853,7 @@ cpsw_add_sysctls(sc); /* Allocate a busdma tag and DMA safe memory for mbufs. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* parent */ + error = bus_dma_tag_create_device(sc->dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/versatile/versatile_clcd.c =================================================================== --- sys/arm/versatile/versatile_clcd.c +++ sys/arm/versatile/versatile_clcd.c @@ -284,8 +284,7 @@ /* * Now allocate framebuffer memory */ - err = bus_dma_tag_create( - bus_get_dma_tag(dev), + err = bus_dma_tag_create_device(dev, 4, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm/xilinx/zy7_devcfg.c =================================================================== --- sys/arm/xilinx/zy7_devcfg.c +++ sys/arm/xilinx/zy7_devcfg.c @@ -512,7 +512,7 @@ } sc->dma_map = NULL; - err = bus_dma_tag_create(bus_get_dma_tag(sc->dev), 4, 0, + err = bus_dma_tag_create_device(sc->dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, Index: sys/arm64/broadcom/genet/if_genet.c =================================================================== --- sys/arm64/broadcom/genet/if_genet.c +++ sys/arm64/broadcom/genet/if_genet.c @@ -545,8 +545,7 @@ struct device *dev = sc->dev; int i, error; - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag */ + error = bus_dma_tag_create_device(dev, 4, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_40BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -570,8 +569,7 @@ } } - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag */ + error = bus_dma_tag_create_device(dev, 4, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_40BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm64/cavium/thunder_pcie_pem.c =================================================================== --- sys/arm64/cavium/thunder_pcie_pem.c +++ sys/arm64/cavium/thunder_pcie_pem.c @@ -779,7 +779,7 @@ sc->reg_bsh = rman_get_bushandle(sc->reg); /* Create the parent DMA tag to pass down the coherent flag */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/arm64/rockchip/rk_pcie.c =================================================================== --- sys/arm64/rockchip/rk_pcie.c +++ sys/arm64/rockchip/rk_pcie.c @@ -1283,7 +1283,7 @@ if (bootverbose) device_printf(dev, "Bus is%s cache-coherent\n", sc->coherent ? "" : " not"); - rv = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + rv = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/compat/linuxkpi/common/src/linux_pci.c =================================================================== --- sys/compat/linuxkpi/common/src/linux_pci.c +++ sys/compat/linuxkpi/common/src/linux_pci.c @@ -150,7 +150,7 @@ priv->dma_mask = dma_mask; - error = bus_dma_tag_create(bus_get_dma_tag(dev->bsddev), + error = bus_dma_tag_create_device(dev->bsddev, 1, 0, /* alignment, boundary */ dma_mask, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -879,7 +879,7 @@ pool->pool_device = dev; pool->pool_entry_size = size; - if (bus_dma_tag_create(bus_get_dma_tag(dev->bsddev), + if (bus_dma_tag_create_device(dev->bsddev, align, boundary, /* alignment, boundary */ priv->dma_mask, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/crypto/ccp/ccp_hardware.c =================================================================== --- sys/crypto/ccp/ccp_hardware.c +++ sys/crypto/ccp/ccp_hardware.c @@ -246,7 +246,7 @@ * * Queue must be aligned to 5+Queue_Size+1 == 5 + order bits. */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), + error = bus_dma_tag_create_device(dev, 1 << (5 + sc->ring_size_order), #if defined(__i386__) && !defined(PAE) 0, BUS_SPACE_MAXADDR, Index: sys/dev/aac/aac_pci.c =================================================================== --- sys/dev/aac/aac_pci.c +++ sys/dev/aac/aac_pci.c @@ -442,7 +442,7 @@ * * Note that some of these controllers are 64-bit capable. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, PAGE_SIZE, /* algnmnt */ ((bus_size_t)((uint64_t)1 << 32)), /* boundary*/ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/aacraid/aacraid_pci.c =================================================================== --- sys/dev/aacraid/aacraid_pci.c +++ sys/dev/aacraid/aacraid_pci.c @@ -230,7 +230,7 @@ * * Note that some of these controllers are 64-bit capable. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, PAGE_SIZE, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/acpica/acpi_pcib_acpi.c =================================================================== --- sys/dev/acpica/acpi_pcib_acpi.c +++ sys/dev/acpica/acpi_pcib_acpi.c @@ -545,7 +545,7 @@ acpi_pcib_fetch_prt(dev, &sc->ap_prt); - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, + error = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE, 0, NULL, NULL, &sc->ap_dma_tag); Index: sys/dev/ae/if_ae.c =================================================================== --- sys/dev/ae/if_ae.c +++ sys/dev/ae/if_ae.c @@ -1111,7 +1111,7 @@ /* * Create parent DMA tag. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), + error = bus_dma_tag_create_device(sc->dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, Index: sys/dev/age/if_age.c =================================================================== --- sys/dev/age/if_age.c +++ sys/dev/age/if_age.c @@ -865,8 +865,7 @@ again: /* Create parent ring/DMA block tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->age_dev), /* parent */ + error = bus_dma_tag_create_device(sc->age_dev, 1, 0, /* alignment, boundary */ lowaddr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1102,8 +1101,7 @@ * It seems enabling 64bit DMA causes data corruption. Limit * DMA address space to 32bit. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->age_dev), /* parent */ + error = bus_dma_tag_create_device(sc->age_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/agp/agp_i810.c =================================================================== --- sys/dev/agp/agp_i810.c +++ sys/dev/agp/agp_i810.c @@ -2221,7 +2221,7 @@ } #if 0 - error = bus_dma_tag_create(bus_get_dma_tag(dev), + error = bus_dma_tag_create_device(dev, 1 /* alignment */, 0 /* boundary */, 1ULL << sc->match->busdma_addr_mask_sz /* lowaddr */, BUS_SPACE_MAXADDR /* highaddr */, Index: sys/dev/ahci/ahci.c =================================================================== --- sys/dev/ahci/ahci.c +++ sys/dev/ahci/ahci.c @@ -278,7 +278,7 @@ ctlr->emloc = ATA_INL(ctlr->r_mem, AHCI_EM_LOC); /* Create controller-wide DMA tag. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + if (bus_dma_tag_create_device(dev, 1, 0, (ctlr->caps & AHCI_CAP_64BIT) ? BUS_SPACE_MAXADDR : BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE, @@ -1083,7 +1083,7 @@ int error; /* Command area. */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1024, 0, + error = bus_dma_tag_create_device(dev, 1024, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, AHCI_WORK_SIZE, 1, AHCI_WORK_SIZE, 0, NULL, NULL, &ch->dma.work_tag); @@ -1105,7 +1105,7 @@ rfsize = 4096; else rfsize = 256; - error = bus_dma_tag_create(bus_get_dma_tag(dev), rfsize, 0, + error = bus_dma_tag_create_device(dev, rfsize, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, rfsize, 1, rfsize, 0, NULL, NULL, &ch->dma.rfis_tag); @@ -1123,7 +1123,7 @@ } ch->dma.rfis_bus = dcba.maddr; /* Data area. */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, + error = bus_dma_tag_create_device(dev, 2, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, AHCI_SG_ENTRIES * PAGE_SIZE * ch->numslots, Index: sys/dev/al_eth/al_eth.c =================================================================== --- sys/dev/al_eth/al_eth.c +++ sys/dev/al_eth/al_eth.c @@ -564,7 +564,7 @@ int ret; uint32_t maxsize = ((size - 1)/PAGE_SIZE + 1) * PAGE_SIZE; - ret = bus_dma_tag_create(bus_get_dma_tag(dev), 8, 0, + ret = bus_dma_tag_create_device(dev, 8, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, maxsize, 1, maxsize, BUS_DMA_COHERENT, NULL, NULL, tag); if (ret != 0) { @@ -2350,7 +2350,7 @@ device_get_nameunit(adapter->dev)); /* Setup DMA descriptor areas. */ - ret = bus_dma_tag_create(bus_get_dma_tag(dev), + ret = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2517,7 +2517,7 @@ device_get_nameunit(adapter->dev)); /* Setup DMA descriptor areas. */ - ret = bus_dma_tag_create(bus_get_dma_tag(dev), + ret = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/alc/if_alc.c =================================================================== --- sys/dev/alc/if_alc.c +++ sys/dev/alc/if_alc.c @@ -1979,8 +1979,7 @@ lowaddr = BUS_SPACE_MAXADDR; again: /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->alc_dev), /* parent */ + error = bus_dma_tag_create_device(sc->alc_dev, 1, 0, /* alignment, boundary */ lowaddr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2216,8 +2215,7 @@ * space could be restricted to be within 32bit address space * by 4GB boundary crossing. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->alc_dev), /* parent */ + error = bus_dma_tag_create_device(sc->alc_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ale/if_ale.c =================================================================== --- sys/dev/ale/if_ale.c +++ sys/dev/ale/if_ale.c @@ -1035,8 +1035,7 @@ lowaddr = BUS_SPACE_MAXADDR; again: /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->ale_dev), /* parent */ + error = bus_dma_tag_create_device(sc->ale_dev, 1, 0, /* alignment, boundary */ lowaddr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1249,8 +1248,7 @@ * could be restricted to be within 32bit address space by * 4GB boundary crossing. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->ale_dev), /* parent */ + error =bus_dma_tag_create_device(sc->ale_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/altera/msgdma/msgdma.c =================================================================== --- sys/dev/altera/msgdma/msgdma.c +++ sys/dev/altera/msgdma/msgdma.c @@ -339,8 +339,7 @@ dprintf("%s: nseg %d\n", __func__, nsegments); - err = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), + err = bus_dma_tag_create_device(sc->dev, align, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/amr/amr_pci.c =================================================================== --- sys/dev/amr/amr_pci.c +++ sys/dev/amr/amr_pci.c @@ -257,7 +257,7 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* alignment,boundary */ AMR_IS_SG64(sc) ? BUS_SPACE_MAXADDR : Index: sys/dev/an/if_an_pci.c =================================================================== --- sys/dev/an/if_an_pci.c +++ sys/dev/an/if_an_pci.c @@ -191,7 +191,7 @@ } /* Allocate DMA region */ - error = bus_dma_tag_create(bus_get_dma_tag(dev),/* parent */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/arcmsr/arcmsr.c =================================================================== --- sys/dev/arcmsr/arcmsr.c +++ sys/dev/arcmsr/arcmsr.c @@ -4352,7 +4352,7 @@ return ENOMEM; } } - if(bus_dma_tag_create( /*PCI parent*/ bus_get_dma_tag(dev), + if(bus_dma_tag_create_device( dev, /*alignemnt*/ 1, /*boundary*/ 0, /*lowaddr*/ BUS_SPACE_MAXADDR, Index: sys/dev/ata/ata-dma.c =================================================================== --- sys/dev/ata/ata-dma.c +++ sys/dev/ata/ata-dma.c @@ -93,7 +93,7 @@ if (ch->dma.dma_slots == 0) ch->dma.dma_slots = 1; - if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma.alignment, 0, + if (bus_dma_tag_create_device(dev, ch->dma.alignment, 0, ch->dma.max_address, BUS_SPACE_MAXADDR, NULL, NULL, ch->dma.max_iosize, ATA_DMA_ENTRIES, ch->dma.segsize, Index: sys/dev/ath/if_ath_ahb.c =================================================================== --- sys/dev/ath/if_ath_ahb.c +++ sys/dev/ath/if_ath_ahb.c @@ -211,7 +211,7 @@ /* * Setup DMA descriptor area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ath/if_ath_descdma.c =================================================================== --- sys/dev/ath/if_ath_descdma.c +++ sys/dev/ath/if_ath_descdma.c @@ -177,7 +177,7 @@ * BUS_DMA_ALLOCNOW is not used; we never use bounce * buffers for the descriptors themselves. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), /* parent */ + error = bus_dma_tag_create_device(sc->sc_dev, PAGE_SIZE, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ath/if_ath_pci.c =================================================================== --- sys/dev/ath/if_ath_pci.c +++ sys/dev/ath/if_ath_pci.c @@ -234,7 +234,7 @@ /* * Setup DMA descriptor area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/bce/if_bce.c =================================================================== --- sys/dev/bce/if_bce.c +++ sys/dev/bce/if_bce.c @@ -3514,7 +3514,7 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 1, BCE_DMA_BOUNDARY, + if (bus_dma_tag_create_device(dev, 1, BCE_DMA_BOUNDARY, sc->max_bus_addr, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->parent_tag)) { Index: sys/dev/bfe/if_bfe.c =================================================================== --- sys/dev/bfe/if_bfe.c +++ sys/dev/bfe/if_bfe.c @@ -199,7 +199,7 @@ * parent tag. Apparently the chip cannot handle any DMA address * greater than 1GB. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->bfe_dev), /* parent */ + error = bus_dma_tag_create_device(sc->bfe_dev, 1, 0, /* alignment, boundary */ BFE_DMA_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/bge/if_bge.c =================================================================== --- sys/dev/bge/if_bge.c +++ sys/dev/bge/if_bge.c @@ -2942,7 +2942,7 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), + error = bus_dma_tag_create_device(sc->bge_dev, 1, 0, lowaddr, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->bge_cdata.bge_parent_tag); @@ -3033,7 +3033,7 @@ if (sc->bge_pcixcap != 0) lowaddr = BUS_SPACE_MAXADDR_32BIT; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), + error = bus_dma_tag_create_device(sc->bge_dev, 1, boundary, lowaddr, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->bge_cdata.bge_buffer_tag); Index: sys/dev/bwi/if_bwi.c =================================================================== --- sys/dev/bwi/if_bwi.c +++ sys/dev/bwi/if_bwi.c @@ -1889,7 +1889,7 @@ /* * Create top level DMA tag */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), /* parent */ + error = bus_dma_tag_create_device(sc->sc_dev, BWI_ALIGN, 0, /* alignment, bounds */ lowaddr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/bxe/bxe.c =================================================================== --- sys/dev/bxe/bxe.c +++ sys/dev/bxe/bxe.c @@ -14661,7 +14661,7 @@ /* XXX zero out all vars here and call bxe_alloc_hsi_mem on error */ /* allocate the parent bus DMA tag */ - rc = bus_dma_tag_create(bus_get_dma_tag(sc->dev), /* parent tag */ + rc = bus_dma_tag_create_device(sc->dev, 1, /* alignment */ 0, /* boundary limit */ BUS_SPACE_MAXADDR, /* restricted low */ Index: sys/dev/cadence/if_cgem.c =================================================================== --- sys/dev/cadence/if_cgem.c +++ sys/dev/cadence/if_cgem.c @@ -369,7 +369,7 @@ sc->rxring = NULL; /* Allocate non-cached DMA space for RX and TX descriptors. */ - err = bus_dma_tag_create(bus_get_dma_tag(sc->dev), 1, 0, + err = bus_dma_tag_create_device(sc->dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MAX_DESC_RING_SIZE, 1, MAX_DESC_RING_SIZE, 0, busdma_lock_mutex, &sc->sc_mtx, &sc->desc_dma_tag); @@ -377,7 +377,7 @@ return (err); /* Set up a bus_dma_tag for mbufs. */ - err = bus_dma_tag_create(bus_get_dma_tag(sc->dev), 1, 0, + err = bus_dma_tag_create_device(sc->dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, TX_MAX_DMA_SEGS, MCLBYTES, 0, busdma_lock_mutex, &sc->sc_mtx, &sc->mbuf_dma_tag); Index: sys/dev/cas/if_cas.c =================================================================== --- sys/dev/cas/if_cas.c +++ sys/dev/cas/if_cas.c @@ -227,7 +227,7 @@ /* Make sure the chip is stopped. */ cas_reset(sc); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, 0, BUS_SPACE_MAXSIZE, 0, NULL, NULL, &sc->sc_pdmatag); Index: sys/dev/cesa/cesa.c =================================================================== --- sys/dev/cesa/cesa.c +++ sys/dev/cesa/cesa.c @@ -163,7 +163,7 @@ KASSERT(cdm->cdm_vaddr == NULL, ("%s(): DMA memory descriptor in use.", __func__)); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), /* parent */ + error = bus_dma_tag_create_device(sc->sc_dev, PAGE_SIZE, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1257,7 +1257,7 @@ } /* Create DMA tag for processed data */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ciss/ciss.c =================================================================== --- sys/dev/ciss/ciss.c +++ sys/dev/ciss/ciss.c @@ -839,7 +839,7 @@ * Note that "simple" adapters can only address within a 32-bit * span. */ - if (bus_dma_tag_create(bus_get_dma_tag(sc->ciss_dev),/* PCI parent */ + if (bus_dma_tag_create_device(sc->ciss_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/cxgb/cxgb_sge.c =================================================================== --- sys/dev/cxgb/cxgb_sge.c +++ sys/dev/cxgb/cxgb_sge.c @@ -604,7 +604,7 @@ { /* The parent tag. */ - if (bus_dma_tag_create( bus_get_dma_tag(sc->dev),/* PCI parent */ + if (bus_dma_tag_create_device(sc->dev, 1, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/cxgbe/t4_sge.c =================================================================== --- sys/dev/cxgbe/t4_sge.c +++ sys/dev/cxgbe/t4_sge.c @@ -905,7 +905,7 @@ { int rc; - rc = bus_dma_tag_create(bus_get_dma_tag(sc->dev), 1, 0, + rc = bus_dma_tag_create_device(sc->dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE, BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmat); Index: sys/dev/dc/if_dc.c =================================================================== --- sys/dev/dc/if_dc.c +++ sys/dev/dc/if_dc.c @@ -1824,7 +1824,7 @@ { int error, i; - error = bus_dma_tag_create(bus_get_dma_tag(sc->dc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->dc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->dc_ptag); Index: sys/dev/drm2/drm_pci.c =================================================================== --- sys/dev/drm2/drm_pci.c +++ sys/dev/drm2/drm_pci.c @@ -88,8 +88,7 @@ if (mtx_owned(&dev->dma_lock)) DRM_ERROR("called while holding dma_lock\n"); - ret = bus_dma_tag_create( - bus_get_dma_tag(dev->dev), /* parent */ + ret = bus_dma_tag_create_device(dev->dev, align, 0, /* align, boundary */ maxaddr, BUS_SPACE_MAXADDR, /* lowaddr, highaddr */ NULL, NULL, /* filtfunc, filtfuncargs */ Index: sys/dev/dwc/if_dwc.c =================================================================== --- sys/dev/dwc/if_dwc.c +++ sys/dev/dwc/if_dwc.c @@ -962,8 +962,7 @@ /* * Set up TX descriptor ring, descriptors, and dma maps. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* Parent tag. */ + error = bus_dma_tag_create_device(sc->dev, DWC_DESC_RING_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1003,8 +1002,7 @@ (nidx * sizeof(struct dwc_hwdesc)); } - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* Parent tag. */ + error = bus_dma_tag_create_device(sc->dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1034,8 +1032,7 @@ /* * Set up RX descriptor ring, descriptors, dma maps, and mbufs. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* Parent tag. */ + error = bus_dma_tag_create_device(sc->dev, DWC_DESC_RING_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1069,8 +1066,7 @@ goto out; } - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* Parent tag. */ + error = bus_dma_tag_create_device(sc->dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ena/ena.c =================================================================== --- sys/dev/ena/ena.c +++ sys/dev/ena/ena.c @@ -213,7 +213,7 @@ if (unlikely(dma_space_addr == 0)) dma_space_addr = BUS_SPACE_MAXADDR; - error = bus_dma_tag_create(bus_get_dma_tag(dmadev), /* parent */ + error = bus_dma_tag_create_device(dmadev, 8, 0, /* alignment, bounds */ dma_space_addr, /* lowaddr of exclusion window */ BUS_SPACE_MAXADDR,/* highaddr of exclusion window */ @@ -510,7 +510,7 @@ int ret; /* Create DMA tag for Tx buffers */ - ret = bus_dma_tag_create(bus_get_dma_tag(adapter->pdev), + ret = bus_dma_tag_create_device(adapter->pdev, 1, 0, /* alignment, bounds */ ENA_DMA_BIT_MASK(adapter->dma_width), /* lowaddr of excl window */ BUS_SPACE_MAXADDR, /* highaddr of excl window */ @@ -545,7 +545,7 @@ int ret; /* Create DMA tag for Rx buffers*/ - ret = bus_dma_tag_create(bus_get_dma_tag(adapter->pdev), /* parent */ + ret = bus_dma_tag_create_device(adapter->pdev, 1, 0, /* alignment, bounds */ ENA_DMA_BIT_MASK(adapter->dma_width), /* lowaddr of excl window */ BUS_SPACE_MAXADDR, /* highaddr of excl window */ Index: sys/dev/esp/esp_pci.c =================================================================== --- sys/dev/esp/esp_pci.c +++ sys/dev/esp/esp_pci.c @@ -228,7 +228,7 @@ return (error); } - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + error = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &esc->sc_pdmat); Index: sys/dev/et/if_et.c =================================================================== --- sys/dev/et/if_et.c +++ sys/dev/et/if_et.c @@ -876,7 +876,7 @@ struct et_txstatus_data *txsd; int i, error; - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), 1, 0, + error = bus_dma_tag_create_device(sc->dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_dtag); @@ -937,7 +937,7 @@ return (error); /* Create parent DMA tag for mbufs. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), 1, 0, + error = bus_dma_tag_create_device(sc->dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_mbuf_dtag); Index: sys/dev/ffec/if_ffec.c =================================================================== --- sys/dev/ffec/if_ffec.c +++ sys/dev/ffec/if_ffec.c @@ -1534,8 +1534,7 @@ /* * Set up TX descriptor ring, descriptors, and dma maps. */ - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag. */ + error = bus_dma_tag_create_device(dev, FEC_DESC_RING_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1567,8 +1566,7 @@ goto out; } - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag. */ + error = bus_dma_tag_create_device(dev, sc->txbuf_align, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1598,8 +1596,7 @@ /* * Set up RX descriptor ring, descriptors, dma maps, and mbufs. */ - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag. */ + error = bus_dma_tag_create_device(dev, FEC_DESC_RING_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1631,8 +1628,7 @@ goto out; } - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* Parent tag. */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/firewire/fwohci_pci.c =================================================================== --- sys/dev/firewire/fwohci_pci.c +++ sys/dev/firewire/fwohci_pci.c @@ -294,8 +294,7 @@ return ENXIO; } - err = bus_dma_tag_create( - /*parent*/bus_get_dma_tag(self), + err = bus_dma_tag_create_device(self, /*alignment*/1, /*boundary*/0, #if BOUNCE_BUFFER_TEST Index: sys/dev/fxp/if_fxp.c =================================================================== --- sys/dev/fxp/if_fxp.c +++ sys/dev/fxp/if_fxp.c @@ -664,7 +664,7 @@ sc->maxtxseg--; sc->maxsegsize = FXP_TSO_SEGSIZE; } - error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, + error = bus_dma_tag_create_device(dev, 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sc->maxsegsize * sc->maxtxseg + sizeof(struct ether_vlan_header), sc->maxtxseg, sc->maxsegsize, 0, @@ -674,7 +674,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, + error = bus_dma_tag_create_device(dev, 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, busdma_lock_mutex, &Giant, &sc->fxp_rxmtag); @@ -683,7 +683,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, + error = bus_dma_tag_create_device(dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct fxp_stats), 1, sizeof(struct fxp_stats), 0, busdma_lock_mutex, &Giant, &sc->fxp_stag); @@ -706,7 +706,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, + error = bus_dma_tag_create_device(dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, FXP_TXCB_SZ, 1, FXP_TXCB_SZ, 0, busdma_lock_mutex, &Giant, &sc->cbl_tag); @@ -730,7 +730,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, + error = bus_dma_tag_create_device(dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct fxp_cb_mcs), 1, sizeof(struct fxp_cb_mcs), 0, busdma_lock_mutex, &Giant, &sc->mcs_tag); Index: sys/dev/gem/if_gem.c =================================================================== --- sys/dev/gem/if_gem.c +++ sys/dev/gem/if_gem.c @@ -182,7 +182,7 @@ /* Make sure the chip is stopped. */ gem_reset(sc); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_pdmatag); Index: sys/dev/glxsb/glxsb.c =================================================================== --- sys/dev/glxsb/glxsb.c +++ sys/dev/glxsb/glxsb.c @@ -378,7 +378,7 @@ dma->dma_size = GLXSB_MAX_AES_LEN * 2; /* Setup DMA descriptor area */ - rc = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), /* parent */ + rc = bus_dma_tag_create_device(sc->sc_dev, SB_AES_ALIGN, 0, /* alignments, bounds */ BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/hifn/hifn7751.c =================================================================== --- sys/dev/hifn/hifn7751.c +++ sys/dev/hifn/hifn7751.c @@ -437,7 +437,7 @@ * Setup the area where the Hifn DMA's descriptors * and associated data structures. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* alignment,boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/hme/if_hme.c =================================================================== --- sys/dev/hme/if_hme.c +++ sys/dev/hme/if_hme.c @@ -225,7 +225,7 @@ hme_stop(sc); HME_UNLOCK(sc); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_pdmatag); Index: sys/dev/hptiop/hptiop.c =================================================================== --- sys/dev/hptiop/hptiop.c +++ sys/dev/hptiop/hptiop.c @@ -1908,7 +1908,7 @@ mtx_init(&hba->lock, "hptioplock", NULL, MTX_DEF); - if (bus_dma_tag_create(bus_get_dma_tag(dev),/* PCI parent */ + if (bus_dma_tag_create_device(dev, 1, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/hptmv/entry.c =================================================================== --- sys/dev/hptmv/entry.c +++ sys/dev/hptmv/entry.c @@ -1280,7 +1280,7 @@ _vbus_p->OsExt = (void *)pAdapter; pMvSataAdapter->IALData = pAdapter; - if (bus_dma_tag_create(bus_get_dma_tag(pAdapter->hpt_dev),/* parent */ + if (bus_dma_tag_create_device(pAdapter->hpt_dev, 4, /* alignment */ BUS_SPACE_MAXADDR_32BIT+1, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c =================================================================== --- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -934,8 +934,7 @@ LIST_INIT(&sc->hs_free_list); - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ + error = bus_dma_tag_create_device(dev, 1, /* alignment */ PAGE_SIZE, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/ice/ice_osdep.c =================================================================== --- sys/dev/ice/ice_osdep.c +++ sys/dev/ice/ice_osdep.c @@ -337,7 +337,7 @@ device_t dev = ice_hw_to_dev(hw); int err; - err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + err = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ida/ida_pci.c =================================================================== --- sys/dev/ida/ida_pci.c +++ sys/dev/ida/ida_pci.c @@ -261,8 +261,7 @@ return (ENOMEM); } - error = bus_dma_tag_create( - /* parent */ bus_get_dma_tag(dev), + error = bus_dma_tag_create_device(dev, /* alignment */ 1, /* boundary */ 0, /* lowaddr */ BUS_SPACE_MAXADDR_32BIT, Index: sys/dev/if_ndis/if_ndis_pci.c =================================================================== --- sys/dev/if_ndis/if_ndis_pci.c +++ sys/dev/if_ndis/if_ndis_pci.c @@ -295,7 +295,7 @@ * Allocate the parent bus DMA tag appropriate for PCI. */ #define NDIS_NSEG_NEW 32 - error = bus_dma_tag_create(bus_get_dma_tag(dev),/* PCI parent */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/iir/iir_pci.c =================================================================== --- sys/dev/iir/iir_pci.c +++ sys/dev/iir/iir_pci.c @@ -303,7 +303,7 @@ gdt->sc_test_busy = gdt_mpr_test_busy; /* Allocate a dmatag representing the capabilities of this attachment */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, /*alignemnt*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/ioat/ioat.c =================================================================== --- sys/dev/ioat/ioat.c +++ sys/dev/ioat/ioat.c @@ -550,7 +550,7 @@ else lowaddr = BUS_SPACE_MAXADDR_40BIT; - error = bus_dma_tag_create(bus_get_dma_tag(ioat->device), + error = bus_dma_tag_create_device(ioat->device, sizeof(uint64_t), 0x0, lowaddr, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(uint64_t), 1, sizeof(uint64_t), 0, NULL, NULL, &ioat->comp_update_tag); @@ -573,7 +573,7 @@ num_descriptors = 1 << ioat->ring_size_order; ringsz = sizeof(struct ioat_dma_hw_descriptor) * num_descriptors; - error = bus_dma_tag_create(bus_get_dma_tag(ioat->device), + error = bus_dma_tag_create_device(ioat->device, 2 * 1024 * 1024, 0x0, lowaddr, BUS_SPACE_MAXADDR, NULL, NULL, ringsz, 1, ringsz, 0, NULL, NULL, &ioat->hw_desc_tag); if (error != 0) @@ -591,7 +591,7 @@ ioat->hw_desc_ring = hw_desc; - error = bus_dma_tag_create(bus_get_dma_tag(ioat->device), + error = bus_dma_tag_create_device(ioat->device, 1, 0, lowaddr, BUS_SPACE_MAXADDR, NULL, NULL, ioat->max_xfer_size, 1, ioat->max_xfer_size, 0, NULL, NULL, &ioat->data_tag); Index: sys/dev/ips/ips_pci.c =================================================================== --- sys/dev/ips/ips_pci.c +++ sys/dev/ips/ips_pci.c @@ -122,7 +122,7 @@ device_printf(dev, "irq setup failed\n"); goto error; } - if (bus_dma_tag_create( /* PCI parent */bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, /* alignemnt */ 1, /* boundary */ 0, /* lowaddr */ BUS_SPACE_MAXADDR_32BIT, Index: sys/dev/ipw/if_ipw.c =================================================================== --- sys/dev/ipw/if_ipw.c +++ sys/dev/ipw/if_ipw.c @@ -498,7 +498,7 @@ /* * Allocate parent DMA tag for subsequent allocations. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->parent_dmat); Index: sys/dev/isci/isci.c =================================================================== --- sys/dev/isci/isci.c +++ sys/dev/isci/isci.c @@ -413,7 +413,7 @@ { uint32_t status; - status = bus_dma_tag_create(bus_get_dma_tag(device), + status = bus_dma_tag_create_device(device, 0x40 /* cacheline alignment */, ISCI_DMA_BOUNDARY, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, memory->size, Index: sys/dev/isci/isci_controller.c =================================================================== --- sys/dev/isci/isci_controller.c +++ sys/dev/isci/isci_controller.c @@ -477,7 +477,7 @@ * will enable better performance than creating the DMA maps every time we get * an I/O. */ - status = bus_dma_tag_create(bus_get_dma_tag(device), 0x1, + status = bus_dma_tag_create_device(device, 0x1, ISCI_DMA_BOUNDARY, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, isci_io_request_get_max_io_size(), SCI_MAX_SCATTER_GATHER_ELEMENTS, max_segment_size, 0, Index: sys/dev/ismt/ismt.c =================================================================== --- sys/dev/ismt/ismt.c +++ sys/dev/ismt/ismt.c @@ -616,12 +616,12 @@ goto fail; } - bus_dma_tag_create(bus_get_dma_tag(dev), 4, PAGE_SIZE, + bus_dma_tag_create_device(dev, 4, PAGE_SIZE, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, DESC_SIZE, 1, DESC_SIZE, 0, NULL, NULL, &sc->desc_dma_tag); - bus_dma_tag_create(bus_get_dma_tag(dev), 4, PAGE_SIZE, + bus_dma_tag_create_device(dev, 4, PAGE_SIZE, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, DMA_BUFFER_SIZE, 1, DMA_BUFFER_SIZE, 0, NULL, NULL, &sc->dma_buffer_dma_tag); Index: sys/dev/isp/isp_pci.c =================================================================== --- sys/dev/isp/isp_pci.c +++ sys/dev/isp/isp_pci.c @@ -1503,7 +1503,7 @@ else nsegs = ISP_NSEG_MAX; - if (bus_dma_tag_create(bus_get_dma_tag(ISP_PCD(isp)), 1, + if (bus_dma_tag_create_device(ISP_PCD(isp), 1, slim, llim, hlim, NULL, NULL, BUS_SPACE_MAXSIZE, nsegs, slim, 0, busdma_lock_mutex, &isp->isp_lock, &isp->isp_osinfo.dmat)) { ISP_LOCK(isp); Index: sys/dev/iwi/if_iwi.c =================================================================== --- sys/dev/iwi/if_iwi.c +++ sys/dev/iwi/if_iwi.c @@ -553,7 +553,7 @@ ring->queued = 0; ring->cur = ring->next = 0; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, count * IWI_CMD_DESC_SIZE, 1, count * IWI_CMD_DESC_SIZE, 0, NULL, NULL, &ring->desc_dmat); @@ -615,7 +615,7 @@ ring->csr_ridx = csr_ridx; ring->csr_widx = csr_widx; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, count * IWI_TX_DESC_SIZE, 1, count * IWI_TX_DESC_SIZE, 0, NULL, NULL, &ring->desc_dmat); @@ -646,7 +646,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, IWI_MAX_NSEG, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { @@ -754,7 +754,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { @@ -3058,7 +3058,7 @@ { if (sc->fw_dma_size >= size) return 0; - if (bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, + if (bus_dma_tag_create_device(sc->sc_dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &sc->fw_dmat) != 0) { device_printf(sc->sc_dev, Index: sys/dev/iwn/if_iwn.c =================================================================== --- sys/dev/iwn/if_iwn.c +++ sys/dev/iwn/if_iwn.c @@ -1742,7 +1742,7 @@ dma->tag = NULL; dma->size = size; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), alignment, + error = bus_dma_tag_create_device(sc->sc_dev, alignment, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &dma->tag); if (error != 0) @@ -1871,7 +1871,7 @@ } /* Create RX buffer DMA tag. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, IWN_RBUF_SIZE, 1, IWN_RBUF_SIZE, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { @@ -2020,7 +2020,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, IWN_MAX_SCATTER - 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { Index: sys/dev/ixl/i40e_osdep.c =================================================================== --- sys/dev/ixl/i40e_osdep.c +++ sys/dev/ixl/i40e_osdep.c @@ -72,7 +72,7 @@ int err; - err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + err = bus_dma_tag_create_device(dev, alignment, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/jme/if_jme.c =================================================================== --- sys/dev/jme/if_jme.c +++ sys/dev/jme/if_jme.c @@ -1150,7 +1150,7 @@ again: /* Create parent ring tag. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->jme_dev),/* parent */ + error = bus_dma_tag_create_device(sc->jme_dev, 1, 0, /* algnmnt, boundary */ lowaddr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1269,7 +1269,7 @@ if ((sc->jme_flags & JME_FLAG_DMA32BIT) != 0) lowaddr = BUS_SPACE_MAXADDR_32BIT; /* Create parent buffer tag. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->jme_dev),/* parent */ + error = bus_dma_tag_create_device(sc->jme_dev, 1, 0, /* algnmnt, boundary */ lowaddr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/le/if_le_isa.c =================================================================== --- sys/dev/le/if_le_isa.c +++ sys/dev/le/if_le_isa.c @@ -321,8 +321,7 @@ goto fail_dres; } - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_24BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/le/if_le_pci.c =================================================================== --- sys/dev/le/if_le_pci.c +++ sys/dev/le/if_le_pci.c @@ -325,8 +325,7 @@ goto fail_rres; } - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/liquidio/base/lio_request_manager.c =================================================================== --- sys/dev/liquidio/base/lio_request_manager.c +++ sys/dev/liquidio/base/lio_request_manager.c @@ -79,7 +79,7 @@ max_size = LIO_CN23XX_PKI_MAX_FRAME_SIZE * num_descs; - error = bus_dma_tag_create(bus_get_dma_tag(oct->device), /* parent */ + error = bus_dma_tag_create_device(oct->device, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/malo/if_malo.c =================================================================== --- sys/dev/malo/if_malo.c +++ sys/dev/malo/if_malo.c @@ -450,7 +450,7 @@ /* * Setup DMA descriptor area. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->malo_dev),/* parent */ + error = bus_dma_tag_create_device(sc->malo_dev, PAGE_SIZE, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/malo/if_malo_pci.c =================================================================== --- sys/dev/malo/if_malo_pci.c +++ sys/dev/malo/if_malo_pci.c @@ -220,7 +220,7 @@ /* * Setup DMA descriptor area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mfi/mfi_pci.c =================================================================== --- sys/dev/mfi/mfi_pci.c +++ sys/dev/mfi/mfi_pci.c @@ -239,7 +239,7 @@ error = ENOMEM; /* Allocate parent DMA tag */ - if (bus_dma_tag_create( bus_get_dma_tag(dev), /* PCI parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mge/if_mge.c =================================================================== --- sys/dev/mge/if_mge.c +++ sys/dev/mge/if_mge.c @@ -595,7 +595,7 @@ tab[size - 1].mge_desc->next_desc = desc_paddr; /* Allocate a busdma tag for mbufs. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), /* parent */ + error = bus_dma_tag_create_device(sc->dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -633,7 +633,7 @@ int i; /* Allocate a busdma tag and DMA safe memory for TX/RX descriptors. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), /* parent */ + error = bus_dma_tag_create_device(sc->dev, 16, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mlx/mlx_pci.c =================================================================== --- sys/dev/mlx/mlx_pci.c +++ sys/dev/mlx/mlx_pci.c @@ -186,7 +186,7 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mlx4/mlx4_en/mlx4_en_rx.c =================================================================== --- sys/dev/mlx4/mlx4_en/mlx4_en_rx.c +++ sys/dev/mlx4/mlx4_en/mlx4_en_rx.c @@ -379,8 +379,7 @@ } /* Create DMA descriptor TAG */ - if ((err = -bus_dma_tag_create( - bus_get_dma_tag(mdev->pdev->dev.bsddev), + if ((err = -bus_dma_tag_create_device(mdev->pdev->dev.bsddev, 1, /* any alignment */ 0, /* no boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/mlx4/mlx4_en/mlx4_en_tx.c =================================================================== --- sys/dev/mlx4/mlx4_en/mlx4_en_tx.c +++ sys/dev/mlx4/mlx4_en/mlx4_en_tx.c @@ -72,8 +72,7 @@ } /* Create DMA descriptor TAG */ - if ((err = -bus_dma_tag_create( - bus_get_dma_tag(mdev->pdev->dev.bsddev), + if ((err = -bus_dma_tag_create_device(mdev->pdev->dev.bsddev, 1, /* any alignment */ 0, /* no boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/mlx5/mlx5_core/mlx5_alloc.c =================================================================== --- sys/dev/mlx5/mlx5_core/mlx5_alloc.c +++ sys/dev/mlx5/mlx5_core/mlx5_alloc.c @@ -81,8 +81,7 @@ buf->page_list = kcalloc(buf->npages, sizeof(*buf->page_list), GFP_KERNEL); - err = -bus_dma_tag_create( - bus_get_dma_tag(dev->pdev->dev.bsddev), + err = -bus_dma_tag_create_device(dev->pdev->dev.bsddev, PAGE_SIZE, /* alignment */ 0, /* no boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/mlx5/mlx5_core/mlx5_cmd.c =================================================================== --- sys/dev/mlx5/mlx5_core/mlx5_cmd.c +++ sys/dev/mlx5/mlx5_core/mlx5_cmd.c @@ -1440,8 +1440,7 @@ * Create global DMA descriptor tag for allocating * 4K firmware pages: */ - err = -bus_dma_tag_create( - bus_get_dma_tag(dev->pdev->dev.bsddev), + err = -bus_dma_tag_create_device(dev->pdev->dev.bsddev, MLX5_ADAPTER_PAGE_SIZE, /* alignment */ 0, /* no boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/mlx5/mlx5_en/mlx5_en_main.c =================================================================== --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -1248,8 +1248,7 @@ goto done; /* Create DMA descriptor TAG */ - if ((err = -bus_dma_tag_create( - bus_get_dma_tag(mdev->pdev->dev.bsddev), + if ((err = -bus_dma_tag_create_device(mdev->pdev->dev.bsddev, 1, /* any alignment */ 0, /* no boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ @@ -1621,8 +1620,7 @@ int err; /* Create DMA descriptor TAG */ - if ((err = -bus_dma_tag_create( - bus_get_dma_tag(mdev->pdev->dev.bsddev), + if ((err = -bus_dma_tag_create_device(mdev->pdev->dev.bsddev, 1, /* any alignment */ 0, /* no boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/mlx5/mlx5_en/mlx5_en_rl.c =================================================================== --- sys/dev/mlx5/mlx5_en/mlx5_en_rl.c +++ sys/dev/mlx5/mlx5_en/mlx5_en_rl.c @@ -100,8 +100,7 @@ int err; /* Create DMA descriptor TAG */ - if ((err = -bus_dma_tag_create( - bus_get_dma_tag(mdev->pdev->dev.bsddev), + if ((err = -bus_dma_tag_create_device(mdev->pdev->dev.bsddev, 1, /* any alignment */ 0, /* no boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/mly/mly.c =================================================================== --- sys/dev/mly/mly.c +++ sys/dev/mly/mly.c @@ -391,7 +391,7 @@ * * Note that all of these controllers are 64-bit capable. */ - if (bus_dma_tag_create(bus_get_dma_tag(sc->mly_dev),/* PCI parent */ + if (bus_dma_tag_create_device(sc->mly_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mmc/host/dwmmc.c =================================================================== --- sys/dev/mmc/host/dwmmc.c +++ sys/dev/mmc/host/dwmmc.c @@ -230,8 +230,7 @@ /* * Set up TX descriptor ring, descriptors, and dma maps. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* Parent tag. */ + error = bus_dma_tag_create_device(sc->dev, 4096, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -275,8 +274,7 @@ sc->desc_ring[idx - 1].des3 = sc->desc_ring_paddr; sc->desc_ring[idx - 1].des0 |= DES0_ER; - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* Parent tag. */ + error = bus_dma_tag_create_device(sc->dev, CACHE_LINE_SIZE, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mps/mps_pci.c =================================================================== --- sys/dev/mps/mps_pci.c +++ sys/dev/mps/mps_pci.c @@ -211,7 +211,7 @@ sc->mps_bhandle = rman_get_bushandle(sc->mps_regs_resource); /* Allocate the parent DMA tag */ - if (bus_dma_tag_create( bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/msk/if_msk.c =================================================================== --- sys/dev/msk/if_msk.c +++ sys/dev/msk/if_msk.c @@ -2151,8 +2151,7 @@ count = imin(4096, roundup2(count, 1024)); sc->msk_stat_count = count; stat_sz = count * sizeof(struct msk_stat_desc); - error = bus_dma_tag_create( - bus_get_dma_tag(sc->msk_dev), /* parent */ + error = bus_dma_tag_create_device(sc->msk_dev, MSK_STAT_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2222,8 +2221,7 @@ int error, i; /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc_if->msk_if_dev), /* parent */ + error = bus_dma_tag_create_device(sc_if->msk_if_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mvs/mvs.c =================================================================== --- sys/dev/mvs/mvs.c +++ sys/dev/mvs/mvs.c @@ -333,7 +333,7 @@ struct mvs_dc_cb_args dcba; /* EDMA command request area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 1024, 0, + if (bus_dma_tag_create_device(dev, 1024, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MVS_WORKRQ_SIZE, 1, MVS_WORKRQ_SIZE, 0, NULL, NULL, &ch->dma.workrq_tag)) @@ -350,7 +350,7 @@ } ch->dma.workrq_bus = dcba.maddr; /* EDMA command response area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 256, 0, + if (bus_dma_tag_create_device(dev, 256, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MVS_WORKRP_SIZE, 1, MVS_WORKRP_SIZE, 0, NULL, NULL, &ch->dma.workrp_tag)) @@ -367,7 +367,7 @@ } ch->dma.workrp_bus = dcba.maddr; /* Data area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 2, MVS_EPRD_MAX, + if (bus_dma_tag_create_device(dev, 2, MVS_EPRD_MAX, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MVS_SG_ENTRIES * PAGE_SIZE * MVS_MAX_SLOTS, Index: sys/dev/mwl/if_mwl.c =================================================================== --- sys/dev/mwl/if_mwl.c +++ sys/dev/mwl/if_mwl.c @@ -1937,7 +1937,7 @@ /* * Setup DMA descriptor area. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), /* parent */ + error = bus_dma_tag_create_device(sc->sc_dev, PAGE_SIZE, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mwl/if_mwl_pci.c =================================================================== --- sys/dev/mwl/if_mwl_pci.c +++ sys/dev/mwl/if_mwl_pci.c @@ -176,7 +176,7 @@ /* * Setup DMA descriptor area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/mxge/if_mxge.c =================================================================== --- sys/dev/mxge/if_mxge.c +++ sys/dev/mxge/if_mxge.c @@ -4811,7 +4811,7 @@ goto abort_with_nothing; } - err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + err = bus_dma_tag_create_device(dev, 1, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR, /* low */ Index: sys/dev/neta/if_mvneta.c =================================================================== --- sys/dev/neta/if_mvneta.c +++ sys/dev/neta/if_mvneta.c @@ -460,8 +460,7 @@ */ maxsize = maxsegsz = sizeof(struct mvneta_tx_desc) * MVNETA_TX_RING_CNT; - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* parent */ + error = bus_dma_tag_create_device(sc->dev, 16, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -477,8 +476,7 @@ "Failed to create DMA tag for Tx descriptors.\n"); goto fail; } - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* parent */ + error = bus_dma_tag_create_device(sc->dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -508,8 +506,7 @@ * Create Rx DMA. */ /* Create tag for Rx descripors */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* parent */ + error = bus_dma_tag_create_device(sc->dev, 32, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -527,8 +524,7 @@ } /* Create tag for Rx buffers */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* parent */ + error = bus_dma_tag_create_device(sc->dev, 32, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/nfe/if_nfe.c =================================================================== --- sys/dev/nfe/if_nfe.c +++ sys/dev/nfe/if_nfe.c @@ -559,8 +559,7 @@ dma_addr_max = BUS_SPACE_MAXADDR_32BIT; if ((sc->nfe_flags & NFE_40BIT_ADDR) != 0) dma_addr_max = NFE_DMA_MAXADDR; - error = bus_dma_tag_create( - bus_get_dma_tag(sc->nfe_dev), /* parent */ + error = bus_dma_tag_create_device(sc->nfe_dev, 1, 0, /* alignment, boundary */ dma_addr_max, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/nge/if_nge.c =================================================================== --- sys/dev/nge/if_nge.c +++ sys/dev/nge/if_nge.c @@ -1055,8 +1055,7 @@ int error, i; /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->nge_dev), /* parent */ + error = bus_dma_tag_create_device(sc->nge_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ntb/ntb_hw/ntb_hw_intel.c =================================================================== --- sys/dev/ntb/ntb_hw/ntb_hw_intel.c +++ sys/dev/ntb/ntb_hw/ntb_hw_intel.c @@ -804,7 +804,7 @@ * on a link side BAR0 is 32KB, while on a host side it is 64KB. * Without this hack DMAR blocks those accesses as not allowed. */ - if (bus_dma_tag_create(bus_get_dma_tag(ntb->device), 1, 0, + if (bus_dma_tag_create_device(ntb->device, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, bar->size, 1, bar->size, 0, NULL, NULL, &ntb->bar0_dma_tag)) { device_printf(ntb->device, "Unable to create BAR0 tag\n"); Index: sys/dev/ntb/ntb_transport.c =================================================================== --- sys/dev/ntb/ntb_transport.c +++ sys/dev/ntb/ntb_transport.c @@ -1282,7 +1282,7 @@ /* Alloc memory for receiving data. Must be aligned */ mw->buff_size = buff_size; - if (bus_dma_tag_create(bus_get_dma_tag(nt->dev), mw->xlat_align, 0, + if (bus_dma_tag_create_device(nt->dev, mw->xlat_align, 0, mw->addr_limit, BUS_SPACE_MAXADDR, NULL, NULL, mw->buff_size, 1, mw->buff_size, 0, NULL, NULL, &mw->dma_tag)) { Index: sys/dev/ntb/test/ntb_tool.c =================================================================== --- sys/dev/ntb/test/ntb_tool.c +++ sys/dev/ntb/test/ntb_tool.c @@ -817,7 +817,7 @@ device_printf(tc->dev, "mw_size %zi req_size %zi buff %zi\n", inmw->phys_size, req_size, inmw->size); - if (bus_dma_tag_create(bus_get_dma_tag(tc->dev), inmw->xlat_align, 0, + if (bus_dma_tag_create_device(tc->dev, inmw->xlat_align, 0, inmw->addr_limit, BUS_SPACE_MAXADDR, NULL, NULL, inmw->size, 1, inmw->size, 0, NULL, NULL, &inmw->dma_tag)) { device_printf(tc->dev, "Unable to create MW tag of size " Index: sys/dev/nvme/nvme_ctrlr.c =================================================================== --- sys/dev/nvme/nvme_ctrlr.c +++ sys/dev/nvme/nvme_ctrlr.c @@ -937,7 +937,7 @@ ctrlr->hmb_nchunks = ctrlr->cdata.hmmaxd; ctrlr->hmb_chunks = malloc(sizeof(struct nvme_hmb_chunk) * ctrlr->hmb_nchunks, M_NVME, M_WAITOK); - err = bus_dma_tag_create(bus_get_dma_tag(ctrlr->dev), + err = bus_dma_tag_create_device(ctrlr->dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, ctrlr->hmb_chunk, 1, ctrlr->hmb_chunk, 0, NULL, NULL, &ctrlr->hmb_tag); if (err != 0) { @@ -980,7 +980,7 @@ } size = sizeof(struct nvme_hmb_desc) * ctrlr->hmb_nchunks; - err = bus_dma_tag_create(bus_get_dma_tag(ctrlr->dev), + err = bus_dma_tag_create_device(ctrlr->dev, 16, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &ctrlr->hmb_desc_tag); if (err != 0) { Index: sys/dev/nvme/nvme_qpair.c =================================================================== --- sys/dev/nvme/nvme_qpair.c +++ sys/dev/nvme/nvme_qpair.c @@ -689,7 +689,7 @@ mtx_init(&qpair->lock, "nvme qpair lock", NULL, MTX_DEF); /* Note: NVMe PRP format is restricted to 4-byte alignment. */ - err = bus_dma_tag_create(bus_get_dma_tag(ctrlr->dev), + err = bus_dma_tag_create_device(ctrlr->dev, 4, PAGE_SIZE, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, NVME_MAX_XFER_SIZE, (NVME_MAX_XFER_SIZE/PAGE_SIZE)+1, PAGE_SIZE, 0, @@ -711,7 +711,7 @@ prpmemsz = qpair->num_trackers * prpsz; allocsz = cmdsz + cplsz + prpmemsz; - err = bus_dma_tag_create(bus_get_dma_tag(ctrlr->dev), + err = bus_dma_tag_create_device(ctrlr->dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, allocsz, 1, allocsz, 0, NULL, NULL, &qpair->dma_tag); if (err != 0) { Index: sys/dev/oce/oce_queue.c =================================================================== --- sys/dev/oce/oce_queue.c +++ sys/dev/oce/oce_queue.c @@ -236,7 +236,7 @@ wq->parent = (void *)sc; - rc = bus_dma_tag_create(bus_get_dma_tag(sc->dev), + rc = bus_dma_tag_create_device(sc->dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, @@ -433,7 +433,7 @@ rq->parent = (void *)sc; - rc = bus_dma_tag_create(bus_get_dma_tag(sc->dev), + rc = bus_dma_tag_create_device(sc->dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, Index: sys/dev/oce/oce_util.c =================================================================== --- sys/dev/oce/oce_util.c +++ sys/dev/oce/oce_util.c @@ -63,7 +63,7 @@ memset(dma, 0, sizeof(OCE_DMA_MEM)); - rc = bus_dma_tag_create(bus_get_dma_tag(sc->dev), + rc = bus_dma_tag_create_device(sc->dev, 8, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, @@ -178,7 +178,7 @@ ring->item_size = item_size; ring->num_items = q_len; - rc = bus_dma_tag_create(bus_get_dma_tag(sc->dev), + rc = bus_dma_tag_create_device(sc->dev, 4096, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, Index: sys/dev/ocs_fc/ocs_pci.c =================================================================== --- sys/dev/ocs_fc/ocs_pci.c +++ sys/dev/ocs_fc/ocs_pci.c @@ -498,7 +498,7 @@ } /* create a root DMA tag for the device */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, 1, /* byte alignment */ 0, /* no boundary restrictions */ BUS_SPACE_MAXADDR, /* no minimum low address */ Index: sys/dev/pci/pci_dw.c =================================================================== --- sys/dev/pci/pci_dw.c +++ sys/dev/pci/pci_dw.c @@ -623,7 +623,7 @@ if (bootverbose) device_printf(dev, "Bus is%s cache-coherent\n", sc->coherent ? "" : " not"); - rv = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + rv = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/pci/pci_host_generic.c =================================================================== --- sys/dev/pci/pci_host_generic.c +++ sys/dev/pci/pci_host_generic.c @@ -81,7 +81,7 @@ sc->dev = dev; /* Create the parent DMA tag to pass down the coherent flag */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + error = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/pms/freebsd/driver/common/lxutil.c =================================================================== --- sys/dev/pms/freebsd/driver/common/lxutil.c +++ sys/dev/pms/freebsd/driver/common/lxutil.c @@ -63,7 +63,7 @@ struct agtiapi_softc *pmsc = thisCardInst->pCard; int wait = 0; - if( bus_dma_tag_create( bus_get_dma_tag(pmsc->my_dev), // parent + if( bus_dma_tag_create_device( pmsc->my_dev, 32, // alignment 0, // boundary BUS_SPACE_MAXADDR, // lowaddr Index: sys/dev/qlnx/qlnxe/qlnx_os.c =================================================================== --- sys/dev/qlnx/qlnxe/qlnx_os.c +++ sys/dev/qlnx/qlnxe/qlnx_os.c @@ -5285,8 +5285,7 @@ /* * Allocate parent DMA Tag */ - ret = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ + ret = bus_dma_tag_create_device(dev, 1,((bus_size_t)(1ULL << 32)),/* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/qlxgb/qla_os.c =================================================================== --- sys/dev/qlxgb/qla_os.c +++ sys/dev/qlxgb/qla_os.c @@ -619,8 +619,7 @@ /* * Allocate parent DMA Tag */ - ret = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ + ret = bus_dma_tag_create_device(dev, 1,((bus_size_t)(1ULL << 32)),/* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/qlxgbe/ql_os.c =================================================================== --- sys/dev/qlxgbe/ql_os.c +++ sys/dev/qlxgbe/ql_os.c @@ -819,8 +819,7 @@ /* * Allocate parent DMA Tag */ - ret = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ + ret = bus_dma_tag_create_device(dev, 1,((bus_size_t)(1ULL << 32)),/* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/qlxge/qls_os.c =================================================================== --- sys/dev/qlxge/qls_os.c +++ sys/dev/qlxge/qls_os.c @@ -688,8 +688,7 @@ /* * Allocate parent DMA Tag */ - ret = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ + ret = bus_dma_tag_create_device(dev, 1,((bus_size_t)(1ULL << 32)),/* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ral/rt2560.c =================================================================== --- sys/dev/ral/rt2560.c +++ sys/dev/ral/rt2560.c @@ -461,7 +461,7 @@ ring->cur = ring->next = 0; ring->cur_encrypt = ring->next_encrypt = 0; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, count * RT2560_TX_DESC_SIZE, 1, count * RT2560_TX_DESC_SIZE, 0, NULL, NULL, &ring->desc_dmat); @@ -493,7 +493,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, RT2560_MAX_SCATTER, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); @@ -605,7 +605,7 @@ ring->cur = ring->next = 0; ring->cur_decrypt = 0; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, count * RT2560_RX_DESC_SIZE, 1, count * RT2560_RX_DESC_SIZE, 0, NULL, NULL, &ring->desc_dmat); @@ -640,7 +640,7 @@ /* * Pre-allocate Rx buffers and populate Rx ring. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { Index: sys/dev/ral/rt2661.c =================================================================== --- sys/dev/ral/rt2661.c +++ sys/dev/ral/rt2661.c @@ -471,7 +471,7 @@ ring->queued = 0; ring->cur = ring->next = ring->stat = 0; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, count * RT2661_TX_DESC_SIZE, 1, count * RT2661_TX_DESC_SIZE, 0, NULL, NULL, &ring->desc_dmat); @@ -503,7 +503,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, RT2661_MAX_SCATTER, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { @@ -612,7 +612,7 @@ ring->count = count; ring->cur = ring->next = 0; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, count * RT2661_RX_DESC_SIZE, 1, count * RT2661_RX_DESC_SIZE, 0, NULL, NULL, &ring->desc_dmat); @@ -647,7 +647,7 @@ /* * Pre-allocate Rx buffers and populate Rx ring. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { Index: sys/dev/ral/rt2860.c =================================================================== --- sys/dev/ral/rt2860.c +++ sys/dev/ral/rt2860.c @@ -512,7 +512,7 @@ size = RT2860_TX_RING_COUNT * sizeof (struct rt2860_txd); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 16, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 16, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &ring->desc_dmat); if (error != 0) { @@ -619,7 +619,7 @@ /* init data_pool early in case of failure.. */ SLIST_INIT(&sc->data_pool); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &sc->txwi_dmat); if (error != 0) { @@ -694,7 +694,7 @@ size = RT2860_RX_RING_COUNT * sizeof (struct rt2860_rxd); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 16, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 16, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &ring->desc_dmat); if (error != 0) { @@ -716,7 +716,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { Index: sys/dev/re/if_re.c =================================================================== --- sys/dev/re/if_re.c +++ sys/dev/re/if_re.c @@ -1012,7 +1012,7 @@ lowaddr = BUS_SPACE_MAXADDR; if ((sc->rl_flags & RL_FLAG_PCIE) == 0) lowaddr = BUS_SPACE_MAXADDR_32BIT; - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + error = bus_dma_tag_create_device(dev, 1, 0, lowaddr, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->rl_parent_tag); Index: sys/dev/rl/if_rl.c =================================================================== --- sys/dev/rl/if_rl.c +++ sys/dev/rl/if_rl.c @@ -924,7 +924,7 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->rl_dev), /* parent */ + error = bus_dma_tag_create_device(sc->rl_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/rt/if_rt.c =================================================================== --- sys/dev/rt/if_rt.c +++ sys/dev/rt/if_rt.c @@ -2216,7 +2216,7 @@ bus_dma_segment_t segs[1]; int i, nsegs, error; - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), PAGE_SIZE, 0, + error = bus_dma_tag_create_device(sc->dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, RT_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt_rxdesc), 1, RT_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt_rxdesc), @@ -2244,7 +2244,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), PAGE_SIZE, 0, + error = bus_dma_tag_create_device(sc->dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MJUMPAGESIZE, 1, MJUMPAGESIZE, 0, NULL, NULL, &ring->data_dma_tag); @@ -2381,7 +2381,7 @@ mtx_init(&ring->lock, device_get_nameunit(sc->dev), NULL, MTX_DEF); - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), PAGE_SIZE, 0, + error = bus_dma_tag_create_device(sc->dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, RT_SOFTC_TX_RING_DESC_COUNT * sizeof(struct rt_txdesc), 1, RT_SOFTC_TX_RING_DESC_COUNT * sizeof(struct rt_txdesc), @@ -2413,7 +2413,7 @@ ring->desc_cur = 0; ring->desc_next = 0; - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), PAGE_SIZE, 0, + error = bus_dma_tag_create_device(sc->dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, RT_SOFTC_TX_RING_DATA_COUNT * RT_TX_DATA_SEG0_SIZE, 1, RT_SOFTC_TX_RING_DATA_COUNT * RT_TX_DATA_SEG0_SIZE, @@ -2441,7 +2441,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->dev), PAGE_SIZE, 0, + error = bus_dma_tag_create_device(sc->dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MJUMPAGESIZE, RT_SOFTC_MAX_SCATTER, MJUMPAGESIZE, 0, NULL, NULL, &ring->data_dma_tag); Index: sys/dev/rtwn/pci/rtwn_pci_attach.c =================================================================== --- sys/dev/rtwn/pci/rtwn_pci_attach.c +++ sys/dev/rtwn/pci/rtwn_pci_attach.c @@ -134,7 +134,7 @@ /* Allocate Rx descriptors. */ size = sizeof(struct rtwn_rx_stat_pci) * RTWN_PCI_RX_LIST_COUNT; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &rx_ring->desc_dmat); if (error != 0) { @@ -159,7 +159,7 @@ BUS_DMASYNC_PREWRITE); /* Create RX buffer DMA tag. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MJUMPAGESIZE, 1, MJUMPAGESIZE, 0, NULL, NULL, &rx_ring->data_dmat); if (error != 0) { @@ -274,7 +274,7 @@ int i, error; size = sc->txdesc_len * RTWN_PCI_TX_LIST_COUNT; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), PAGE_SIZE, 0, + error = bus_dma_tag_create_device(sc->sc_dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &tx_ring->desc_dmat); if (error != 0) { @@ -298,7 +298,7 @@ bus_dmamap_sync(tx_ring->desc_dmat, tx_ring->desc_map, BUS_DMASYNC_PREWRITE); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MJUMPAGESIZE, 1, MJUMPAGESIZE, 0, NULL, NULL, &tx_ring->data_dmat); if (error != 0) { Index: sys/dev/safe/safe.c =================================================================== --- sys/dev/safe/safe.c +++ sys/dev/safe/safe.c @@ -279,7 +279,7 @@ /* * Setup DMA descriptor area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, 1, /* alignment */ SAFE_DMA_BOUNDARY, /* boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ @@ -294,7 +294,7 @@ device_printf(dev, "cannot allocate DMA tag\n"); goto bad4; } - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, 1, /* alignment */ SAFE_MAX_DSIZE, /* boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ @@ -1536,7 +1536,7 @@ { int r; - r = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), /* parent */ + r = bus_dma_tag_create_device(sc->sc_dev, sizeof(u_int32_t), 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/safexcel/safexcel.c =================================================================== --- sys/dev/safexcel/safexcel.c +++ sys/dev/safexcel/safexcel.c @@ -831,7 +831,7 @@ KASSERT(sdm->vaddr == NULL, ("%s: DMA memory descriptor in use.", __func__)); - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), /* parent */ + error = bus_dma_tag_create_device(sc->sc_dev, PAGE_SIZE, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -907,8 +907,7 @@ for (i = 0; i < sc->sc_config.rings; i++) { ring = &sc->sc_ring[i]; - error = bus_dma_tag_create( - bus_get_dma_tag(sc->sc_dev),/* parent */ + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/sdhci/sdhci.c =================================================================== --- sys/dev/sdhci/sdhci.c +++ sys/dev/sdhci/sdhci.c @@ -749,7 +749,7 @@ * forming the actual address of data, requiring the SDMA buffer to * be aligned to the SDMA boundary. */ - err = bus_dma_tag_create(bus_get_dma_tag(slot->bus), slot->sdma_bbufsz, + err = bus_dma_tag_create_device(slot->bus, slot->sdma_bbufsz, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, slot->sdma_bbufsz, 1, slot->sdma_bbufsz, BUS_DMA_ALLOCNOW, NULL, NULL, &slot->dmatag); Index: sys/dev/sfxge/sfxge_dma.c =================================================================== --- sys/dev/sfxge/sfxge_dma.c +++ sys/dev/sfxge/sfxge_dma.c @@ -201,7 +201,7 @@ { /* Create the parent dma tag. */ - if (bus_dma_tag_create(bus_get_dma_tag(sc->dev), /* parent */ + if (bus_dma_tag_create_device(sc->dev, 1, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/sge/if_sge.c =================================================================== --- sys/dev/sge/if_sge.c +++ sys/dev/sge/if_sge.c @@ -761,7 +761,7 @@ cd = &sc->sge_cdata; ld = &sc->sge_ldata; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sge_dev), + error = bus_dma_tag_create_device(sc->sge_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/siis/siis.c =================================================================== --- sys/dev/siis/siis.c +++ sys/dev/siis/siis.c @@ -670,7 +670,7 @@ struct siis_dc_cb_args dcba; /* Command area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 1024, 0, + if (bus_dma_tag_create_device(dev, 1024, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, SIIS_WORK_SIZE, 1, SIIS_WORK_SIZE, 0, NULL, NULL, &ch->dma.work_tag)) @@ -685,7 +685,7 @@ } ch->dma.work_bus = dcba.maddr; /* Data area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + if (bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, SIIS_SG_ENTRIES * PAGE_SIZE * SIIS_MAX_SLOTS, Index: sys/dev/sis/if_sis.c =================================================================== --- sys/dev/sis/if_sis.c +++ sys/dev/sis/if_sis.c @@ -1236,7 +1236,7 @@ int error, i; /* Allocate the parent bus DMA tag appropriate for PCI. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sis_dev), + error = bus_dma_tag_create_device(sc->sis_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sis_parent_tag); Index: sys/dev/sk/if_sk.c =================================================================== --- sys/dev/sk/if_sk.c +++ sys/dev/sk/if_sk.c @@ -1944,8 +1944,7 @@ * RAM. Until we have more clues of the breakage, disable DAC mode * by limiting DMA address to be in 32bit address space. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc_if->sk_if_dev),/* parent */ + error = bus_dma_tag_create_device(sc_if->sk_if_dev, 1, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/smartpqi/smartpqi_main.c =================================================================== --- sys/dev/smartpqi/smartpqi_main.c +++ sys/dev/smartpqi/smartpqi_main.c @@ -293,7 +293,7 @@ * * Note that some of these controllers are 64-bit capable. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, PAGE_SIZE, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/sound/isa/ad1816.c =================================================================== --- sys/dev/sound/isa/ad1816.c +++ sys/dev/sound/isa/ad1816.c @@ -613,7 +613,7 @@ if (mixer_init(dev, &ad1816mixer_class, ad1816)) goto no; snd_setup_intr(dev, ad1816->irq, 0, ad1816_intr, ad1816, &ad1816->ih); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/isa/ess.c =================================================================== --- sys/dev/sound/isa/ess.c +++ sys/dev/sound/isa/ess.c @@ -855,7 +855,7 @@ if (!sc->duplex) pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/isa/mss.c =================================================================== --- sys/dev/sound/isa/mss.c +++ sys/dev/sound/isa/mss.c @@ -1728,7 +1728,7 @@ } if (pdma == rdma) pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/isa/sb16.c =================================================================== --- sys/dev/sound/isa/sb16.c +++ sys/dev/sound/isa/sb16.c @@ -842,7 +842,7 @@ sb->prio = 0; - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/isa/sb8.c =================================================================== --- sys/dev/sound/isa/sb8.c +++ sys/dev/sound/isa/sb8.c @@ -738,7 +738,7 @@ pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/macio/aoa.c =================================================================== --- sys/dev/sound/macio/aoa.c +++ sys/dev/sound/macio/aoa.c @@ -120,7 +120,7 @@ device_t self; self = sc->sc_dev; - err = bus_dma_tag_create(bus_get_dma_tag(self), + err = bus_dma_tag_create_device(self, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, AOA_BUFFER_SIZE, 1, AOA_BUFFER_SIZE, 0, NULL, NULL, &tag); if (err != 0) Index: sys/dev/sound/pci/als4000.c =================================================================== --- sys/dev/sound/pci/als4000.c +++ sys/dev/sound/pci/als4000.c @@ -786,7 +786,7 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, ALS_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/atiixp.c =================================================================== --- sys/dev/sound/pci/atiixp.c +++ sys/dev/sound/pci/atiixp.c @@ -1256,7 +1256,7 @@ /* * DMA tag for scatter-gather buffers and link pointers */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, @@ -1268,7 +1268,7 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/aureal.c =================================================================== --- sys/dev/sound/pci/aureal.c +++ sys/dev/sound/pci/aureal.c @@ -637,7 +637,7 @@ if (codec == NULL) goto bad; if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) goto bad; - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/cmi.c =================================================================== --- sys/dev/sound/pci/cmi.c +++ sys/dev/sound/pci/cmi.c @@ -968,7 +968,7 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, CMI_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/cs4281.c =================================================================== --- sys/dev/sound/pci/cs4281.c +++ sys/dev/sound/pci/cs4281.c @@ -816,7 +816,7 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, CS4281_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/csapcm.c =================================================================== --- sys/dev/sound/pci/csapcm.c +++ sys/dev/sound/pci/csapcm.c @@ -709,7 +709,7 @@ if (resp->irq == NULL) return (1); } - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, /*alignment*/CS461x_BUFFSIZE, /*boundary*/CS461x_BUFFSIZE, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, Index: sys/dev/sound/pci/ds1.c =================================================================== --- sys/dev/sound/pci/ds1.c +++ sys/dev/sound/pci/ds1.c @@ -839,7 +839,7 @@ memsz += (64 + 1) * 4; if (sc->regbase == NULL) { - if (bus_dma_tag_create(bus_get_dma_tag(sc->dev), 2, 0, + if (bus_dma_tag_create_device(sc->dev, 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, memsz, 1, memsz, 0, NULL, @@ -970,7 +970,7 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, DS1_BUFFSIZE, 65536); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/emu10k1.c =================================================================== --- sys/dev/sound/pci/emu10k1.c +++ sys/dev/sound/pci/emu10k1.c @@ -2102,7 +2102,7 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, EMU_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/(1U << 31) - 1, /* can only access 0-2gb */ /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/emu10kx.c =================================================================== --- sys/dev/sound/pci/emu10kx.c +++ sys/dev/sound/pci/emu10kx.c @@ -2711,7 +2711,7 @@ emu_wrptr(sc, 0, EMU_SPBYPASS, 0xf00); /* What will happen if * we write 1 here? */ - if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(sc->dev), + if (bus_dma_tag_create_device(sc->dev, /* alignment */ 2, /* boundary */ 0, /* lowaddr */ (1U << 31) - 1, /* can only access 0-2gb */ /* highaddr */ BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/envy24.c =================================================================== --- sys/dev/sound/pci/envy24.c +++ sys/dev/sound/pci/envy24.c @@ -2527,7 +2527,7 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(sc->dev), + if (bus_dma_tag_create_device(sc->dev, /*alignment*/4, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, Index: sys/dev/sound/pci/envy24ht.c =================================================================== --- sys/dev/sound/pci/envy24ht.c +++ sys/dev/sound/pci/envy24ht.c @@ -2433,7 +2433,7 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(sc->dev), + if (bus_dma_tag_create_device(sc->dev, /*alignment*/4, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, Index: sys/dev/sound/pci/es137x.c =================================================================== --- sys/dev/sound/pci/es137x.c +++ sys/dev/sound/pci/es137x.c @@ -1846,7 +1846,7 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/fm801.c =================================================================== --- sys/dev/sound/pci/fm801.c +++ sys/dev/sound/pci/fm801.c @@ -630,7 +630,7 @@ goto oops; } - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/hda/hdac.c =================================================================== --- sys/dev/sound/pci/hda/hdac.c +++ sys/dev/sound/pci/hda/hdac.c @@ -596,8 +596,7 @@ /* * Create a DMA tag */ - result = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* parent */ + result = bus_dma_tag_create_device(sc->dev, HDA_DMA_ALIGNMENT, /* alignment */ 0, /* boundary */ (sc->support_64bit) ? BUS_SPACE_MAXADDR : @@ -1305,8 +1304,7 @@ } } - result = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* parent */ + result = bus_dma_tag_create_device(sc->dev, HDA_DMA_ALIGNMENT, /* alignment */ 0, /* boundary */ (sc->support_64bit) ? BUS_SPACE_MAXADDR : Index: sys/dev/sound/pci/hdspe.c =================================================================== --- sys/dev/sound/pci/hdspe.c +++ sys/dev/sound/pci/hdspe.c @@ -161,7 +161,7 @@ } /* Allocate DMA resources. */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(sc->dev), + if (bus_dma_tag_create_device(sc->dev, /*alignment*/4, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, Index: sys/dev/sound/pci/ich.c =================================================================== --- sys/dev/sound/pci/ich.c +++ sys/dev/sound/pci/ich.c @@ -1044,7 +1044,7 @@ ((sc->hasmic) ? 3 : 2); /* BDL tag */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 8, 0, + if (bus_dma_tag_create_device(dev, 8, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sc->dtbl_size, 1, 0x3ffff, 0, NULL, NULL, &sc->dmat) != 0) { device_printf(dev, "unable to create dma tag\n"); @@ -1052,7 +1052,7 @@ } /* PCM channel tag */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), ICH_MIN_BLKSZ, 0, + if (bus_dma_tag_create_device(dev, ICH_MIN_BLKSZ, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sc->bufsz, 1, 0x3ffff, 0, NULL, NULL, &sc->chan_dmat) != 0) { device_printf(dev, "unable to create dma tag\n"); Index: sys/dev/sound/pci/maestro.c =================================================================== --- sys/dev/sound/pci/maestro.c +++ sys/dev/sound/pci/maestro.c @@ -1806,7 +1806,7 @@ dacn = AGG_MAXPLAYCH; ess->bufsz = pcm_getbuffersize(dev, 4096, AGG_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/ bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, /*align */ 4, 1 << (16+1), /*limit */ MAESTRO_MAXADDR, BUS_SPACE_MAXADDR, /*filter*/ NULL, NULL, @@ -1819,7 +1819,7 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/ bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, /*align */ 1 << WAVCACHE_BASEADDR_SHIFT, 1 << (16+1), /*limit */ MAESTRO_MAXADDR, BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/maestro3.c =================================================================== --- sys/dev/sound/pci/maestro3.c +++ sys/dev/sound/pci/maestro3.c @@ -1386,8 +1386,7 @@ sc->bufsz = pcm_getbuffersize(dev, M3_BUFSIZE_MIN, M3_BUFSIZE_DEFAULT, M3_BUFSIZE_MAX); - if (bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ + if (bus_dma_tag_create_device(dev, 2, 0, /* alignment, boundary */ M3_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/sound/pci/solo.c =================================================================== --- sys/dev/sound/pci/solo.c +++ sys/dev/sound/pci/solo.c @@ -1025,9 +1025,9 @@ pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); #if 0 - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/65536, /*boundary*/0, + if (bus_dma_tag_create_device(dev, /*alignment*/65536, /*boundary*/0, #endif - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, Index: sys/dev/sound/pci/t4dwave.c =================================================================== --- sys/dev/sound/pci/t4dwave.c +++ sys/dev/sound/pci/t4dwave.c @@ -907,7 +907,7 @@ 65536); } - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), + if (bus_dma_tag_create_device(dev, /*alignment*/TR_BUFALGN, /*boundary*/0, /*lowaddr*/lowaddr, Index: sys/dev/sound/pci/via8233.c =================================================================== --- sys/dev/sound/pci/via8233.c +++ sys/dev/sound/pci/via8233.c @@ -1291,7 +1291,7 @@ nsegs = (via_dxs_chnum + via_sgd_chnum + NWRCHANS) * VIA_SEGS_MAX; /* DMA tag for buffers */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, @@ -1308,7 +1308,7 @@ * requires a list in memory of work to do. We need only 16 bytes * for this list, and it is wasteful to allocate 16K. */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/via82c686.c =================================================================== --- sys/dev/sound/pci/via82c686.c +++ sys/dev/sound/pci/via82c686.c @@ -555,7 +555,7 @@ via->codec_caps & (AC97_EXTCAP_VRA | AC97_EXTCAP_VRM)); /* DMA tag for buffers */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, @@ -572,7 +572,7 @@ * requires a list in memory of work to do. We need only 16 bytes * for this list, and it is wasteful to allocate 16K. */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/sound/pci/vibes.c =================================================================== --- sys/dev/sound/pci/vibes.c +++ sys/dev/sound/pci/vibes.c @@ -769,7 +769,7 @@ } sc->bufsz = pcm_getbuffersize(dev, 4096, SV_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (bus_dma_tag_create_device(dev, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, Index: sys/dev/ste/if_ste.c =================================================================== --- sys/dev/ste/if_ste.c +++ sys/dev/ste/if_ste.c @@ -1132,8 +1132,7 @@ int error, i; /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->ste_dev), /* parent */ + error = bus_dma_tag_create_device(sc->ste_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/stge/if_stge.c =================================================================== --- sys/dev/stge/if_stge.c +++ sys/dev/stge/if_stge.c @@ -733,7 +733,7 @@ int error, i; /* create parent tag. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev),/* parent */ + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, /* algnmnt, boundary */ STGE_DMA_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/ti/if_ti.c =================================================================== --- sys/dev/ti/if_ti.c +++ sys/dev/ti/if_ti.c @@ -1062,7 +1062,7 @@ if (sc->ti_dac == 0) lowaddr = BUS_SPACE_MAXADDR_32BIT; - error = bus_dma_tag_create(bus_get_dma_tag(sc->ti_dev), 1, 0, lowaddr, + error = bus_dma_tag_create_device(sc->ti_dev, 1, 0, lowaddr, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->ti_cdata.ti_parent_tag); Index: sys/dev/twa/tw_osl_freebsd.c =================================================================== --- sys/dev/twa/tw_osl_freebsd.c +++ sys/dev/twa/tw_osl_freebsd.c @@ -550,7 +550,7 @@ } /* Create the parent dma tag. */ - if (bus_dma_tag_create(bus_get_dma_tag(sc->bus_dev), /* parent */ + if (bus_dma_tag_create_device(sc->bus_dev, sc->alignment, /* alignment */ TW_OSLI_DMA_BOUNDARY, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/twe/twe_freebsd.c =================================================================== --- sys/dev/twe/twe_freebsd.c +++ sys/dev/twe/twe_freebsd.c @@ -230,7 +230,7 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */ + if (bus_dma_tag_create_device(dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/tws/tws.c =================================================================== --- sys/dev/tws/tws.c +++ sys/dev/tws/tws.c @@ -532,7 +532,7 @@ TWS_MAX_32BIT_SG_ELEMENTS; dma_mem_size = (sizeof(struct tws_command_packet) * tws_queue_depth) + (TWS_SECTOR_SIZE) ; - if ( bus_dma_tag_create(bus_get_dma_tag(sc->tws_dev), /* PCI parent */ + if ( bus_dma_tag_create_device(sc->tws_dev, TWS_ALIGNMENT, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ Index: sys/dev/vge/if_vge.c =================================================================== --- sys/dev/vge/if_vge.c +++ sys/dev/vge/if_vge.c @@ -707,7 +707,7 @@ again: /* Create parent ring tag. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->vge_dev),/* parent */ + error = bus_dma_tag_create_device(sc->vge_dev, 1, 0, /* algnmnt, boundary */ lowaddr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/vmware/pvscsi/pvscsi.c =================================================================== --- sys/dev/vmware/pvscsi/pvscsi.c +++ sys/dev/vmware/pvscsi/pvscsi.c @@ -1624,7 +1624,7 @@ return (ENXIO); } - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + error = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE, 0, NULL, NULL, &sc->parent_dmat); Index: sys/dev/vmware/vmci/vmci.c =================================================================== --- sys/dev/vmware/vmci/vmci.c +++ sys/dev/vmware/vmci/vmci.c @@ -494,7 +494,7 @@ bzero(dma, sizeof(struct vmci_dma_alloc)); - error = bus_dma_tag_create(bus_get_dma_tag(vmci_sc->vmci_dev), + error = bus_dma_tag_create_device(vmci_sc->vmci_dev, align, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/vnic/nicvf_queues.c =================================================================== --- sys/dev/vnic/nicvf_queues.c +++ sys/dev/vnic/nicvf_queues.c @@ -164,8 +164,7 @@ int err, err_dmat; /* Create DMA tag first */ - err = bus_dma_tag_create( - bus_get_dma_tag(nic->dev), /* parent tag */ + err = bus_dma_tag_create_device(nic->dev, align_bytes, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ @@ -376,8 +375,7 @@ "Buffer size to large for mbuf cluster\n"); return (EINVAL); } - err = bus_dma_tag_create( - bus_get_dma_tag(nic->dev), /* parent tag */ + err = bus_dma_tag_create_device(nic->dev, NICVF_RCV_BUF_ALIGN_BYTES, /* alignment */ 0, /* boundary */ DMAP_MAX_PHYSADDR, /* lowaddr */ @@ -1083,8 +1081,7 @@ */ /* Create DMA tag first */ - err = bus_dma_tag_create( - bus_get_dma_tag(nic->dev), /* parent tag */ + err = bus_dma_tag_create_device(nic->dev, 1, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ Index: sys/dev/vr/if_vr.c =================================================================== --- sys/dev/vr/if_vr.c +++ sys/dev/vr/if_vr.c @@ -896,8 +896,7 @@ int error, i; /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->vr_dev), /* parent */ + error = bus_dma_tag_create_device(sc->vr_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/vte/if_vte.c =================================================================== --- sys/dev/vte/if_vte.c +++ sys/dev/vte/if_vte.c @@ -669,8 +669,7 @@ int error, i; /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->vte_dev), /* parent */ + error = bus_dma_tag_create_device(sc->vte_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -768,8 +767,7 @@ sc->vte_cdata.vte_rx_ring_paddr = ctx.vte_busaddr; /* Create TX buffer parent tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->vte_dev), /* parent */ + error = bus_dma_tag_create_device(sc->vte_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/wpi/if_wpi.c =================================================================== --- sys/dev/wpi/if_wpi.c +++ sys/dev/wpi/if_wpi.c @@ -912,7 +912,7 @@ dma->tag = NULL; dma->size = size; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), alignment, + error = bus_dma_tag_create_device(sc->sc_dev, alignment, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &dma->tag); if (error != 0) @@ -1013,7 +1013,7 @@ } /* Create RX buffer DMA tag. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MJUMPAGESIZE, 1, MJUMPAGESIZE, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { @@ -1196,7 +1196,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, WPI_MAX_SCATTER - 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat); if (error != 0) { Index: sys/dev/xdma/xdma_fdt_test.c =================================================================== --- sys/dev/xdma/xdma_fdt_test.c +++ sys/dev/xdma/xdma_fdt_test.c @@ -127,8 +127,7 @@ /* Source memory. */ - err = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), + err = bus_dma_tag_create_device(sc->dev, 1024, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -161,8 +160,7 @@ /* Destination memory. */ - err = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), + err = bus_dma_tag_create_device(sc->dev, 1024, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/xdma/xdma_sg.c =================================================================== --- sys/dev/xdma/xdma_sg.c +++ sys/dev/xdma/xdma_sg.c @@ -140,8 +140,7 @@ xdma = xchan->xdma; /* Create bus_dma tag */ - err = bus_dma_tag_create( - bus_get_dma_tag(xdma->dev), /* Parent tag. */ + err = bus_dma_tag_create_device(xdma->dev, xchan->alignment, /* alignment */ xchan->boundary, /* boundary */ xchan->lowaddr, /* lowaddr */ Index: sys/dev/xen/blkfront/blkfront.c =================================================================== --- sys/dev/xen/blkfront/blkfront.c +++ sys/dev/xen/blkfront/blkfront.c @@ -1319,8 +1319,7 @@ XBD_SEGS_TO_SIZE(sc->xbd_max_request_segments); /* Allocate datastructures based on negotiated values. */ - err = bus_dma_tag_create( - bus_get_dma_tag(sc->xbd_dev), /* parent */ + err = bus_dma_tag_create_device(sc->xbd_dev, 512, PAGE_SIZE, /* algnmnt, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/dev/xl/if_xl.c =================================================================== --- sys/dev/xl/if_xl.c +++ sys/dev/xl/if_xl.c @@ -1227,7 +1227,7 @@ * All of our lists are allocated as a contiguous block * of memory. */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), 8, 0, + error = bus_dma_tag_create_device(dev, 8, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, XL_RX_LIST_SZ, 1, XL_RX_LIST_SZ, 0, NULL, NULL, &sc->xl_ldata.xl_rx_tag); @@ -1259,7 +1259,7 @@ goto fail; } - error = bus_dma_tag_create(bus_get_dma_tag(dev), 8, 0, + error = bus_dma_tag_create_device(dev, 8, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, XL_TX_LIST_SZ, 1, XL_TX_LIST_SZ, 0, NULL, NULL, &sc->xl_ldata.xl_tx_tag); @@ -1294,7 +1294,7 @@ /* * Allocate a DMA tag for the mapping of mbufs. */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + error = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES * XL_MAXFRAGS, XL_MAXFRAGS, MCLBYTES, 0, NULL, NULL, &sc->xl_mtag); Index: sys/kern/subr_bus_dma.c =================================================================== --- sys/kern/subr_bus_dma.c +++ sys/kern/subr_bus_dma.c @@ -58,6 +58,19 @@ #include +int +bus_dma_tag_create_device(device_t dev, bus_size_t alignment, + bus_addr_t boundary, bus_addr_t lowaddr, + bus_addr_t highaddr, bus_dma_filter_t *filtfunc, + void *filtfuncarg, bus_size_t maxsize, int nsegments, + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat) +{ + + return (bus_dma_tag_create(bus_get_dma_tag(dev), alignment, boundary, + lowaddr, highaddr, filtfunc, filtfuncarg, maxsize, nsegments, + maxsegsz, flags, lockfunc, lockfuncarg, dmat)); +} /* * Load up data starting at offset within a region specified by a * list of virtual address ranges until either length or the region Index: sys/mips/atheros/ar531x/if_are.c =================================================================== --- sys/mips/atheros/ar531x/if_are.c +++ sys/mips/atheros/ar531x/if_are.c @@ -1081,8 +1081,7 @@ int error, i; /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->are_dev), /* parent */ + error = bus_dma_tag_create_device(sc->are_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/mips/atheros/if_arge.c =================================================================== --- sys/mips/atheros/if_arge.c +++ sys/mips/atheros/if_arge.c @@ -1939,8 +1939,7 @@ arge_rx_align = 1; /* Create parent DMA tag. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->arge_dev), /* parent */ + error = bus_dma_tag_create_device(sc->arge_dev, 1, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/mips/ingenic/jz4780_aic.c =================================================================== --- sys/mips/ingenic/jz4780_aic.c +++ sys/mips/ingenic/jz4780_aic.c @@ -505,8 +505,7 @@ * Must use dma_size boundary as modulo feature required. * Modulo feature allows setup circular buffer. */ - err = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), + err = bus_dma_tag_create_device(sc->dev, 4, sc->dma_size, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/mips/ingenic/jz4780_lcd.c =================================================================== --- sys/mips/ingenic/jz4780_lcd.c +++ sys/mips/ingenic/jz4780_lcd.c @@ -492,8 +492,7 @@ goto failed; } - error = bus_dma_tag_create( - bus_get_dma_tag(dev), + error = bus_dma_tag_create_device(dev, sizeof(struct lcd_frame_descriptor), 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, Index: sys/mips/ingenic/jz4780_mmc.c =================================================================== --- sys/mips/ingenic/jz4780_mmc.c +++ sys/mips/ingenic/jz4780_mmc.c @@ -294,7 +294,7 @@ /* Allocate the DMA descriptor memory. */ dma_desc_size = sizeof(struct jz4780_mmc_dma_desc) * JZ_MSC_DMA_SEGS; - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, dma_desc_size, 1, dma_desc_size, 0, NULL, NULL, &sc->sc_dma_tag); if (error) @@ -312,7 +312,7 @@ return (sc->sc_dma_map_err); /* Create the DMA map for data transfers. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + error = bus_dma_tag_create_device(sc->sc_dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, JZ_MSC_DMA_MAX_SIZE * JZ_MSC_DMA_SEGS, JZ_MSC_DMA_SEGS, JZ_MSC_DMA_MAX_SIZE, BUS_DMA_ALLOCNOW, NULL, NULL, Index: sys/mips/ingenic/jz4780_pdma.c =================================================================== --- sys/mips/ingenic/jz4780_pdma.c +++ sys/mips/ingenic/jz4780_pdma.c @@ -293,8 +293,7 @@ /* * Set up TX descriptor ring, descriptors, and dma maps. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->dev), /* Parent tag. */ + error = bus_dma_tag_create_device(sc->dev, PDMA_DESC_RING_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/net/iflib.c =================================================================== --- sys/net/iflib.c +++ sys/net/iflib.c @@ -1334,7 +1334,7 @@ int err; device_t dev = ctx->ifc_dev; - err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + err = bus_dma_tag_create_device(dev, align, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1607,7 +1607,7 @@ /* * Set up DMA tags for TX buffers. */ - if ((err = bus_dma_tag_create(bus_get_dma_tag(dev), + if ((err = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1625,7 +1625,7 @@ goto fail; } tso = (if_getcapabilities(ctx->ifc_ifp) & IFCAP_TSO) != 0; - if (tso && (err = bus_dma_tag_create(bus_get_dma_tag(dev), + if (tso && (err = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -1838,7 +1838,7 @@ for (int i = 0; i < rxq->ifr_nfl; i++, fl++) { fl->ifl_size = scctx->isc_nrxd[rxq->ifr_fl_offset]; /* this isn't necessarily the same */ /* Set up DMA tag for RX buffers. */ - err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + err = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ Index: sys/powerpc/mpc85xx/fsl_sata.c =================================================================== --- sys/powerpc/mpc85xx/fsl_sata.c +++ sys/powerpc/mpc85xx/fsl_sata.c @@ -573,7 +573,7 @@ struct fsl_sata_dc_cb_args dcba; /* Command area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 1024, 0, + if (bus_dma_tag_create_device(dev, 1024, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, FSL_SATA_WORK_SIZE, 1, FSL_SATA_WORK_SIZE, 0, NULL, NULL, &ch->dma.work_tag)) @@ -588,7 +588,7 @@ } ch->dma.work_bus = dcba.maddr; /* Data area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, + if (bus_dma_tag_create_device(dev, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, FSL_SATA_MAX_XFER, FSL_SATA_SG_ENTRIES - 1, FSL_SATA_PRD_MAX, Index: sys/powerpc/powernv/opal_pci.c =================================================================== --- sys/powerpc/powernv/opal_pci.c +++ sys/powerpc/powernv/opal_pci.c @@ -444,7 +444,7 @@ * POWER9 systems. */ if (ofw_bus_is_compatible(dev, "ibm,ioda2-phb")) { - err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + err = bus_dma_tag_create_device(dev, 1, 0, /* alignment, bounds */ OPAL_PCI_BUS_SPACE_LOWADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR_32BIT, /* highaddr */ Index: sys/powerpc/ps3/if_glc.c =================================================================== --- sys/powerpc/ps3/if_glc.c +++ sys/powerpc/ps3/if_glc.c @@ -194,7 +194,7 @@ * Set up DMA. */ - err = bus_dma_tag_create(bus_get_dma_tag(dev), 32, 0, + err = bus_dma_tag_create_device(dev, 32, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, 129*sizeof(struct glc_dmadesc), 1, 128*sizeof(struct glc_dmadesc), 0, NULL,NULL, &sc->sc_dmadesc_tag); @@ -212,11 +212,11 @@ sc->sc_rxdmadesc, 128*sizeof(struct glc_dmadesc), glc_getphys, &sc->sc_rxdmadesc_phys, 0); - err = bus_dma_tag_create(bus_get_dma_tag(dev), 128, 0, + err = bus_dma_tag_create_device(dev, 128, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL,NULL, &sc->sc_rxdma_tag); - err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + err = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 16, BUS_SPACE_MAXSIZE_32BIT, 0, NULL,NULL, &sc->sc_txdma_tag); Index: sys/powerpc/ps3/ps3bus.c =================================================================== --- sys/powerpc/ps3/ps3bus.c +++ sys/powerpc/ps3/ps3bus.c @@ -684,7 +684,7 @@ } } - err = bus_dma_tag_create(bus_get_dma_tag(dev), + err = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, 0, BUS_SPACE_MAXSIZE, 0, NULL, NULL, &dinfo->dma_tag); Index: sys/powerpc/ps3/ps3cdrom.c =================================================================== --- sys/powerpc/ps3/ps3cdrom.c +++ sys/powerpc/ps3/ps3cdrom.c @@ -192,7 +192,7 @@ /* Setup DMA */ - err = bus_dma_tag_create(bus_get_dma_tag(dev), 4096, 0, + err = bus_dma_tag_create_device(dev, 4096, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_UNRESTRICTED, 1, PAGE_SIZE, 0, busdma_lock_mutex, &sc->sc_mtx, &sc->sc_dmatag); Index: sys/powerpc/ps3/ps3disk.c =================================================================== --- sys/powerpc/ps3/ps3disk.c +++ sys/powerpc/ps3/ps3disk.c @@ -213,7 +213,7 @@ } /* Setup DMA */ - err = bus_dma_tag_create(bus_get_dma_tag(dev), 4096, 0, + err = bus_dma_tag_create_device(dev, 4096, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_UNRESTRICTED, 1, PAGE_SIZE, 0, busdma_lock_mutex, &sc->sc_mtx, &sc->sc_dmatag); Index: sys/powerpc/pseries/phyp_llan.c =================================================================== --- sys/powerpc/pseries/phyp_llan.c +++ sys/powerpc/pseries/phyp_llan.c @@ -193,15 +193,15 @@ INTR_ENTROPY, NULL, llan_intr, sc, &sc->irq_cookie); /* Setup DMA */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), 16, 0, + error = bus_dma_tag_create_device(dev, 16, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, LLAN_RX_BUF_LEN, 1, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->rx_dma_tag); - error = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, + error = bus_dma_tag_create_device(dev, 4, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, 1, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->rxbuf_dma_tag); - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + error = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, 6, BUS_SPACE_MAXSIZE_32BIT, 0, busdma_lock_mutex, &sc->io_lock, &sc->tx_dma_tag); Index: sys/powerpc/pseries/phyp_vscsi.c =================================================================== --- sys/powerpc/pseries/phyp_vscsi.c +++ sys/powerpc/pseries/phyp_vscsi.c @@ -310,7 +310,7 @@ INTR_ENTROPY, NULL, vscsi_intr, sc, &sc->irq_cookie); /* Data DMA */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + error = bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, 256, BUS_SPACE_MAXSIZE_32BIT, 0, busdma_lock_mutex, &sc->io_lock, &sc->data_tag); @@ -324,7 +324,7 @@ TAILQ_INSERT_TAIL(&sc->free_xferq, &sc->loginxp, queue); /* CRQ area */ - error = bus_dma_tag_create(bus_get_dma_tag(dev), PAGE_SIZE, 0, + error = bus_dma_tag_create_device(dev, PAGE_SIZE, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, 8*PAGE_SIZE, 1, BUS_SPACE_MAXSIZE, 0, NULL, NULL, &sc->crq_tag); error = bus_dmamem_alloc(sc->crq_tag, (void **)&sc->crq_queue, Index: sys/powerpc/pseries/plpar_pcibus.c =================================================================== --- sys/powerpc/pseries/plpar_pcibus.c +++ sys/powerpc/pseries/plpar_pcibus.c @@ -104,7 +104,7 @@ if (dinfo->opd_dma_tag != NULL) return (dinfo->opd_dma_tag); - bus_dma_tag_create(bus_get_dma_tag(dev), + bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE, 0, NULL, NULL, &dinfo->opd_dma_tag); Index: sys/powerpc/pseries/vdevice.c =================================================================== --- sys/powerpc/pseries/vdevice.c +++ sys/powerpc/pseries/vdevice.c @@ -207,7 +207,7 @@ dinfo = device_get_ivars(child); if (dinfo->mdi_dma_tag == NULL) { - bus_dma_tag_create(bus_get_dma_tag(dev), + bus_dma_tag_create_device(dev, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE, 0, NULL, NULL, &dinfo->mdi_dma_tag); Index: sys/sys/bus_dma.h =================================================================== --- sys/sys/bus_dma.h +++ sys/sys/bus_dma.h @@ -181,6 +181,13 @@ bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat); +int bus_dma_tag_create_device(device_t dev, bus_size_t alignment, + bus_addr_t boundary, bus_addr_t lowaddr, + bus_addr_t highaddr, bus_dma_filter_t *filtfunc, + void *filtfuncarg, bus_size_t maxsize, int nsegments, + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat); + /* Functions for creating and cloning tags via a template */ typedef struct { bus_dma_tag_t parent;