[src/netbsd-8]: src/sys/arch/x86 Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/a25a3e224e1e
branches:  netbsd-8
changeset: 852001:a25a3e224e1e
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 23 17:35:33 2018 +0000

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

        sys/arch/x86/x86/procfs_machdep.c: revision 1.24
        sys/arch/x86/include/specialreg.h: revision 1.130

OK'd by maxv:
- Add cpuid 7 edx L1D_FLUSH bit.
- Add IA32_ARCH_SKIP_L1DFL_VMENTRY bit.
- Add IA32_FLUSH_CMD MSR.

diffstat:

 sys/arch/x86/include/specialreg.h |  8 ++++++--
 sys/arch/x86/x86/procfs_machdep.c |  7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (64 lines):

diff -r c9c3959395af -r a25a3e224e1e sys/arch/x86/include/specialreg.h
--- a/sys/arch/x86/include/specialreg.h Sun Sep 23 17:33:15 2018 +0000
+++ b/sys/arch/x86/include/specialreg.h Sun Sep 23 17:35:33 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: specialreg.h,v 1.98.2.6 2018/07/13 15:51:28 martin Exp $       */
+/*     $NetBSD: specialreg.h,v 1.98.2.7 2018/09/23 17:35:33 martin Exp $       */
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -402,13 +402,14 @@
 #define CPUID_SEF_AVX512_4FMAPS        __BIT(3)
 #define CPUID_SEF_IBRS         __BIT(26) /* IBRS / IBPB Speculation Control */
 #define CPUID_SEF_STIBP                __BIT(27) /* STIBP Speculation Control */
+#define CPUID_SEF_L1D_FLUSH    __BIT(28) /* IA32_FLUSH_CMD MSR */
 #define CPUID_SEF_ARCH_CAP     __BIT(29) /* IA32_ARCH_CAPABILITIES */
 #define CPUID_SEF_SSBD         __BIT(31) /* Speculative Store Bypass Disable */
 
 #define CPUID_SEF_FLAGS2       "\20" \
                                "\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS" \
                                        "\33" "IBRS"    "\34" "STIBP"   \
-                       "\36" "ARCH_CAP"                "\40" "SSBD"
+       "\35" "L1D_FLUSH" "\36" "ARCH_CAP"              "\40" "SSBD"
 
 /*
  * CPUID Processor extended state Enumeration Fn0000000d
@@ -661,7 +662,10 @@
 #define        IA32_ARCH_RDCL_NO       0x01
 #define        IA32_ARCH_IBRS_ALL      0x02
 #define        IA32_ARCH_RSBA          0x04
+#define        IA32_ARCH_SKIP_L1DFL_VMENTRY 0x08
 #define        IA32_ARCH_SSB_NO        0x10
+#define MSR_IA32_FLUSH_CMD 0x10b
+#define        IA32_FLUSH_CMD_L1D_FLUSH 0x01
 #define MSR_BBL_CR_ADDR                0x116   /* PII+ only */
 #define MSR_BBL_CR_DECC                0x118   /* PII+ only */
 #define MSR_BBL_CR_CTL         0x119   /* PII+ only */
diff -r c9c3959395af -r a25a3e224e1e sys/arch/x86/x86/procfs_machdep.c
--- a/sys/arch/x86/x86/procfs_machdep.c Sun Sep 23 17:33:15 2018 +0000
+++ b/sys/arch/x86/x86/procfs_machdep.c Sun Sep 23 17:35:33 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: procfs_machdep.c,v 1.15.2.5 2018/06/09 15:14:49 martin Exp $ */
+/*     $NetBSD: procfs_machdep.c,v 1.15.2.6 2018/09/23 17:35:33 martin Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.15.2.5 2018/06/09 15:14:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.15.2.6 2018/09/23 17:35:33 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -190,7 +190,8 @@
        NULL, NULL, "avx512_4vnniw", "avx512_4fmaps", NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-       NULL, NULL, NULL, NULL, NULL, "arch_capabilities", NULL, "ssbd"},
+       NULL, NULL, NULL, NULL,
+       "flush_l1d", "arch_capabilities", NULL, "ssbd"},
 };
 
 static int     procfs_getonecpu(int, struct cpu_info *, char *, size_t *);