[src/trunk]: src/usr.sbin/cpuctl/arch Print CPUID 0x80000007 %edx on both Int...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b37216750da6
branches:  trunk
changeset: 970902:b37216750da6
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Apr 06 09:48:44 2020 +0000

description:
Print CPUID 0x80000007 %edx on both Intel and AMD.

diffstat:

 usr.sbin/cpuctl/arch/i386.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 4caba8f0c57c -r b37216750da6 usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Mon Apr 06 09:46:21 2020 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Mon Apr 06 09:48:44 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386.c,v 1.109 2020/04/06 09:46:21 msaitoh Exp $       */
+/*     $NetBSD: i386.c,v 1.110 2020/04/06 09:48:44 msaitoh Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.109 2020/04/06 09:46:21 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.110 2020/04/06 09:48:44 msaitoh Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -2286,10 +2286,11 @@
                    cpuname, descs[0]);
        }
 
-       if (cpu_vendor == CPUVENDOR_AMD) {
+       if ((cpu_vendor == CPUVENDOR_INTEL) || (cpu_vendor == CPUVENDOR_AMD))
                if (ci->ci_cpuid_extlevel >= 0x80000007)
                        powernow_probe(ci);
 
+       if (cpu_vendor == CPUVENDOR_AMD) {
                if (ci->ci_cpuid_extlevel >= 0x80000008) {
                        x86_cpuid(0x80000008, descs);
                        print_bits(cpuname, "AMD Extended features",
@@ -2566,8 +2567,7 @@
        x86_cpuid(0x80000007, regs);
 
        snprintb(buf, sizeof(buf), CPUID_APM_FLAGS, regs[3]);
-       aprint_normal_dev(ci->ci_dev, "AMD Power Management features: %s\n",
-           buf);
+       aprint_normal_dev(ci->ci_dev, "Power Management features: %s\n", buf);
 }
 
 bool