PERFORCE change 54109 for review
Peter Wemm
peter at FreeBSD.org
Thu Jun 3 14:17:09 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=54109
Change 54109 by peter at peter_daintree on 2004/06/03 14:16:20
IFC @54108
Affected files ...
.. //depot/projects/hammer/sys/amd64/acpica/madt.c#34 integrate
.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#30 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#27 integrate
.. //depot/projects/hammer/sys/amd64/amd64/legacy.c#13 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#27 integrate
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#24 integrate
.. //depot/projects/hammer/sys/amd64/include/cputypes.h#8 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#26 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#16 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#30 integrate
.. //depot/projects/hammer/sys/i386/include/cputypes.h#3 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/acpica/madt.c#34 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.12 2004/05/16 20:30:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.13 2004/06/03 20:25:04 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#30 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.131 2004/04/07 00:44:15 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.132 2004/06/03 20:18:15 peter Exp $");
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#27 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.8 2004/05/16 20:30:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.9 2004/06/03 20:25:05 peter Exp $");
#include "opt_atpic.h"
#include "opt_isa.h"
==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#13 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.54 2004/06/03 05:58:30 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.55 2004/06/03 20:25:05 peter Exp $");
/*
* This code implements a system driver for legacy systems that do not
==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#27 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.230 2004/05/16 20:30:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.231 2004/06/03 20:25:05 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#24 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.59 2004/05/16 20:30:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.60 2004/06/03 20:22:48 peter Exp $");
/*
* This code implements a `root nexus' for Intel Architecture
==== //depot/projects/hammer/sys/amd64/include/cputypes.h#8 (text+ko) ====
@@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.17 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.18 2004/06/03 20:18:15 peter Exp $
*/
#ifndef _MACHINE_CPUTYPES_H_
==== //depot/projects/hammer/sys/amd64/isa/clock.c#26 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.210 2004/06/03 05:58:30 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.211 2004/06/03 20:21:30 peter Exp $");
/*
* Routines to handle clock hardware.
@@ -53,7 +53,6 @@
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/lock.h>
-#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/time.h>
==== //depot/projects/hammer/sys/i386/i386/identcpu.c#16 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.138 2004/05/30 15:16:07 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.139 2004/06/03 21:14:53 phk Exp $");
#include "opt_cpu.h"
@@ -570,6 +570,7 @@
switch (cpu_id & 0xfff) {
case 0x540:
strcpy(cpu_model, "Geode SC1100");
+ cpu = CPU_GEODE1100;
tsc_is_broken = 1;
break;
default:
@@ -640,6 +641,7 @@
strcmp(cpu_vendor, "TransmetaCPU") == 0 ||
strcmp(cpu_vendor, "RiseRiseRise") == 0 ||
strcmp(cpu_vendor, "CentaurHauls") == 0 ||
+ strcmp(cpu_vendor, "Geode by NSC") == 0 ||
((strcmp(cpu_vendor, "CyrixInstead") == 0) &&
((cpu_id & 0xf00) > 0x500))) {
printf(" Stepping = %u", cpu_id & 0xf);
==== //depot/projects/hammer/sys/i386/i386/vm_machdep.c#30 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.239 2004/05/31 21:46:03 bmilekic Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.240 2004/06/03 21:14:53 phk Exp $");
#include "opt_isa.h"
#include "opt_npx.h"
@@ -545,6 +545,12 @@
elan_mmcr->RESCFG = 1;
#endif
+ if (cpu == CPU_GEODE1100) {
+ /* Attempt Geode's own reset */
+ outl(0xcf8, 0x80009044ul);
+ outl(0xcfc, 0xf);
+ }
+
#ifdef PC98
/*
* Attempt to do a CPU reset via CPU reset port.
==== //depot/projects/hammer/sys/i386/include/cputypes.h#3 (text+ko) ====
@@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/include/cputypes.h,v 1.17 2004/05/30 15:16:07 phk Exp $
+ * $FreeBSD: src/sys/i386/include/cputypes.h,v 1.18 2004/06/03 21:14:52 phk Exp $
*/
#ifndef _MACHINE_CPUTYPES_H_
@@ -59,6 +59,7 @@
#define CPU_PII 14 /* Intel Pentium II */
#define CPU_PIII 15 /* Intel Pentium III */
#define CPU_P4 16 /* Intel Pentium 4 */
+#define CPU_GEODE1100 17 /* NS Geode SC1100 */
#ifndef LOCORE
extern int cpu;
More information about the p4-projects
mailing list