SMP support. Big parts from NetBSD, but with some really serious debugging

done by me, niklas and others. Especially wrt. NXE support.

Still needs some polishing, especially in dmesg messages, but we're now
building kernel faster than ever.

5 files changed, 27 insertions, 9 deletions

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 13182c94128..39f82697894 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.24 2004/06/06 04:50:57 pvalchev Exp $
+#	$OpenBSD: GENERIC,v 1.25 2004/06/25 11:03:28 art Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -32,7 +32,7 @@ config		bsd	swap generic
 
 mainbus0 at root
 
-cpu*	at mainbus0
+cpu0	at mainbus? apid ?
 isa0	at mainbus0
 #isa0	at pcib?
 pci*	at mainbus0 bus ?
diff --git a/sys/arch/amd64/conf/GENERIC.MP b/sys/arch/amd64/conf/GENERIC.MP
new file mode 100644
index 00000000000..af4666420ca
--- /dev/null
+++ b/sys/arch/amd64/conf/GENERIC.MP
@@ -0,0 +1,9 @@
+include "arch/amd64/conf/GENERIC"
+
+option	MULTIPROCESSOR
+option	MPBIOS
+option	CPU
+
+cpu*		at mainbus? apid ?
+ioapic*		at mainbus? apid ?
+#aapic*		at pci? dev ? function ?
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index b102eb0d808..73ee3071df9 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.9 2004/06/06 04:50:57 pvalchev Exp $
+#	$OpenBSD: RAMDISK,v 1.10 2004/06/25 11:03:28 art Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -33,7 +33,7 @@ config		bsd	root on rd0a swap on rd0b and wd0b and sd0b
 
 mainbus0 at root
 
-cpu*	at mainbus0
+cpu*	at mainbus0 apid ?
 isa0	at mainbus0
 #isa0	at pcib?
 pci*	at mainbus0
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 7c74b27a9a7..d41ff38451d 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.10 2004/06/06 04:50:57 pvalchev Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.11 2004/06/25 11:03:28 art Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -33,7 +33,7 @@ config		bsd	root on rd0a swap on rd0b and wd0b and sd0b
 
 mainbus0 at root
 
-cpu*	at mainbus0
+cpu*	at mainbus0 apid ?
 isa0	at mainbus0
 #isa0	at pcib?
 pci*	at mainbus0
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 9dcd8d58e06..b52a9083423 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.2 2004/02/25 00:16:41 deraadt Exp $
+#	$OpenBSD: files.amd64,v 1.3 2004/06/25 11:03:28 art Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -26,6 +26,15 @@ file	arch/amd64/amd64/intr.c
 file	arch/amd64/amd64/bus_space.c
 file	arch/amd64/amd64/bus_dma.c
 
+file	arch/amd64/amd64/mptramp.S		multiprocessor
+file	arch/amd64/amd64/ipifuncs.c		multiprocessor
+file	arch/amd64/amd64/ipi.c			multiprocessor
+
+file	arch/amd64/amd64/apic.c			ioapic | lapic
+
+file	arch/amd64/amd64/mpbios.c		mpbios
+
+
 file	arch/amd64/amd64/consinit.c
 file	dev/cons.c
 file	dev/cninit.c
@@ -54,12 +63,12 @@ include "dev/i2o/files.i2o"
 include "dev/atapiscsi/files.atapiscsi"
 include "dev/ata/files.ata"
 
-define mainbus { }
+define mainbus { apid = -1 }
 device	mainbus: isabus, pcibus, mainbus
 attach	mainbus at root
 file	arch/amd64/amd64/mainbus.c	mainbus
 
-define	cpu { [apid = -1] }
+define	cpu { apid = -1 }
 device	cpu
 attach	cpu at mainbus
 file	arch/amd64/amd64/cpu.c	cpu