summaryrefslogtreecommitdiff
path: root/sys/arch/sgi/hpc/if_sq.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-04-05 21:45:52 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-04-05 21:45:52 +0000
commitec9c61131c40de44f175e55faa2689208371a093 (patch)
tree67ea7a301a9c5752f4f5ce3cb56f130347ec05ef /sys/arch/sgi/hpc/if_sq.c
parent3e8899e9ae184d1808ca24e1856315f3f0bf1642 (diff)
DMA descriptors only need to be aligned on 8-byte boundaries, and the struct
layout is enough to enforce this. Don't request DMA page boundary alignment when allocating them.
Diffstat (limited to 'sys/arch/sgi/hpc/if_sq.c')
-rw-r--r--sys/arch/sgi/hpc/if_sq.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/sgi/hpc/if_sq.c b/sys/arch/sgi/hpc/if_sq.c
index 44521062c38..5a5e02d1d2b 100644
--- a/sys/arch/sgi/hpc/if_sq.c
+++ b/sys/arch/sgi/hpc/if_sq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sq.c,v 1.1 2012/03/28 20:44:23 miod Exp $ */
+/* $OpenBSD: if_sq.c,v 1.2 2012/04/05 21:45:51 miod Exp $ */
/* $NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $ */
/*
@@ -199,7 +199,7 @@ sq_attach(struct device *parent, struct device *self, void *aux)
if ((rc = bus_space_subregion(haa->ha_st, haa->ha_sh,
haa->ha_dmaoff, sc->hpc_regs->enet_regs_size,
&sc->sc_hpch)) != 0) {
- printf(": can't HPC DMA registers, error = %d\n", rc);
+ printf(": can't map HPC DMA registers, error = %d\n", rc);
goto fail_0;
}
@@ -214,9 +214,7 @@ sq_attach(struct device *parent, struct device *self, void *aux)
sc->sc_dmat = haa->ha_dmat;
if ((rc = bus_dmamem_alloc(sc->sc_dmat, sizeof(struct sq_control),
- sc->hpc_regs->enet_dma_boundary,
- sc->hpc_regs->enet_dma_boundary, &sc->sc_cdseg, 1,
- &sc->sc_ncdseg, BUS_DMA_NOWAIT)) != 0) {
+ 0, 0, &sc->sc_cdseg, 1, &sc->sc_ncdseg, BUS_DMA_NOWAIT)) != 0) {
printf(": unable to allocate control data, error = %d\n", rc);
goto fail_0;
}
@@ -230,8 +228,7 @@ sq_attach(struct device *parent, struct device *self, void *aux)
if ((rc = bus_dmamap_create(sc->sc_dmat,
sizeof(struct sq_control), 1, sizeof(struct sq_control),
- sc->hpc_regs->enet_dma_boundary, BUS_DMA_NOWAIT,
- &sc->sc_cdmap)) != 0) {
+ 0, BUS_DMA_NOWAIT, &sc->sc_cdmap)) != 0) {
printf(": unable to create DMA map for control data, error "
"= %d\n", rc);
goto fail_2;