Add real bus_space and bus_dma to mvme68k, so that it can benefit from

recent driver work; this gives us better osiop and vs drivers, vsbic
(although currently disabled on 68060 boards until more bugs are fixed),
and the ability to boot and root off vs and vsbic.

Existing code is not modified and still uses memory mapped structures;
this might change eventually as more code gets factorized and moved to
MI land.

7 files changed, 78 insertions, 33 deletions

diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index 15c986950f6..19643aa1fb6 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.29 2006/06/24 14:07:06 miod Exp $
+#	$OpenBSD: GENERIC,v 1.30 2009/02/17 22:28:38 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -51,7 +51,7 @@ nvram0	at mc0 offset 0xc0000
 zs0	at mc0 offset 0x45000 ipl 4
 zs1	at mc0 offset 0x45801 ipl 4
 ie0	at mc0 offset 0x46000 ipl 3
-ssh0	at mc0 offset 0x47000 ipl 2
+osiop0	at mc0 offset 0x47000 ipl 2
 memc0	at mc0 offset 0x43000
 memc1	at mc0 offset 0x43100
 ipic0	at mc0 offset 0xbc000
@@ -67,7 +67,7 @@ pcctwo0 at mainbus0 addr 0xfff00000
 clock0	at pcctwo0 ipl 5
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 3
-ssh0	at pcctwo0 offset 0x47000 ipl 2
+osiop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 vme0	at pcctwo0 offset 0x40000
 #lptwo0	at pcctwo0 ipl 1
@@ -77,22 +77,27 @@ sram0	at mainbus0 addr 0xffe00000
 
 vmes0	at vme0
 
+# MVME327
+vsbic*	at vmes0 addr 0xffffa600 ipl 2 vec 0x8c
+vsbic*	at vmes0 addr 0xffffa700 ipl 2 vec 0x8d
+# MVME328, MVME328XT
 vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
 vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
 vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
 vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
 vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
 vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
-
+# MVME376
 le*	at vmes0 addr 0xffff1200 ipl 3 vec 0x74
 le*	at vmes0 addr 0xffff1400 ipl 3 vec 0x75
 le*	at vmes0 addr 0xffff1600 ipl 3 vec 0x76
 
 vmel0	at vme0
 
-scsibus* at wdsc?
-scsibus* at ssh?
+scsibus* at osiop?
 scsibus* at vs?
+scsibus* at vsbic?
+scsibus* at wdsc?
 
 sd*	at scsibus?
 st*	at scsibus?
diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147
index f65e07d17d1..ce91888d5b2 100644
--- a/sys/arch/mvme68k/conf/MVME147
+++ b/sys/arch/mvme68k/conf/MVME147
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME147,v 1.21 2006/06/24 14:07:06 miod Exp $
+#	$OpenBSD: MVME147,v 1.22 2009/02/17 22:28:38 miod Exp $
 
 machine		mvme68k m68k
 
@@ -31,13 +31,17 @@ vme0	at pcc0 offset 0x2000
 
 vmes0	at vme0
 
+## MVME327
+#vsbic*	at vmes0 addr 0xffffa600 ipl 2 vec 0x8c
+#vsbic*	at vmes0 addr 0xffffa700 ipl 2 vec 0x8d
+## MVME328, MVME328XT
 #vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
 #vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
 #vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
 #vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
 #vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
 #vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
-
+# MVME376
 le*	at vmes0 addr 0xffff1200 ipl 3 vec 0x74
 le*	at vmes0 addr 0xffff1400 ipl 3 vec 0x75
 le*	at vmes0 addr 0xffff1600 ipl 3 vec 0x76
@@ -46,6 +50,7 @@ vmel0	at vme0
 
 scsibus* at wdsc?
 #scsibus* at vs?
+#scsibus* at vsbic?
 
 sd*	at scsibus?
 st*	at scsibus?
diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162
index 67df8869f12..fad150715ec 100644
--- a/sys/arch/mvme68k/conf/MVME162
+++ b/sys/arch/mvme68k/conf/MVME162
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME162,v 1.24 2006/06/24 14:07:06 miod Exp $
+#	$OpenBSD: MVME162,v 1.25 2009/02/17 22:28:38 miod Exp $
 
 machine		mvme68k m68k
 
@@ -26,7 +26,7 @@ nvram0	at mc0 offset 0xc0000
 zs0	at mc0 offset 0x45000 ipl 4
 zs1	at mc0 offset 0x45801 ipl 4
 ie0	at mc0 offset 0x46000 ipl 3
-ssh0	at mc0 offset 0x47000 ipl 2
+osiop0	at mc0 offset 0x47000 ipl 2
 memc0	at mc0 offset 0x43000
 memc1	at mc0 offset 0x43100
 ipic0	at mc0 offset 0xbc000
@@ -34,29 +34,36 @@ vme0	at mc0 offset 0x40000
 flash0	at mainbus0 addr 0xffa00000
 sram0	at mainbus0 addr 0xffe00000
 
-fooip*	at ipic? manu 0x11 prod 0x22 ipl 1
+#fooip*	at ipic? manu 0x11 prod 0x22 ipl 1
 
 vmes0	at vme0
 
+# MVME327
+vsbic*	at vmes0 addr 0xffffa600 ipl 2 vec 0x8c
+vsbic*	at vmes0 addr 0xffffa700 ipl 2 vec 0x8d
+# MVME328, MVME328XT
 vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
 vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
 vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
 vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
 vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
 vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
-
+# MVME376
 le*	at vmes0 addr 0xffff1200 ipl 3 vec 0x74
 le*	at vmes0 addr 0xffff1400 ipl 3 vec 0x75
 le*	at vmes0 addr 0xffff1600 ipl 3 vec 0x76
 
 vmel0	at vme0
 
-scsibus* at ssh?
+scsibus* at osiop?
 scsibus* at vs?
+scsibus* at vsbic?
 
 sd*	at scsibus?
 st*	at scsibus?
 cd*	at scsibus?
 ch*	at scsibus?
 ss*	at scsibus?
+safte*	at scsibus?
+ses*	at scsibus?
 uk*	at scsibus?
diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167
index 9bda7cf0620..471399b5ec3 100644
--- a/sys/arch/mvme68k/conf/MVME167
+++ b/sys/arch/mvme68k/conf/MVME167
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME167,v 1.24 2006/06/24 14:07:06 miod Exp $
+#	$OpenBSD: MVME167,v 1.25 2009/02/17 22:28:38 miod Exp $
 
 machine		mvme68k m68k
 
@@ -24,7 +24,7 @@ pcctwo0 at mainbus0 addr 0xfff00000
 clock0	at pcctwo0 ipl 5
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 3
-ssh0	at pcctwo0 offset 0x47000 ipl 2
+osiop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 vme0	at pcctwo0 offset 0x40000
 #lptwo0	at pcctwo0 ipl 1
@@ -34,25 +34,32 @@ sram0	at mainbus0 addr 0xffe00000
 
 vmes0	at vme0
 
+# MVME327
+vsbic*	at vmes0 addr 0xffffa600 ipl 2 vec 0x8c
+vsbic*	at vmes0 addr 0xffffa700 ipl 2 vec 0x8d
+# MVME328, MVME328XT
 vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
 vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
 vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
 vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
 vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
 vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
-
+# MVME376
 le*	at vmes0 addr 0xffff1200 ipl 3 vec 0x74
 le*	at vmes0 addr 0xffff1400 ipl 3 vec 0x75
 le*	at vmes0 addr 0xffff1600 ipl 3 vec 0x76
 
 vmel0	at vme0
 
-scsibus* at ssh?
+scsibus* at osiop?
 scsibus* at vs?
+scsibus* at vsbic?
 
 sd*	at scsibus?
 st*	at scsibus?
 cd*	at scsibus?
 ch*	at scsibus?
 ss*	at scsibus?
+safte*	at scsibus?
+ses*	at scsibus?
 uk*	at scsibus?
diff --git a/sys/arch/mvme68k/conf/MVME177 b/sys/arch/mvme68k/conf/MVME177
index 8dbfb7403e7..f34d230e1f6 100644
--- a/sys/arch/mvme68k/conf/MVME177
+++ b/sys/arch/mvme68k/conf/MVME177
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME177,v 1.13 2006/06/24 14:07:06 miod Exp $
+#	$OpenBSD: MVME177,v 1.14 2009/02/17 22:28:38 miod Exp $
 
 machine		mvme68k m68k
 
@@ -24,7 +24,7 @@ pcctwo0 at mainbus0 addr 0xfff00000
 clock0	at pcctwo0 ipl 5
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 3
-ssh0	at pcctwo0 offset 0x47000 ipl 2
+osiop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 vme0	at pcctwo0 offset 0x40000
 #lptwo0	at pcctwo0 ipl 1
@@ -34,25 +34,32 @@ sram0	at mainbus0 addr 0xffe00000
 
 vmes0	at vme0
 
+# MVME327
+vsbic*	at vmes0 addr 0xffffa600 ipl 2 vec 0x8c
+vsbic*	at vmes0 addr 0xffffa700 ipl 2 vec 0x8d
+# MVME328, MVME328XT
 vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
 vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
 vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
 vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
 vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
 vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
-
+# MVME376
 le*	at vmes0 addr 0xffff1200 ipl 3 vec 0x74
 le*	at vmes0 addr 0xffff1400 ipl 3 vec 0x75
 le*	at vmes0 addr 0xffff1600 ipl 3 vec 0x76
 
 vmel0	at vme0
 
