[src/netbsd-9]: src/sys/arch/x86/include Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/933b63d0b0ae
branches:  netbsd-9
changeset: 462768:933b63d0b0ae
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Nov 10 13:06:46 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #407):

        sys/arch/x86/include/specialreg.h: revision 1.156

- GMET is not bit 11 but 17.
- Add unknown CPUID Fn8000_000a %edx bit 20.

diffstat:

 sys/arch/x86/include/specialreg.h |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r a06f8903a12f -r 933b63d0b0ae sys/arch/x86/include/specialreg.h
--- a/sys/arch/x86/include/specialreg.h Sun Nov 10 13:05:15 2019 +0000
+++ b/sys/arch/x86/include/specialreg.h Sun Nov 10 13:06:46 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: specialreg.h,v 1.150.2.2 2019/10/17 18:56:24 martin Exp $      */
+/*     $NetBSD: specialreg.h,v 1.150.2.3 2019/11/10 13:06:46 martin Exp $      */
 
 /*
  * Copyright (c) 2014-2019 The NetBSD Foundation, Inc.
@@ -755,19 +755,20 @@
 #define CPUID_AMD_SVM_FlushByASID      0x00000040
 #define CPUID_AMD_SVM_DecodeAssist     0x00000080
 #define CPUID_AMD_SVM_PauseFilter      0x00000400
-#define CPUID_AMD_SVM_GMET             0x00000800
 #define CPUID_AMD_SVM_PFThreshold      0x00001000 /* PAUSE filter threshold */
 #define CPUID_AMD_SVM_AVIC             0x00002000 /* AMD Virtual intr. ctrl */
 #define CPUID_AMD_SVM_V_VMSAVE_VMLOAD  0x00008000 /* Virtual VM{SAVE/LOAD} */
 #define CPUID_AMD_SVM_vGIF             0x00010000 /* Virtualized GIF */
+#define CPUID_AMD_SVM_GMET             0x00020000
 #define CPUID_AMD_SVM_FLAGS     "\20" \
        "\1" "NP"       "\2" "LbrVirt"  "\3" "SVML"     "\4" "NRIPS"    \
        "\5" "TSCRate"  "\6" "VMCBCleanBits"                            \
                                "\7" "FlushByASID" "\10" "DecodeAssist" \
-       "\11" "B08"     "\12" "B09"     "\13" "PauseFilter" "\14" "GMET" \
+       "\11" "B08"     "\12" "B09"     "\13" "PauseFilter" "\14" "B11" \
        "\15" "PFThreshold" "\16" "AVIC" "\17" "B14"                    \
                                                "\20" "V_VMSAVE_VMLOAD" \
-       "\21" "VGIF"
+       "\21" "VGIF"    "\22" "GMET"                                    \
+       "\25" "B20"
 
 /*
  * AMD Fn8000_0001d Cache Topology Information.