xnu-2050.48.11.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 597a208c1714bf6643c778fb7b85e6c8438a8d81..f971730756e2460f084c997f587b9543164c1b3a 100644 (file)
--- a/bsd/dev/i386/sysctl.c
+++ b/bsd/dev/i386/sysctl.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2011 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -32,6 +32,14 @@
 #include <sys/sysctl.h>
 #include <i386/cpuid.h>
 #include <i386/tsc.h>
 #include <sys/sysctl.h>
 #include <i386/cpuid.h>
 #include <i386/tsc.h>

+#include <i386/machine_routines.h>
+#include <i386/pal_routines.h>
+#include <i386/ucode.h>
+#include <kern/clock.h>
+#include <libkern/libkern.h>
+#include <i386/lapic.h>
+#include <i386/pmCPU.h>
+

 
 static int
 _i386_cpu_info SYSCTL_HANDLER_ARGS
 
 static int
 _i386_cpu_info SYSCTL_HANDLER_ARGS


@@ -105,13 +113,24 @@ cpu_arch_perf SYSCTL_HANDLER_ARGS
     return _i386_cpu_info(oidp, ptr, arg2, req);
 }
 
     return _i386_cpu_info(oidp, ptr, arg2, req);
 }
 

+static int
+cpu_xsave SYSCTL_HANDLER_ARGS
+{
+    i386_cpu_info_t *cpu_info = cpuid_info();
+    void *ptr = (uint8_t *)cpu_info->cpuid_xsave_leafp + (uintptr_t)arg1;
+    if (cpu_info->cpuid_xsave_leafp == NULL)
+        return ENOENT;
+    return _i386_cpu_info(oidp, ptr, arg2, req);
+}
+
+

 static int
 cpu_features SYSCTL_HANDLER_ARGS
 {
     __unused struct sysctl_oid *unused_oidp = oidp;
     __unused void *unused_arg1 = arg1;
     __unused int unused_arg2 = arg2; 
 static int
 cpu_features SYSCTL_HANDLER_ARGS
 {
     __unused struct sysctl_oid *unused_oidp = oidp;
     __unused void *unused_arg1 = arg1;
     __unused int unused_arg2 = arg2; 

-    char buf[256];
+    char buf[512];

 
     buf[0] = '\0';
     cpuid_get_feature_names(cpuid_features(), buf, sizeof(buf));
 
     buf[0] = '\0';
     cpuid_get_feature_names(cpuid_features(), buf, sizeof(buf));


@@ -125,7 +144,7 @@ cpu_extfeatures SYSCTL_HANDLER_ARGS
     __unused struct sysctl_oid *unused_oidp = oidp;
     __unused void *unused_arg1 = arg1;
     __unused int unused_arg2 = arg2; 
     __unused struct sysctl_oid *unused_oidp = oidp;
     __unused void *unused_arg1 = arg1;
     __unused int unused_arg2 = arg2; 

-    char buf[256];
+    char buf[512];

 
     buf[0] = '\0';
     cpuid_get_extfeature_names(cpuid_extfeatures(), buf, sizeof(buf));
 
     buf[0] = '\0';
     cpuid_get_extfeature_names(cpuid_extfeatures(), buf, sizeof(buf));


@@ -133,6 +152,24 @@ cpu_extfeatures SYSCTL_HANDLER_ARGS
     return SYSCTL_OUT(req, buf, strlen(buf) + 1);
 }
 
     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
 {
 static int
 cpu_logical_per_package SYSCTL_HANDLER_ARGS
 {


@@ -190,110 +227,205 @@ cpu_flex_ratio_max SYSCTL_HANDLER_ARGS
        return SYSCTL_OUT(req, &flex_ratio_max, sizeof(flex_ratio_max));
 }
 
        return SYSCTL_OUT(req, &flex_ratio_max, sizeof(flex_ratio_max));
 }
 

+static int
+cpu_ucode_update SYSCTL_HANDLER_ARGS
+{
+       __unused struct sysctl_oid *unused_oidp = oidp;
+       __unused void *unused_arg1 = arg1;
+       __unused int unused_arg2 = arg2;
+       uint64_t addr;
+       int error;
+       
+       error = SYSCTL_IN(req, &addr, sizeof(addr));
+       if (error)
+               return error;
+
+       int ret = ucode_interface(addr);
+       return ret;
+}
+
+extern uint64_t panic_restart_timeout;
+static int
+panic_set_restart_timeout(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       int new_value = 0, old_value = 0, changed = 0, error;
+       uint64_t nstime;
+
+       if (panic_restart_timeout) {
+               absolutetime_to_nanoseconds(panic_restart_timeout, &nstime);
+               old_value = nstime / NSEC_PER_SEC;
+       }
+
+       error = sysctl_io_number(req, old_value, sizeof(int), &new_value, &changed);
+       if (error == 0 && changed) {
+               nanoseconds_to_absolutetime(((uint64_t)new_value) * NSEC_PER_SEC, &panic_restart_timeout);
+       }
+       return error;
+}
+
+/*
+ * Populates the {CPU, vector, latency} triple for the maximum observed primary
+ * interrupt latency
+ */
+static int
+misc_interrupt_latency_max(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       int changed = 0, error;
+       char buf[128];
+       buf[0] = '\0';
+
+       interrupt_populate_latency_stats(buf, sizeof(buf));
+
+       error = sysctl_io_string(req, buf, sizeof(buf), 0, &changed);
+
+       if (error == 0 && changed) {
+               interrupt_reset_latency_stats();
+       }
+
+       return error;
+}
+
+/*
+ * Triggers a machine-check exception - for a suitably configured kernel only.
+ */
+extern void mca_exception_panic(void);
+static int
+misc_machine_check_panic(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       int changed = 0, error;
+       char buf[128];
+       buf[0] = '\0';
+
+       error = sysctl_io_string(req, buf, sizeof(buf), 0, &changed);
+
+       if (error == 0 && changed) {
+               mca_exception_panic();
+       }
+       return error;
+}
+
+

 SYSCTL_NODE(_machdep, OID_AUTO, cpu, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "CPU info");
 
 SYSCTL_NODE(_machdep, OID_AUTO, cpu, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "CPU info");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, max_basic, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, max_basic, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_max_basic),sizeof(uint32_t),
            i386_cpu_info, "IU", "Max Basic Information value");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_max_basic),sizeof(uint32_t),
            i386_cpu_info, "IU", "Max Basic Information value");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, max_ext, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, max_ext, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_max_ext), sizeof(uint32_t),
            i386_cpu_info, "IU", "Max Extended Function Information value");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_max_ext), sizeof(uint32_t),
            i386_cpu_info, "IU", "Max Extended Function Information value");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, vendor, CTLTYPE_STRING | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, vendor, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_vendor), 0,
            i386_cpu_info, "A", "CPU vendor");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_vendor), 0,
            i386_cpu_info, "A", "CPU vendor");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, brand_string, CTLTYPE_STRING | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, brand_string, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_brand_string), 0,
            i386_cpu_info, "A", "CPU brand string");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_brand_string), 0,
            i386_cpu_info, "A", "CPU brand string");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, family, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, family, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_family), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU family");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_family), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU family");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, model, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, model, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_model), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU model");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_model), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU model");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, extmodel, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, extmodel, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_extmodel), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU extended model");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_extmodel), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU extended model");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, extfamily, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, extfamily, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_extfamily), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU extended family");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_extfamily), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU extended family");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, stepping, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, stepping, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_stepping), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU stepping");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_stepping), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU stepping");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, feature_bits, CTLTYPE_QUAD | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, feature_bits, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_features), sizeof(uint64_t),
            i386_cpu_info, "IU", "CPU features");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_features), sizeof(uint64_t),
            i386_cpu_info, "IU", "CPU features");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, extfeature_bits, CTLTYPE_QUAD | CTLFLAG_RD, 
