Module Name: src
Committed By: msaitoh
Date: Mon Aug 7 09:27:14 UTC 2023
Modified Files:
src/sys/arch/x86/x86: procfs_machdep.c
Log Message:
Update /proc/cpuinfo.
- Move "ssbd" to an unused Linux mapping.
- Update unused Linux mappings.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/x86/x86/procfs_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.47 src/sys/arch/x86/x86/procfs_machdep.c:1.48
--- src/sys/arch/x86/x86/procfs_machdep.c:1.47 Tue Apr 11 02:42:15 2023
+++ src/sys/arch/x86/x86/procfs_machdep.c Mon Aug 7 09:27:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.47 2023/04/11 02:42:15 msaitoh Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.48 2023/08/07 09:27:14 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.47 2023/04/11 02:42:15 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.48 2023/08/07 09:27:14 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,14 +113,15 @@ static const char * const x86_features[]
"perfctr_llc", "mwaitx", NULL, NULL},
{ /* (7) Linux mapping */
- NULL, NULL, "cpb", "ebp", NULL, "pln", "pts", "dtherm",
- "hw_pstate", "proc_feedback", NULL, NULL,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, "ibrs", "ibpb", "stibp", NULL, NULL, NULL, NULL},
+ "ring3mwait", "cpuid_fault", "cpb", "epb",
+ "cat_l3", "cat_l2", "cdp_l3", "invpcid_single",
+ "hw_pstate", "proc_feedback", NULL, "pti",
+ NULL, NULL, "intel_ppin", "cdp_l2",
+ NULL, "ssbd", "mba", NULL, "perfmon_v2", NULL, NULL, NULL,
+ NULL, "ibrs", "ibpb", "stibp", NULL, NULL, "ibrs_enhanced", NULL},
{ /* (8) Linux mapping */
- "tpr_shadow", "vnmi", "flexpriority", "ept", "vpid", NULL, NULL, NULL,
+ "tpr_shadow", "flexpriority", "ept", "vpid", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, "vmmcall",
NULL, "ept_ad", NULL, NULL, NULL, NULL, "tdx_guest", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
@@ -195,7 +196,7 @@ static const char * const x86_features[]
"tsxldtrk", NULL, "pconfig", "arch_lbr",
"ibt", NULL, "amx_bf16", "avx512_fp16",
"amx_tile", "amx_int8", NULL, NULL,
- "flush_l1d", "arch_capabilities", NULL, "ssbd"},
+ "flush_l1d", "arch_capabilities", NULL, NULL},
{ /* (19) AMD 0x8000001f eax */
"sme", "sev", NULL, "sev_es", NULL, NULL, NULL, NULL,