bin/41188: [PATCH] AMD Family 11h cpu is not identified by cpuctl(8)

[fun%naobsd.org@localhost]

>Number:         41188
>Category:       bin
>Synopsis:       [PATCH] AMD Family 11h cpu is not identified by cpuctl(8)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    bin-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Apr 11 13:40:00 +0000 2009
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 5.0_RC3
>Organization:
        FUKAUMI Naoki
>Environment:
System: NetBSD t105.naobsd.org 5.0_RC3 NetBSD 5.0_RC3 (T105) #0: Sat Apr 11 
20:54:11 JST 2009 
root%t105.naobsd.org@localhost:/usr/obj/amd64/sys/arch/amd64/compile/T105 amd64
Architecture: x86_64
Machine: amd64
>Description:
        AMD Family 11h (e.g. Turion X2 Ultra) is not identified by
        cpuctl(8). below is output of "cpuctl identify 0" command.

cpu0: AMD Unknown K8 (Athlon) (686-class), 2200.92 MHz, id 0x200f31
cpu0: features 0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR>
cpu0: features 0x178bfbff<PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX>
cpu0: features 0x178bfbff<FXSR,SSE,SSE2,HTT>
cpu0: features2 0x2001<SSE3,CX16>
cpu0: features3 0xebd3fbff<SCALL/RET,NOX,MXX,FFXSR,RDTSCP,LONG,3DNOW2,3DNOW>
cpu0: features4 
0x131f<LAHF,CMPLEGACY,SVM,EAPIC,ALTMOVCR0,3DNOWPREFETCH,OSVW,SKINIT>
cpu0: "AMD Turion(tm) X2 Ultra Dual-Core Mobile ZM-82"
cpu0: I-cache 64KB 64B/line 2-way, D-cache 64KB 64B/line 2-way
cpu0: L2 cache 1MB 64B/line 16-way
cpu0: ITLB 32 4KB entries fully associative, 8 4MB entries fully associative
cpu0: DTLB 32 4KB entries fully associative, 8 4MB entries fully associative
cpu0: Initial APIC ID 0
cpu0: AMD Power Management features: 0x1f9<TS,TTP,HTC,STC,100,HWP,TSC>
cpu0: family 0f model 03 extfamily 02 extmodel 00

>How-To-Repeat:
        see above.

>Fix:
Index: usr.sbin/cpuctl/arch/i386.c
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/src/usr.sbin/cpuctl/arch/i386.c,v
retrieving revision 1.13.2.2
diff -u -p -r1.13.2.2 i386.c
--- usr.sbin/cpuctl/arch/i386.c 24 Mar 2009 20:34:56 -0000      1.13.2.2
+++ usr.sbin/cpuctl/arch/i386.c 11 Apr 2009 12:01:14 -0000
@@ -924,6 +924,16 @@ amd_amd64_name(struct cpu_info *ci)
                                break;
                }
                break;
+       case 0x02:
+               switch (model) {
+                       case 0x03:
+                               ret = "Family 11h";
+                               break;
+                       default:
+                               ret = "Unknown AMD64 CPU";
+                               break;
+               }
+               break;
        }
 
        return ret;