>Number:         11502
>Category:       port-i386
>Synopsis:       i386 CPUID table update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    port-i386-maintainer
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Nov 15 13:41:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Scott Telford
>Release:        NetBSD 1.5_BETA2
>Organization:

>Environment:


>Description:

I've attached a patch to /sys/arch/i386/i386/machdep.c rev 1.389.2.2
(the 1.5 branch) which updates and clarifies some entries in the
i386_cpuid_cpus[] table. In particular, I've added entries for the AMD
K6-2+/III+, newer Athlon/Duron chips, and the Intel Cascades. The data
for this was mostly gleaned from the CPUID table on the www.sandpile.org
website.

>How-To-Repeat:
	
>Fix:

--- machdep.c_old	Wed Nov 15 21:19:27 2000
+++ machdep.c	Wed Nov 15 21:28:29 2000
@@ -528,10 +528,12 @@
 			{
 				"Pentium Pro (A-step)", "Pentium Pro", 0,
 				"Pentium II (Klamath)", "Pentium Pro",
-				"Pentium II (Deschutes)",
-				"Pentium II (Celeron)",
-				"Pentium III", "Pentium III (E)",
-				0, 0, 0, 0, 0, 0, 0,
+				"Pentium II/Celeron (Deschutes)",
+				"Celeron (Mendocino)",
+				"Pentium III (Katmai)",
+				"Pentium III/Celeron (Coppermine)",
+				0, "Pentium III Xeon (Cascades)", 0, 0, 0,
+				0, 0,
 				"Pentium Pro, II or III"	/* Default */
 			},
 			NULL
@@ -560,7 +562,8 @@
 			CPUCLASS_586,
 			{
 				"K5", "K5", "K5", "K5", 0, 0, "K6",
-				"K6", "K6-2", "K6-III", 0, 0, 0, 0, 0, 0,
+				"K6", "K6-2", "K6-III", 0, 0, 0,
+				"K6-2+/III+", 0, 0,
 				"K5 or K6"		/* Default */
 			},
 			NULL
@@ -569,8 +572,9 @@
 		{
 			CPUCLASS_686,
 			{
-				0, "K7 (Athlon)", 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0, 0,
+				0, "Athlon Model 1", "Athlon Model 2",
+				"Duron", "Athlon Model 4 (Thunderbird)",
+				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 				"K7 (Athlon)"	/* Default */
 			},
 			NULL
>Release-Note:
>Audit-Trail:
>Unformatted: