[src/trunk]: src/sys/dev/nvmm/x86 nvmm-x86: improve the CPUID emulation

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

details:   https://anonhg.NetBSD.org/src/rev/3fb32282cb0d
branches:  trunk
changeset: 975690:3fb32282cb0d
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Sep 04 17:09:03 2020 +0000

description:
nvmm-x86: improve the CPUID emulation

 - Mask DTES64, DS_CPL, CID, SDBG, xTPR, PN.
 - B10, B20 and IA64 do not exist, so just remove them.

diffstat:

 sys/dev/nvmm/x86/nvmm_x86.c |  19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diffs (70 lines):

diff -r ae3496ca30a7 -r 3fb32282cb0d sys/dev/nvmm/x86/nvmm_x86.c
--- a/sys/dev/nvmm/x86/nvmm_x86.c       Fri Sep 04 17:08:01 2020 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86.c       Fri Sep 04 17:09:03 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvmm_x86.c,v 1.15 2020/08/22 11:00:00 maxv Exp $       */
+/*     $NetBSD: nvmm_x86.c,v 1.16 2020/09/04 17:09:03 maxv Exp $       */
 
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.15 2020/08/22 11:00:00 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.16 2020/09/04 17:09:03 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -235,19 +235,19 @@
        .ecx =
            CPUID2_SSE3 |
            CPUID2_PCLMUL |
-           CPUID2_DTES64 |
+           /* CPUID2_DTES64 excluded */
            /* CPUID2_MONITOR excluded */
-           CPUID2_DS_CPL |
+           /* CPUID2_DS_CPL excluded */
            /* CPUID2_VMX excluded */
            /* CPUID2_SMX excluded */
            /* CPUID2_EST excluded */
            /* CPUID2_TM2 excluded */
            CPUID2_SSSE3 |
-           CPUID2_CID |
-           CPUID2_SDBG |
+           /* CPUID2_CID excluded */
+           /* CPUID2_SDBG excluded */
            CPUID2_FMA |
            CPUID2_CX16 |
-           CPUID2_xTPR |
+           /* CPUID2_xTPR excluded */
            /* CPUID2_PDCM excluded */
            /* CPUID2_PCID excluded, but re-included in VMX */
            /* CPUID2_DCA excluded */
@@ -275,7 +275,6 @@
            /* CPUID_MCE excluded */
            CPUID_CX8 |
            CPUID_APIC |
-           CPUID_B10 | 
            CPUID_SEP |
            /* CPUID_MTRR excluded */
            CPUID_PGE |
@@ -283,9 +282,8 @@
            CPUID_CMOV |
            CPUID_PAT |
            CPUID_PSE36 |
-           CPUID_PN |
+           /* CPUID_PN excluded */
            CPUID_CFLUSH |
-           CPUID_B20 |
            /* CPUID_DS excluded */
            /* CPUID_ACPI excluded */
            CPUID_MMX |
@@ -295,7 +293,6 @@
            CPUID_SS |
            CPUID_HTT |
            /* CPUID_TM excluded */
-           CPUID_IA64 |
            CPUID_SBF
 };