-scsibus* at ssh?
+scsibus* at osiop?
 scsibus* at vs?
+scsibus* at vsbic?
 
 sd*	at scsibus?
 st*	at scsibus?
 cd*	at scsibus?
 ch*	at scsibus?
 ss*	at scsibus?
+safte*	at scsibus?
+ses*	at scsibus?
 uk*	at scsibus?
diff --git a/sys/arch/mvme68k/conf/RAMDISK b/sys/arch/mvme68k/conf/RAMDISK
index 4db71bd7c05..6866bd0ff46 100644
--- a/sys/arch/mvme68k/conf/RAMDISK
+++ b/sys/arch/mvme68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.10 2008/06/08 20:37:39 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.11 2009/02/17 22:28:38 miod Exp $
 
 machine		mvme68k m68k
 
@@ -55,7 +55,7 @@ nvram0	at mc0 offset 0xc0000
 zs0	at mc0 offset 0x45000 ipl 4
 zs1	at mc0 offset 0x45801 ipl 4
 ie0	at mc0 offset 0x46000 ipl 3
-ssh0	at mc0 offset 0x47000 ipl 2
+osiop0	at mc0 offset 0x47000 ipl 2
 memc0	at mc0 offset 0x43000
 memc1	at mc0 offset 0x43100
 ipic0	at mc0 offset 0xbc000
@@ -70,7 +70,7 @@ pcctwo0 at mainbus0 addr 0xfff00000
 clock0	at pcctwo0 ipl 5
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 3
-ssh0	at pcctwo0 offset 0x47000 ipl 2
+osiop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 vme0	at pcctwo0 offset 0x40000
 #lptwo0	at pcctwo0 ipl 1
@@ -80,22 +80,27 @@ sram0	at mainbus0 addr 0xffe00000
 
 vmes0	at vme0
 
+# MVME327
+vsbic*	at vmes0 addr 0xffffa600 ipl 2 vec 0x8c
+vsbic*	at vmes0 addr 0xffffa700 ipl 2 vec 0x8d
+# MVME328, MVME328XT
 vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
 vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
 vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
 vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
 vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
 vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
-
+# MVME376
 le*	at vmes0 addr 0xffff1200 ipl 3 vec 0x74
 le*	at vmes0 addr 0xffff1400 ipl 3 vec 0x75
 le*	at vmes0 addr 0xffff1600 ipl 3 vec 0x76
 
 vmel0	at vme0
 
-scsibus* at wdsc?
-scsibus* at ssh?
+scsibus* at osiop?
 scsibus* at vs?
+scsibus* at vsbic?
+scsibus* at wdsc?
 
 sd*	at scsibus?
 st*	at scsibus?
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index f1a2db99140..b1bc7163022 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme68k,v 1.29 2006/04/21 22:21:53 miod Exp $
+#	$OpenBSD: files.mvme68k,v 1.30 2009/02/17 22:28:38 miod Exp $
 
 # config file for mvme68k
 
@@ -9,6 +9,7 @@ maxusers 2 8 64
 
 device	mainbus {[addr = -1]}
 attach	mainbus at root
+file	arch/mvme68k/dev/mainbus.c
 
 device	pcc {[offset = -1], [ipl = 0]}
 attach	pcc at mainbus
@@ -66,10 +67,9 @@ device	fooip
 attach	fooip at ipic
 file	arch/mvme68k/dev/fooip.c		fooip
 
-device	ssh: scsi
-attach	ssh at mc, pcctwo
-file	arch/mvme68k/dev/sshdma.c		ssh
-file	arch/mvme68k/dev/ssh.c			ssh
+attach	osiop at mc with osiop_mc
+attach	osiop at pcctwo with osiop_pcctwo
+file	arch/mvme68k/dev/osiop_mvme68k.c	osiop_mc | osiop_pcctwo
 
 device	memc
 attach	memc at mc, pcctwo
@@ -108,6 +108,7 @@ major	{rd = 9}
 #major	{xd = 10}
 
 file	arch/mvme68k/mvme68k/autoconf.c
+file	arch/mvme68k/mvme68k/bus_dma.c
 file	arch/mvme68k/mvme68k/conf.c
 file	arch/mvme68k/mvme68k/disksubr.c
 file	arch/mvme68k/mvme68k/machdep.c
@@ -131,7 +132,15 @@ device	wl: tty
 attach	wl at vmes
 file	arch/mvme68k/dev/wl.c			wl needs-count
 
+define	bpp
+file	arch/mvme68k/dev/bpp.c			bpp
+
+# MVME328
 device	vs: scsi
 attach	vs at vmes
 file	arch/mvme68k/dev/vs.c			vs
-file	arch/mvme68k/dev/vsdma.c		vs
+
+# MVME327
+device	vsbic: bpp, scsi
+attach	vsbic at vmes
+file	arch/mvme68k/dev/vsbic.c		vsbic