diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2015-03-30 20:30:23 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2015-03-30 20:30:23 +0000 |
commit | 8c7e1004ced14a54cdf61791cb3360053dae0a8b (patch) | |
tree | 389e67513a96c94a9cebe1c0c01755c592a41336 /sys/arch/sparc/conf | |
parent | 84138cd9465fea40a211fcf8f0871790b20d6c79 (diff) |
Add a bus_dma_tag_t for DVMA usage, suitable for use for devices not sitting
behind a sun4m iommu.
Move the existing dvma routines from vm_machdep.c to this new dvma.c; this
allows for a few declarations to be removed from public headers.
Extend the device attachment arguments (struct confargs) to pass a
bus_dma_tag_t. mainbus receives the dvma bus_dma_tag_t, and devices pass the
tag unchanged to their children, except for iommu(4) which replaces it with
its own.
Change the few sun4m-only drivers to pick the bus_dma_tag_t from confargs
rather than assume iommu; this allows qlw(4) to attach and work on sun4c.
ok kettenis@
Diffstat (limited to 'sys/arch/sparc/conf')
-rw-r--r-- | sys/arch/sparc/conf/SUN4C | 4 | ||||
-rw-r--r-- | sys/arch/sparc/conf/files.sparc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index 6c48b8e4f14..7a788fba7bc 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4C,v 1.68 2014/10/25 18:21:01 miod Exp $ +# $OpenBSD: SUN4C,v 1.69 2015/03/30 20:30:20 miod Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -95,6 +95,8 @@ esp* at dma? flags 0x00ff000f # depending on model #sun4c, sun4m isp* at sbus? +qlw* at sbus? +#qla* at sbus? # sun4/300 and sun4c Ethernet - an AMD 7990 LANCE le0 at sbus0 # sun4c on-board diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index c0566e0a9b0..e30debbc07c 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc,v 1.98 2015/02/28 17:54:54 miod Exp $ +# $OpenBSD: files.sparc,v 1.99 2015/03/30 20:30:20 miod Exp $ # $NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 @@ -296,6 +296,7 @@ file arch/sparc/sparc/cache.c file arch/sparc/sparc/conf.c file arch/sparc/sparc/consinit.c file arch/sparc/sparc/disksubr.c +file arch/sparc/sparc/dvma.c file arch/sparc/sparc/emul.c file arch/sparc/sparc/in_cksum.c inet file arch/sparc/sparc/intr.c |