+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");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_extfeatures), sizeof(uint64_t),
            i386_cpu_info, "IU", "CPU extended features");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, signature, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, signature, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_signature), sizeof(uint32_t),
            i386_cpu_info, "I", "CPU signature");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_signature), sizeof(uint32_t),
            i386_cpu_info, "I", "CPU signature");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, brand, CTLTYPE_INT | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, brand, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_brand), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU brand");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_brand), sizeof(uint8_t),
            i386_cpu_info, "I", "CPU brand");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, features, CTLTYPE_STRING | CTLFLAG_RD, 
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, features, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_LOCKED, 

            0, 0,
            cpu_features, "A", "CPU feature names");
 
            0, 0,
            cpu_features, "A", "CPU feature names");
 

-SYSCTL_PROC(_machdep_cpu, OID_AUTO, extfeatures, CTLTYPE_STRING | CTLFLAG_RD, 
+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");
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, logical_per_package,
            0, 0,
            cpu_extfeatures, "A", "CPU extended feature names");
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, logical_per_package,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            0, 0,
            cpu_logical_per_package, "I", "CPU logical cpus per package");
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, cores_per_package,
            0, 0,
            cpu_logical_per_package, "I", "CPU logical cpus per package");
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, cores_per_package,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_cores_per_package),
            sizeof(uint32_t),
            i386_cpu_info, "I", "CPU cores per package");
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, microcode_version,
            (void *)offsetof(i386_cpu_info_t, cpuid_cores_per_package),
            sizeof(uint32_t),
            i386_cpu_info, "I", "CPU cores per package");
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, microcode_version,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_microcode_version),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Microcode version number");
 
            (void *)offsetof(i386_cpu_info_t, cpuid_microcode_version),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Microcode version number");
 

+SYSCTL_PROC(_machdep_cpu, OID_AUTO, processor_flag,
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           (void *)offsetof(i386_cpu_info_t, cpuid_processor_flag),
+           sizeof(uint32_t),
+           i386_cpu_info, "I", "CPU processor flag");
+

 
 SYSCTL_NODE(_machdep_cpu, OID_AUTO, mwait, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "mwait");
 
 SYSCTL_PROC(_machdep_cpu_mwait, OID_AUTO, linesize_min,
 
 SYSCTL_NODE(_machdep_cpu, OID_AUTO, mwait, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "mwait");
 
 SYSCTL_PROC(_machdep_cpu_mwait, OID_AUTO, linesize_min,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_mwait_leaf_t, linesize_min),
            sizeof(uint32_t),
            cpu_mwait, "I", "Monitor/mwait minimum line size");
 
 SYSCTL_PROC(_machdep_cpu_mwait, OID_AUTO, linesize_max,
            (void *)offsetof(cpuid_mwait_leaf_t, linesize_min),
            sizeof(uint32_t),
            cpu_mwait, "I", "Monitor/mwait minimum line size");
 
 SYSCTL_PROC(_machdep_cpu_mwait, OID_AUTO, linesize_max,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_mwait_leaf_t, linesize_max),
            sizeof(uint32_t),
            cpu_mwait, "I", "Monitor/mwait maximum line size");
 
 SYSCTL_PROC(_machdep_cpu_mwait, OID_AUTO, extensions,
            (void *)offsetof(cpuid_mwait_leaf_t, linesize_max),
            sizeof(uint32_t),
            cpu_mwait, "I", "Monitor/mwait maximum line size");
 
 SYSCTL_PROC(_machdep_cpu_mwait, OID_AUTO, extensions,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_mwait_leaf_t, extensions),
            sizeof(uint32_t),
            cpu_mwait, "I", "Monitor/mwait extensions");
 
 SYSCTL_PROC(_machdep_cpu_mwait, OID_AUTO, sub_Cstates,
            (void *)offsetof(cpuid_mwait_leaf_t, extensions),
            sizeof(uint32_t),
            cpu_mwait, "I", "Monitor/mwait extensions");
 
 SYSCTL_PROC(_machdep_cpu_mwait, OID_AUTO, sub_Cstates,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_mwait_leaf_t, sub_Cstates),
            sizeof(uint32_t),
            cpu_mwait, "I", "Monitor/mwait sub C-states");
            (void *)offsetof(cpuid_mwait_leaf_t, sub_Cstates),
            sizeof(uint32_t),
            cpu_mwait, "I", "Monitor/mwait sub C-states");


@@ -303,77 +435,116 @@ SYSCTL_NODE(_machdep_cpu, OID_AUTO, thermal, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "thermal");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, sensor,
        "thermal");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, sensor,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_thermal_leaf_t, sensor),
            sizeof(boolean_t),
            cpu_thermal, "I", "Thermal sensor present");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, dynamic_acceleration,
            (void *)offsetof(cpuid_thermal_leaf_t, sensor),
            sizeof(boolean_t),
            cpu_thermal, "I", "Thermal sensor present");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, dynamic_acceleration,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_thermal_leaf_t, dynamic_acceleration),
            sizeof(boolean_t),
            cpu_thermal, "I", "Dynamic Acceleration Technology (Turbo Mode)");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, invariant_APIC_timer,
            (void *)offsetof(cpuid_thermal_leaf_t, dynamic_acceleration),
            sizeof(boolean_t),
            cpu_thermal, "I", "Dynamic Acceleration Technology (Turbo Mode)");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, invariant_APIC_timer,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_thermal_leaf_t, invariant_APIC_timer),
            sizeof(boolean_t),
            cpu_thermal, "I", "Invariant APIC Timer");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, thresholds,
            (void *)offsetof(cpuid_thermal_leaf_t, invariant_APIC_timer),
            sizeof(boolean_t),
            cpu_thermal, "I", "Invariant APIC Timer");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, thresholds,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_thermal_leaf_t, thresholds),
            sizeof(uint32_t),
            cpu_thermal, "I", "Number of interrupt thresholds");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, ACNT_MCNT,
            (void *)offsetof(cpuid_thermal_leaf_t, thresholds),
            sizeof(uint32_t),
            cpu_thermal, "I", "Number of interrupt thresholds");
 
 SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, ACNT_MCNT,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_thermal_leaf_t, ACNT_MCNT),
            sizeof(boolean_t),
            cpu_thermal, "I", "ACNT_MCNT capability");
 
            (void *)offsetof(cpuid_thermal_leaf_t, ACNT_MCNT),
            sizeof(boolean_t),
            cpu_thermal, "I", "ACNT_MCNT capability");
 

+SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, core_power_limits,
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           (void *)offsetof(cpuid_thermal_leaf_t, core_power_limits),
+           sizeof(boolean_t),
+           cpu_thermal, "I", "Power Limit Notifications at a Core Level");
+
+SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, fine_grain_clock_mod,
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           (void *)offsetof(cpuid_thermal_leaf_t, fine_grain_clock_mod),
+           sizeof(boolean_t),
+           cpu_thermal, "I", "Fine Grain Clock Modulation");
+
+SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, package_thermal_intr,
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           (void *)offsetof(cpuid_thermal_leaf_t, package_thermal_intr),
+           sizeof(boolean_t),
+           cpu_thermal, "I", "Package Thermal interrupt and Status");
+
+SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, hardware_feedback,
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           (void *)offsetof(cpuid_thermal_leaf_t, hardware_feedback),
+           sizeof(boolean_t),
+           cpu_thermal, "I", "Hardware Coordination Feedback");
+
+SYSCTL_PROC(_machdep_cpu_thermal, OID_AUTO, energy_policy,
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           (void *)offsetof(cpuid_thermal_leaf_t, energy_policy),
+           sizeof(boolean_t),
+           cpu_thermal, "I", "Energy Efficient Policy Support");
+
+SYSCTL_NODE(_machdep_cpu, OID_AUTO, xsave, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
+       "xsave");
+
+SYSCTL_PROC(_machdep_cpu_xsave, OID_AUTO, extended_state,
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 
+           (void *)offsetof(cpuid_xsave_leaf_t, extended_state),
+           sizeof(cpuid_xsave_leaf_t),
+           cpu_xsave, "IU", "XSAVE Extended State");
+

 
 SYSCTL_NODE(_machdep_cpu, OID_AUTO, arch_perf, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "arch_perf");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, version,
 
 SYSCTL_NODE(_machdep_cpu, OID_AUTO, arch_perf, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "arch_perf");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, version,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_arch_perf_leaf_t, version),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Architectural Performance Version Number");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, number,
            (void *)offsetof(cpuid_arch_perf_leaf_t, version),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Architectural Performance Version Number");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, number,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_arch_perf_leaf_t, number),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Number of counters per logical cpu");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, width,
            (void *)offsetof(cpuid_arch_perf_leaf_t, number),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Number of counters per logical cpu");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, width,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_arch_perf_leaf_t, width),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Bit width of counters");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, events_number,
            (void *)offsetof(cpuid_arch_perf_leaf_t, width),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Bit width of counters");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, events_number,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_arch_perf_leaf_t, events_number),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Number of monitoring events");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, events,
            (void *)offsetof(cpuid_arch_perf_leaf_t, events_number),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Number of monitoring events");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, events,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_arch_perf_leaf_t, events),
            sizeof(uint32_t),
            cpu_arch_perf, "I", "Bit vector of events");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, fixed_number,
            (void *)offsetof(cpuid_arch_perf_leaf_t, events),
            sizeof(uint32_t),
            cpu_arch_perf, "I", "Bit vector of events");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, fixed_number,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_arch_perf_leaf_t, fixed_number),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Number of fixed-function counters");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, fixed_width,
            (void *)offsetof(cpuid_arch_perf_leaf_t, fixed_number),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Number of fixed-function counters");
 
 SYSCTL_PROC(_machdep_cpu_arch_perf, OID_AUTO, fixed_width,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(cpuid_arch_perf_leaf_t, fixed_width),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Bit-width of fixed-function counters");
            (void *)offsetof(cpuid_arch_perf_leaf_t, fixed_width),
            sizeof(uint8_t),
            cpu_arch_perf, "I", "Bit-width of fixed-function counters");


@@ -383,19 +554,19 @@ SYSCTL_NODE(_machdep_cpu, OID_AUTO, cache, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "cache");
 
 SYSCTL_PROC(_machdep_cpu_cache, OID_AUTO, linesize,
        "cache");
 
 SYSCTL_PROC(_machdep_cpu_cache, OID_AUTO, linesize,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_cache_linesize),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Cacheline size");
 
 SYSCTL_PROC(_machdep_cpu_cache, OID_AUTO, L2_associativity,
            (void *)offsetof(i386_cpu_info_t, cpuid_cache_linesize),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Cacheline size");
 
 SYSCTL_PROC(_machdep_cpu_cache, OID_AUTO, L2_associativity,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_cache_L2_associativity),
            sizeof(uint32_t),
            i386_cpu_info, "I", "L2 cache associativity");
 
 SYSCTL_PROC(_machdep_cpu_cache, OID_AUTO, size,
            (void *)offsetof(i386_cpu_info_t, cpuid_cache_L2_associativity),
            sizeof(uint32_t),
            i386_cpu_info, "I", "L2 cache associativity");
 
 SYSCTL_PROC(_machdep_cpu_cache, OID_AUTO, size,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_cache_size),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Cache size (in Kbytes)");
            (void *)offsetof(i386_cpu_info_t, cpuid_cache_size),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Cache size (in Kbytes)");


@@ -409,7 +580,7 @@ SYSCTL_NODE(_machdep_cpu_tlb, OID_AUTO, data, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "data");
 
 SYSCTL_PROC(_machdep_cpu_tlb_inst, OID_AUTO, small,
        "data");
 
 SYSCTL_PROC(_machdep_cpu_tlb_inst, OID_AUTO, small,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_INST][TLB_SMALL][0]),
            sizeof(uint32_t),
            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_INST][TLB_SMALL][0]),
            sizeof(uint32_t),


@@ -417,7 +588,7 @@ SYSCTL_PROC(_machdep_cpu_tlb_inst, OID_AUTO, small,
            "Number of small page instruction TLBs");
 
 SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, small,
            "Number of small page instruction TLBs");
 
 SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, small,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_DATA][TLB_SMALL][0]),
            sizeof(uint32_t),
            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_DATA][TLB_SMALL][0]),
            sizeof(uint32_t),


@@ -425,7 +596,7 @@ SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, small,
            "Number of small page data TLBs (1st level)");
 
 SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, small_level1,
            "Number of small page data TLBs (1st level)");
 
 SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, small_level1,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_DATA][TLB_SMALL][1]),
            sizeof(uint32_t),
            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_DATA][TLB_SMALL][1]),
            sizeof(uint32_t),


@@ -433,7 +604,7 @@ SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, small_level1,
            "Number of small page data TLBs (2nd level)");
 
 SYSCTL_PROC(_machdep_cpu_tlb_inst, OID_AUTO, large,
            "Number of small page data TLBs (2nd level)");
 
 SYSCTL_PROC(_machdep_cpu_tlb_inst, OID_AUTO, large,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_INST][TLB_LARGE][0]),
            sizeof(uint32_t),
            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_INST][TLB_LARGE][0]),
            sizeof(uint32_t),


@@ -441,7 +612,7 @@ SYSCTL_PROC(_machdep_cpu_tlb_inst, OID_AUTO, large,
            "Number of large page instruction TLBs");
 
 SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, large,
            "Number of large page instruction TLBs");
 
 SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, large,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_DATA][TLB_LARGE][0]),
            sizeof(uint32_t),
            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_DATA][TLB_LARGE][0]),
            sizeof(uint32_t),


@@ -449,7 +620,7 @@ SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, large,
            "Number of large page data TLBs (1st level)");
 
 SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, large_level1,
            "Number of large page data TLBs (1st level)");
 
 SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, large_level1,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_DATA][TLB_LARGE][1]),
            sizeof(uint32_t),
            (void *)offsetof(i386_cpu_info_t,
                             cpuid_tlb[TLB_DATA][TLB_LARGE][1]),
            sizeof(uint32_t),


@@ -457,7 +628,7 @@ SYSCTL_PROC(_machdep_cpu_tlb_data, OID_AUTO, large_level1,
            "Number of large page data TLBs (2nd level)");
 
 SYSCTL_PROC(_machdep_cpu_tlb, OID_AUTO, shared,
            "Number of large page data TLBs (2nd level)");
 
 SYSCTL_PROC(_machdep_cpu_tlb, OID_AUTO, shared,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_stlb),
            sizeof(uint32_t),
            i386_cpu_info_nonzero, "I",
            (void *)offsetof(i386_cpu_info_t, cpuid_stlb),
            sizeof(uint32_t),
            i386_cpu_info_nonzero, "I",


@@ -468,26 +639,26 @@ SYSCTL_NODE(_machdep_cpu, OID_AUTO, address_bits, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "address_bits");
 
 SYSCTL_PROC(_machdep_cpu_address_bits, OID_AUTO, physical,
        "address_bits");
 
 SYSCTL_PROC(_machdep_cpu_address_bits, OID_AUTO, physical,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_address_bits_physical),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Number of physical address bits");
 
 SYSCTL_PROC(_machdep_cpu_address_bits, OID_AUTO, virtual,
            (void *)offsetof(i386_cpu_info_t, cpuid_address_bits_physical),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Number of physical address bits");
 
 SYSCTL_PROC(_machdep_cpu_address_bits, OID_AUTO, virtual,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, cpuid_address_bits_virtual),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Number of virtual address bits");
 
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, core_count,
            (void *)offsetof(i386_cpu_info_t, cpuid_address_bits_virtual),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Number of virtual address bits");
 
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, core_count,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, core_count),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Number of enabled cores per package");
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, thread_count,
            (void *)offsetof(i386_cpu_info_t, core_count),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Number of enabled cores per package");
 
 SYSCTL_PROC(_machdep_cpu, OID_AUTO, thread_count,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            (void *)offsetof(i386_cpu_info_t, thread_count),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Number of enabled threads per package");
            (void *)offsetof(i386_cpu_info_t, thread_count),
            sizeof(uint32_t),
            i386_cpu_info, "I", "Number of enabled threads per package");


@@ -496,34 +667,49 @@ SYSCTL_NODE(_machdep_cpu, OID_AUTO, flex_ratio, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "Flex ratio");
 
 SYSCTL_PROC(_machdep_cpu_flex_ratio, OID_AUTO, desired,
        "Flex ratio");
 
 SYSCTL_PROC(_machdep_cpu_flex_ratio, OID_AUTO, desired,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            0, 0,
            cpu_flex_ratio_desired, "I", "Flex ratio desired (0 disabled)");
 
 SYSCTL_PROC(_machdep_cpu_flex_ratio, OID_AUTO, min,
            0, 0,
            cpu_flex_ratio_desired, "I", "Flex ratio desired (0 disabled)");
 
 SYSCTL_PROC(_machdep_cpu_flex_ratio, OID_AUTO, min,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            0, 0,
            cpu_flex_ratio_min, "I", "Flex ratio min (efficiency)");
 
 SYSCTL_PROC(_machdep_cpu_flex_ratio, OID_AUTO, max,
            0, 0,
            cpu_flex_ratio_min, "I", "Flex ratio min (efficiency)");
 
 SYSCTL_PROC(_machdep_cpu_flex_ratio, OID_AUTO, max,

-           CTLTYPE_INT | CTLFLAG_RD, 
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 

            0, 0,
            cpu_flex_ratio_max, "I", "Flex ratio max (non-turbo)");
 
            0, 0,
            cpu_flex_ratio_max, "I", "Flex ratio max (non-turbo)");
 

+SYSCTL_PROC(_machdep_cpu, OID_AUTO, ucupdate, 
+                       CTLTYPE_INT | CTLFLAG_WR | CTLFLAG_LOCKED, 0, 0,
+            cpu_ucode_update, "S", "Microcode update interface");
+
+static const uint32_t apic_timer_vector = (LAPIC_DEFAULT_INTERRUPT_BASE + LAPIC_TIMER_INTERRUPT);
+static const uint32_t apic_IPI_vector = (LAPIC_DEFAULT_INTERRUPT_BASE + LAPIC_INTERPROCESSOR_INTERRUPT);
+
+SYSCTL_NODE(_machdep, OID_AUTO, vectors, CTLFLAG_RD | CTLFLAG_LOCKED, 0,
+       "Interrupt vector assignments");
+
+SYSCTL_UINT     (_machdep_vectors, OID_AUTO, timer, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (uint32_t *)&apic_timer_vector, 0, "");
+SYSCTL_UINT     (_machdep_vectors, OID_AUTO, IPI, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (uint32_t *)&apic_IPI_vector, 0, "");
+

 uint64_t pmap_pv_hashlist_walks;
 uint64_t pmap_pv_hashlist_cnts;
 uint32_t pmap_pv_hashlist_max;
 uint32_t pmap_kernel_text_ps = PAGE_SIZE;
 uint64_t pmap_pv_hashlist_walks;
 uint64_t pmap_pv_hashlist_cnts;
 uint32_t pmap_pv_hashlist_max;
 uint32_t pmap_kernel_text_ps = PAGE_SIZE;

+extern uint32_t pv_hashed_kern_low_water_mark;

 
 /*extern struct sysctl_oid_list sysctl__machdep_pmap_children;*/
 
 SYSCTL_NODE(_machdep, OID_AUTO, pmap, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "PMAP info");
 
 
 /*extern struct sysctl_oid_list sysctl__machdep_pmap_children;*/
 
 SYSCTL_NODE(_machdep, OID_AUTO, pmap, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
        "PMAP info");
 

-SYSCTL_QUAD    (_machdep_pmap, OID_AUTO, hashwalks, CTLFLAG_RD | CTLFLAG_KERN, &pmap_pv_hashlist_walks, "");
-SYSCTL_QUAD    (_machdep_pmap, OID_AUTO, hashcnts, CTLFLAG_RD | CTLFLAG_KERN, &pmap_pv_hashlist_cnts, "");
-SYSCTL_INT     (_machdep_pmap, OID_AUTO, hashmax, CTLFLAG_RD | CTLFLAG_KERN, &pmap_pv_hashlist_max, 0, "");
-SYSCTL_INT     (_machdep_pmap, OID_AUTO, kernel_text_ps, CTLFLAG_RD | CTLFLAG_KERN, &pmap_kernel_text_ps, 0, "");
+SYSCTL_QUAD    (_machdep_pmap, OID_AUTO, hashwalks, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &pmap_pv_hashlist_walks, "");
+SYSCTL_QUAD    (_machdep_pmap, OID_AUTO, hashcnts, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &pmap_pv_hashlist_cnts, "");
+SYSCTL_INT     (_machdep_pmap, OID_AUTO, hashmax, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &pmap_pv_hashlist_max, 0, "");
+SYSCTL_INT     (_machdep_pmap, OID_AUTO, kernel_text_ps, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &pmap_kernel_text_ps, 0, "");
+SYSCTL_INT     (_machdep_pmap, OID_AUTO, kern_pv_reserve, CTLFLAG_RW | CTLFLAG_KERN | CTLFLAG_LOCKED, &pv_hashed_kern_low_water_mark, 0, "");

 
 SYSCTL_NODE(_machdep, OID_AUTO, memmap, CTLFLAG_RD|CTLFLAG_LOCKED, NULL, "physical memory map");
 
 
 SYSCTL_NODE(_machdep, OID_AUTO, memmap, CTLFLAG_RD|CTLFLAG_LOCKED, NULL, "physical memory map");
 


@@ -544,3 +730,49 @@ SYSCTL_QUAD(_machdep_memmap, OID_AUTO, PalCode, CTLFLAG_RD|CTLFLAG_LOCKED, &firm
 SYSCTL_QUAD(_machdep_memmap, OID_AUTO, Reserved, CTLFLAG_RD|CTLFLAG_LOCKED, &firmware_Reserved_bytes, "");
 SYSCTL_QUAD(_machdep_memmap, OID_AUTO, Unusable, CTLFLAG_RD|CTLFLAG_LOCKED, &firmware_Unusable_bytes, "");
 SYSCTL_QUAD(_machdep_memmap, OID_AUTO, Other, CTLFLAG_RD|CTLFLAG_LOCKED, &firmware_other_bytes, "");
 SYSCTL_QUAD(_machdep_memmap, OID_AUTO, Reserved, CTLFLAG_RD|CTLFLAG_LOCKED, &firmware_Reserved_bytes, "");
 SYSCTL_QUAD(_machdep_memmap, OID_AUTO, Unusable, CTLFLAG_RD|CTLFLAG_LOCKED, &firmware_Unusable_bytes, "");
 SYSCTL_QUAD(_machdep_memmap, OID_AUTO, Other, CTLFLAG_RD|CTLFLAG_LOCKED, &firmware_other_bytes, "");

+
+SYSCTL_NODE(_machdep, OID_AUTO, tsc, CTLFLAG_RD|CTLFLAG_LOCKED, NULL, "Timestamp counter parameters");
+
+SYSCTL_QUAD(_machdep_tsc, OID_AUTO, frequency,
+       CTLFLAG_RD|CTLFLAG_LOCKED, &tscFreq, "");
+
+extern uint32_t deep_idle_rebase;
+SYSCTL_UINT(_machdep_tsc, OID_AUTO, deep_idle_rebase,
+       CTLFLAG_RW|CTLFLAG_KERN|CTLFLAG_LOCKED, &deep_idle_rebase, 0, "");
+
+SYSCTL_NODE(_machdep_tsc, OID_AUTO, nanotime,
+       CTLFLAG_RD|CTLFLAG_LOCKED, NULL, "TSC to ns conversion");
+SYSCTL_QUAD(_machdep_tsc_nanotime, OID_AUTO, tsc_base,
+       CTLFLAG_RD | CTLFLAG_LOCKED,
+       (uint64_t *) &pal_rtc_nanotime_info.tsc_base, "");
+SYSCTL_QUAD(_machdep_tsc_nanotime, OID_AUTO, ns_base,
+       CTLFLAG_RD | CTLFLAG_LOCKED,
+       (uint64_t *)&pal_rtc_nanotime_info.ns_base, "");
+SYSCTL_UINT(_machdep_tsc_nanotime, OID_AUTO, scale,
+       CTLFLAG_RD | CTLFLAG_LOCKED,
+       (uint32_t *)&pal_rtc_nanotime_info.scale, 0, "");
+SYSCTL_UINT(_machdep_tsc_nanotime, OID_AUTO, shift,
+       CTLFLAG_RD | CTLFLAG_LOCKED,
+       (uint32_t *)&pal_rtc_nanotime_info.shift, 0, "");
+SYSCTL_UINT(_machdep_tsc_nanotime, OID_AUTO, generation,
+       CTLFLAG_RD | CTLFLAG_LOCKED,
+       (uint32_t *)&pal_rtc_nanotime_info.generation, 0, "");
+
+SYSCTL_NODE(_machdep, OID_AUTO, misc, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
+       "Miscellaneous x86 kernel parameters");
+
+SYSCTL_PROC(_machdep_misc, OID_AUTO, panic_restart_timeout,
+           CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, 
+           0, 0,
+           panic_set_restart_timeout, "I", "Panic restart timeout in seconds");
+
+SYSCTL_PROC(_machdep_misc, OID_AUTO, interrupt_latency_max,
+           CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_LOCKED, 
+           0, 0,
+           misc_interrupt_latency_max, "A", "Maximum Interrupt latency");
+
+SYSCTL_PROC(_machdep_misc, OID_AUTO, machine_check_panic,
+           CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_LOCKED, 
+           0, 0,
+           misc_machine_check_panic, "A", "Machine-check exception test");
+