diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-10-25 18:21:02 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-10-25 18:21:02 +0000 |
| commit | 5cb35fa9b5a4c3f3a9953afceee14e76b4801dc8 (patch) | |
| tree | 2adaa5d435dcc2f65ef912b4933a0adfd26c9a50 | |
| parent | 80e09734c1b4140a05ceebd9e70b8649d35a915e (diff) | |
Don't let qlw attach to non-sun4m yet, as this driver currently depends upon
sun4m's iommu for bus_dma. (Guess what task just hit my todolist...)
| -rw-r--r-- | sys/arch/sparc/conf/SUN4C | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/qlw_sbus.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index 3d5bc3b7cbb..6c48b8e4f14 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4C,v 1.67 2014/10/25 16:51:31 miod Exp $ +# $OpenBSD: SUN4C,v 1.68 2014/10/25 18:21:01 miod Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -95,8 +95,6 @@ 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/dev/qlw_sbus.c b/sys/arch/sparc/dev/qlw_sbus.c index c029a5574ba..c0c92487737 100644 --- a/sys/arch/sparc/dev/qlw_sbus.c +++ b/sys/arch/sparc/dev/qlw_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qlw_sbus.c,v 1.1 2014/05/30 13:57:40 kettenis Exp $ */ +/* $OpenBSD: qlw_sbus.c,v 1.2 2014/10/25 18:21:01 miod Exp $ */ /* * Copyright (c) 2014 Mark Kettenis * @@ -59,6 +59,10 @@ qlw_sbus_match(struct device *parent, void *cf, void *aux) struct confargs *ca = aux; struct romaux *ra = &ca->ca_ra; + /* XXX this assumes dma through sun4m's iommu */ + if (!CPU_ISSUN4M) + return 0; + if (strcmp("ptisp", ra->ra_name) == 0 || strcmp("PTI,ptisp", ra->ra_name) == 0 || strcmp("SUNW,isp", ra->ra_name) == 0 || |