xnu-1699.32.7.tar.gz

[apple/xnu.git] / bsd / dev / i386 / sysctl.c

diff --git a/bsd/dev/i386/sysctl.c b/bsd/dev/i386/sysctl.c
index cb15eb632e49521e4ecf3b1f326afcfed347ea3e..3e001de2b7137237869615592418caa7f77b62ce 100644 (file)
--- a/bsd/dev/i386/sysctl.c
+++ b/bsd/dev/i386/sysctl.c
@@ -147,6 +147,24 @@ cpu_extfeatures SYSCTL_HANDLER_ARGS
     return SYSCTL_OUT(req, buf, strlen(buf) + 1);
 }
 
+static int
+cpu_leaf7_features SYSCTL_HANDLER_ARGS
+{
+    __unused struct sysctl_oid *unused_oidp = oidp;
+    __unused void *unused_arg1 = arg1;
+    __unused int unused_arg2 = arg2; 
+    char buf[512];
+
+    uint32_t   leaf7_features = cpuid_info()->cpuid_leaf7_features;
+    if (leaf7_features == 0)
+        return ENOENT;
+
+    buf[0] = '\0';
+    cpuid_get_leaf7_feature_names(leaf7_features, buf, sizeof(buf));
+
+    return SYSCTL_OUT(req, buf, strlen(buf) + 1);
+}
+
 static int
 cpu_logical_per_package SYSCTL_HANDLER_ARGS
 {
@@ -305,6 +323,12 @@ SYSCTL_PROC(_machdep_cpu, OID_AUTO, feature_bits, CTLTYPE_QUAD | CTLFLAG_RD | CT
            (void *)offsetof(i386_cpu_info_t, cpuid_features), sizeof(uint64_t),
            i386_cpu_info, "IU", "CPU features");
 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, leaf7_feature_bits,
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           (void *)offsetof(i386_cpu_info_t, cpuid_leaf7_features),
+           sizeof(uint32_t),
+           i386_cpu_info_nonzero, "IU", "CPU Leaf7 features");
+
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, extfeature_bits, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_LOCKED, 
            (void *)offsetof(i386_cpu_info_t, cpuid_extfeatures), sizeof(uint64_t),
            i386_cpu_info, "IU", "CPU extended features");
@@ -321,6 +345,11 @@ SYSCTL_PROC(_machdep_cpu, OID_AUTO, features, CTLTYPE_STRING | CTLFLAG_RD | CTLF
            0, 0,
            cpu_features, "A", "CPU feature names");
 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, leaf7_features,
+           CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           0, 0,
+           cpu_leaf7_features, "A", "CPU Leaf7 feature names");
+
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, extfeatures, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_LOCKED, 
            0, 0,
            cpu_extfeatures, "A", "CPU extended feature names");