diff options
author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2005-01-24 20:44:38 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2005-01-24 20:44:38 +0000 |
commit | a46e09035cea9fd3b107d7e78d50e0972e02a298 (patch) | |
tree | 990420e67a257fe7f7ea552acf6645a5e73ba0eb /sys/arch/sgi | |
parent | 048d1189465934d81e3fb1269fdb9e82c730b3df (diff) |
Fix MACE ISA ringbuffer alignment.
Diffstat (limited to 'sys/arch/sgi')
-rw-r--r-- | sys/arch/sgi/dev/mavb.c | 4 | ||||
-rw-r--r-- | sys/arch/sgi/localbus/macebus.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sgi/dev/mavb.c b/sys/arch/sgi/dev/mavb.c index c1a847b4b07..95874f5d6a1 100644 --- a/sys/arch/sgi/dev/mavb.c +++ b/sys/arch/sgi/dev/mavb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mavb.c,v 1.4 2005/01/24 20:40:16 kettenis Exp $ */ +/* $OpenBSD: mavb.c,v 1.5 2005/01/24 20:44:37 kettenis Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -1100,7 +1100,7 @@ mavb_attach(struct device *parent, struct device *self, void *aux) } if (bus_dmamem_alloc(sc->sc_dmat, 4 * MAVB_ISA_RING_SIZE, - sizeof (u_int64_t), 0, &seg, 1, &rseg, BUS_DMA_NOWAIT)) { + MACE_ISA_RING_ALIGN, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT)) { printf(": can't allocate ring buffer\n"); return; } diff --git a/sys/arch/sgi/localbus/macebus.h b/sys/arch/sgi/localbus/macebus.h index 9b43457da18..6490b775574 100644 --- a/sys/arch/sgi/localbus/macebus.h +++ b/sys/arch/sgi/localbus/macebus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.h,v 1.5 2005/01/02 19:30:56 kettenis Exp $ */ +/* $OpenBSD: macebus.h,v 1.6 2005/01/24 20:44:37 kettenis Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.com). @@ -84,6 +84,7 @@ #define MACE_ISA_OFFS (MACE_IO_OFFS+0x00010000) #define MACE_ISA_RING_BASE 0x0000 +#define MACE_ISA_RING_ALIGN 0x00010000 #define MACE_ISA_MISC_REG 0x0008 /* Various status and controls */ #define MACE_ISA_INT_STAT 0x0010 #define MACE_ISA_INT_MASK 0x0018 |