Improved CPU identification and initialization routines. This

supports All Cyrix CPUs, IBM Blue Lightning CPU and NexGen (now AMD)
Nx586 CPU, and initialize special registers of Cyrix CPU and msr of
IBM Blue Lightning CPU.

If revision of Cyrix 6x86 CPU < 2.7, CPU cache is enabled in
write-through mode.  This can be disabled by kernel configuration
options.

Reviewed by:	Bruce Evans <bde@freebsd.org> and
            	Jordan K. Hubbard <jkh@freebsd.org>

5 files changed, 42 insertions, 16 deletions

diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 8fe080c..ecdb567 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id$
+#	$Id: Makefile.pc98,v 1.11 1997/02/22 09:43:21 peter Exp $
 #
 # Makefile for FreeBSD
 #
@@ -58,7 +58,7 @@ DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
-SYSTEM_SFILES= ${PC98}/i386/locore.s
+SYSTEM_SFILES= ${I386}/i386/locore.s
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
@@ -89,7 +89,7 @@ clean:
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
-#	  ${PC98}/i386/Locore.c ${CFILES} ioconf.c param.c | \
+#	  ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
@@ -101,7 +101,7 @@ symbols.sort: ${I386}/i386/symbols.raw
 	grep -v '^#' ${I386}/i386/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
-locore.o: ${PC98}/i386/locore.s assym.s
+locore.o: ${I386}/i386/locore.s assym.s
 	${NORMAL_S}
 
 # everything potentially depends on the Makefile since everything potentially
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 76c4d17..23103b9 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.155 1997/03/16 07:09:01 gibbs Exp $
+#	$Id: files.i386,v 1.156 1997/03/16 17:25:53 bde Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
@@ -47,6 +47,7 @@ i386/i386/i386-gdbstub.c	optional	ddb
 i386/i386/exception.s		standard
 i386/i386/identcpu.c		standard
 i386/i386/in_cksum.c		optional	inet
+i386/i386/initcpu.c		standard
 # locore.s needs to be handled in Makefile to put it first.  Otherwise it's
 # now normal.
 # i386/i386/locore.s		standard
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 37cf0a9..b5c3dce 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.16 1997/02/22 09:43:22 peter Exp $
+#	$Id: files.pc98,v 1.17 1997/03/19 16:14:25 kato Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
@@ -49,6 +49,7 @@ i386/i386/i386-gdbstub.c	optional	ddb
 i386/i386/exception.s		standard
 i386/i386/identcpu.c		standard
 i386/i386/in_cksum.c		optional	inet
+i386/i386/initcpu.c		standard
 # locore.s needs to be handled in Makefile to put it first.  Otherwise it's
 # now normal.
 # i386/i386/locore.s		standard
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index eba1a87..cce8411 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.36 1997/02/28 16:56:06 bde Exp $
+#	$Id: options.i386,v 1.37 1997/03/12 17:41:35 joerg Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
@@ -37,10 +37,23 @@ CLK_CALIBRATION_LOOP	  opt_clock.h
 CLK_USE_I8254_CALIBRATION opt_clock.h
 CLK_USE_I586_CALIBRATION  opt_clock.h
 
-I386_CPU		opt_cpu.h
-I486_CPU		opt_cpu.h
-I586_CPU		opt_cpu.h
-I686_CPU		opt_cpu.h
+CPU_BLUELIGHTNING_FPU_OP_CACHE	opt_cpu.h
+CPU_BLUELIGHTNING_3X		opt_cpu.h
+CPU_BTB_EN			opt_cpu.h
+CPU_DISABLE_5X86_LSSER		opt_cpu.h
+CPU_FASTER_5X86_FPU		opt_cpu.h
+CPU_I486_ON_386			opt_cpu.h
+CPU_IORT			opt_cpu.h
+CPU_LOOP_EN			opt_cpu.h
+CPU_RSTK_EN			opt_cpu.h
+CPU_SUSP_HLT			opt_cpu.h
+CPU_UPGRADE_HW_CACHE		opt_cpu.h
+CYRIX_CACHE_WORKS		opt_cpu.h
+CYRIX_CACHE_REALLY_WORKS	opt_cpu.h
+I386_CPU			opt_cpu.h
+I486_CPU			opt_cpu.h
+I586_CPU			opt_cpu.h
+I686_CPU			opt_cpu.h
 
 SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index cf26896..38d240f 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.17 1997/03/01 11:06:41 kato Exp $
+#	$Id: options.pc98,v 1.18 1997/03/13 17:04:23 kato Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
@@ -37,10 +37,21 @@ CLK_CALIBRATION_LOOP	  opt_clock.h
 CLK_USE_I8254_CALIBRATION opt_clock.h
 CLK_USE_I586_CALIBRATION  opt_clock.h
 
-I386_CPU		opt_cpu.h
-I486_CPU		opt_cpu.h
-I586_CPU		opt_cpu.h
-I686_CPU		opt_cpu.h
+CPU_BTB_EN		 opt_cpu.h
+CPU_DISABLE_5X86_LSSER	 opt_cpu.h
+CPU_FASTER_5X86_FPU	 opt_cpu.h
+CPU_I486_ON_386		 opt_cpu.h
+CPU_IORT		 opt_cpu.h
+CPU_LOOP_EN		 opt_cpu.h
+CPU_RSTK_EN		 opt_cpu.h
+CPU_SUSP_HLT		 opt_cpu.h
+CPU_UPGRADE_HW_CACHE	 opt_cpu.h
+CYRIX_CACHE_WORKS	 opt_cpu.h
+CYRIX_CACHE_REALLY_WORKS opt_cpu.h
+I386_CPU		 opt_cpu.h
+I486_CPU		 opt_cpu.h
+I586_CPU		 opt_cpu.h
+I686_CPU		 opt_cpu.h
 
 SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h