]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/kern_mib.c
xnu-7195.50.7.100.1.tar.gz
[apple/xnu.git] / bsd / kern / kern_mib.c
index d3a9e2c060fb397e25cfdc225fc3fa8f47f357a8..85ffba28d6ec0b39815b097a18db722418162c7e 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*-
 #include <vm/vm_protos.h>
 #include <mach/host_info.h>
 #include <kern/pms.h>
+#include <pexpert/device_tree.h>
+#include <pexpert/pexpert.h>
+#include <kern/sched_prim.h>
+#include <console/serial_protos.h>
 
 extern vm_map_t bsd_pageable_map;
 
@@ -110,73 +114,93 @@ extern vm_map_t bsd_pageable_map;
 #include <IOKit/IOPlatformExpert.h>
 #include <pexpert/pexpert.h>
 
+#include <machine/config.h>
 #include <machine/machine_routines.h>
 #include <machine/cpu_capabilities.h>
 
-#include <mach/mach_host.h>            /* for host_info() */
+#include <mach/mach_host.h>             /* for host_info() */
 
 #if defined(__i386__) || defined(__x86_64__)
-#include <i386/cpuid.h>        /* for cpuid_info() */
+#include <i386/cpuid.h> /* for cpuid_info() */
 #endif
 
 #if defined(__arm__) || defined(__arm64__)
-#include <arm/cpuid.h>         /* for cpuid_info() & cache_info() */
+#include <arm/cpuid.h>          /* for cpuid_info() & cache_info() */
 #endif
 
 
 #ifndef MAX
-#define MAX(a,b) (a >= b ? a : b)
+#define MAX(a, b) (a >= b ? a : b)
 #endif
 
 /* XXX This should be in a BSD accessible Mach header, but isn't. */
 extern unsigned int vm_page_wire_count;
 
-static int     cputype, cpusubtype, cputhreadtype, cpufamily, cpu64bit;
-static uint64_t        cacheconfig[10], cachesize[10];
-static int     packages;
-
-SYSCTL_NODE(, 0,         sysctl, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "Sysctl internal magic");
-SYSCTL_NODE(, CTL_KERN,          kern,   CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "High kernel, proc, limits &c");
-SYSCTL_NODE(, CTL_VM,    vm,     CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "Virtual memory");
-SYSCTL_NODE(, CTL_VFS,   vfs,     CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "File system");
-SYSCTL_NODE(, CTL_NET,   net,    CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "Network, (see socket.h)");
-SYSCTL_NODE(, CTL_DEBUG,  debug,  CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "Debugging");
-SYSCTL_NODE(, CTL_HW,    hw,     CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "hardware");
-SYSCTL_NODE(, CTL_MACHDEP, machdep, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "machine dependent");
-SYSCTL_NODE(, CTL_USER,          user,   CTLFLAG_RW|CTLFLAG_LOCKED, 0,
-       "user-level");
-
-#define SYSCTL_RETURN(r, x)    SYSCTL_OUT(r, &x, sizeof(x))
+static int      cputhreadtype, cpu64bit;
+static uint64_t cacheconfig[10], cachesize[10];
+static int      packages;
+
+static char *   osenvironment;
+static uint32_t osenvironment_size = 0;
+static int      osenvironment_initialized = 0;
+
+static uint32_t ephemeral_storage = 0;
+static uint32_t use_recovery_securityd = 0;
+
+static struct {
+       uint32_t ephemeral_storage:1;
+       uint32_t use_recovery_securityd:1;
+} property_existence = {0, 0};
+
+SYSCTL_NODE(, 0, sysctl, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "Sysctl internal magic");
+SYSCTL_NODE(, CTL_KERN, kern, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "High kernel, proc, limits &c");
+SYSCTL_NODE(, CTL_VM, vm, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "Virtual memory");
+SYSCTL_NODE(, CTL_VFS, vfs, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "File system");
+SYSCTL_NODE(, CTL_NET, net, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "Network, (see socket.h)");
+SYSCTL_NODE(, CTL_DEBUG, debug, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "Debugging");
+SYSCTL_NODE(, CTL_HW, hw, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "hardware");
+SYSCTL_NODE(, CTL_MACHDEP, machdep, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "machine dependent");
+SYSCTL_NODE(, CTL_USER, user, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "user-level");
+
+SYSCTL_NODE(_kern, OID_AUTO, bridge, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    "bridge");
+
+#define SYSCTL_RETURN(r, x)     SYSCTL_OUT(r, &x, sizeof(x))
 
 /******************************************************************************
  * hw.* MIB
  */
 
-#define CTLHW_RETQUAD  (1 << 31)
-#define CTLHW_LOCAL    (1 << 30)
+#define CTLHW_RETQUAD   (1U << 31)
+#define CTLHW_LOCAL     (1U << 30)
 
-#define HW_LOCAL_CPUTHREADTYPE (1 | CTLHW_LOCAL)
-#define HW_LOCAL_PHYSICALCPU   (2 | CTLHW_LOCAL)
-#define HW_LOCAL_PHYSICALCPUMAX        (3 | CTLHW_LOCAL)
-#define HW_LOCAL_LOGICALCPU    (4 | CTLHW_LOCAL)
-#define HW_LOCAL_LOGICALCPUMAX (5 | CTLHW_LOCAL)
+#define HW_LOCAL_CPUTHREADTYPE  (1 | CTLHW_LOCAL)
+#define HW_LOCAL_PHYSICALCPU    (2 | CTLHW_LOCAL)
+#define HW_LOCAL_PHYSICALCPUMAX (3 | CTLHW_LOCAL)
+#define HW_LOCAL_LOGICALCPU     (4 | CTLHW_LOCAL)
+#define HW_LOCAL_LOGICALCPUMAX  (5 | CTLHW_LOCAL)
+#define HW_LOCAL_CPUTYPE        (6 | CTLHW_LOCAL)
+#define HW_LOCAL_CPUSUBTYPE     (7 | CTLHW_LOCAL)
+#define HW_LOCAL_CPUFAMILY      (8 | CTLHW_LOCAL)
+#define HW_LOCAL_CPUSUBFAMILY   (9 | CTLHW_LOCAL)
 
 
 /*
- * Supporting some variables requires us to do "real" work.  We 
+ * Supporting some variables requires us to do "real" work.  We
  * gather some of that here.
  */
 static int
 sysctl_hw_generic(__unused struct sysctl_oid *oidp, __unused void *arg1,
-       int arg2, struct sysctl_req *req)
+    int arg2, struct sysctl_req *req)
 {
        char dummy[65];
        int  epochTemp;
@@ -208,40 +232,80 @@ sysctl_hw_generic(__unused struct sysctl_oid *oidp, __unused void *arg1,
        switch (arg2) {
        case HW_NCPU:
                if (kret == KERN_SUCCESS) {
-                       return(SYSCTL_RETURN(req, hinfo.max_cpus));
+                       return SYSCTL_RETURN(req, hinfo.max_cpus);
                } else {
-                       return(EINVAL);
+                       return EINVAL;
                }
        case HW_AVAILCPU:
                if (kret == KERN_SUCCESS) {
-                       return(SYSCTL_RETURN(req, hinfo.avail_cpus));
+                       return SYSCTL_RETURN(req, hinfo.avail_cpus);
                } else {
-                       return(EINVAL);
+                       return EINVAL;
                }
        case HW_LOCAL_PHYSICALCPU:
                if (kret == KERN_SUCCESS) {
-                       return(SYSCTL_RETURN(req, hinfo.physical_cpu));
+                       return SYSCTL_RETURN(req, hinfo.physical_cpu);
                } else {
-                       return(EINVAL);
+                       return EINVAL;
                }
        case HW_LOCAL_PHYSICALCPUMAX:
                if (kret == KERN_SUCCESS) {
-                       return(SYSCTL_RETURN(req, hinfo.physical_cpu_max));
+                       return SYSCTL_RETURN(req, hinfo.physical_cpu_max);
                } else {
-                       return(EINVAL);
+                       return EINVAL;
                }
        case HW_LOCAL_LOGICALCPU:
                if (kret == KERN_SUCCESS) {
-                       return(SYSCTL_RETURN(req, hinfo.logical_cpu));
+                       return SYSCTL_RETURN(req, hinfo.logical_cpu);
                } else {
-                       return(EINVAL);
+                       return EINVAL;
                }
        case HW_LOCAL_LOGICALCPUMAX:
                if (kret == KERN_SUCCESS) {
-                       return(SYSCTL_RETURN(req, hinfo.logical_cpu_max));
+                       return SYSCTL_RETURN(req, hinfo.logical_cpu_max);
+               } else {
+                       return EINVAL;
+               }
+       case HW_LOCAL_CPUTYPE:
+               if (kret == KERN_SUCCESS) {
+                       return SYSCTL_RETURN(req, hinfo.cpu_type);
+               } else {
+                       return EINVAL;
+               }
+       case HW_LOCAL_CPUSUBTYPE:
+               if (kret == KERN_SUCCESS) {
+                       return SYSCTL_RETURN(req, hinfo.cpu_subtype);
                } else {
-                       return(EINVAL);
+                       return EINVAL;
+               }
+       case HW_LOCAL_CPUFAMILY:
+       {
+               int cpufamily = 0;
+#if defined (__i386__) || defined (__x86_64__)
+               cpufamily = cpuid_cpufamily();
+#elif defined(__arm__) || defined(__arm64__)
+               {
+                       cpufamily = cpuid_get_cpufamily();
+               }
+#else
+#error unknown architecture
+#endif
+               return SYSCTL_RETURN(req, cpufamily);
+       }
+       case HW_LOCAL_CPUSUBFAMILY:
+       {
+               int cpusubfamily = 0;
+#if defined (__i386__) || defined (__x86_64__)
+               cpusubfamily = CPUSUBFAMILY_UNKNOWN;
+#elif defined(__arm__) || defined(__arm64__)
+               {
+                       cpusubfamily = cpuid_get_cpusubfamily();
                }
+#else
+#error unknown architecture
+#endif
+               return SYSCTL_RETURN(req, cpusubfamily);
+       }
        case HW_PAGESIZE:
        {
                vm_map_t map = get_task_map(current_task());
@@ -250,79 +314,134 @@ sysctl_hw_generic(__unused struct sysctl_oid *oidp, __unused void *arg1,
                break;
        }
        case HW_CACHELINE:
-               val = cpu_info.cache_line_size;
+               val = (int)cpu_info.cache_line_size;
                qval = (long long)val;
                break;
        case HW_L1ICACHESIZE:
-               val = cpu_info.l1_icache_size;
-               qval = (long long)val;
+               val = (int)cpu_info.l1_icache_size;
+               qval = (long long)cpu_info.l1_icache_size;
                break;
        case HW_L1DCACHESIZE:
-               val = cpu_info.l1_dcache_size;
-               qval = (long long)val;
+               val = (int)cpu_info.l1_dcache_size;
+               qval = (long long)cpu_info.l1_dcache_size;
                break;
        case HW_L2CACHESIZE:
-               if (cpu_info.l2_cache_size == 0xFFFFFFFF)
-                       return(EINVAL);
-               val = cpu_info.l2_cache_size;
-               qval = (long long)val;
+               if (cpu_info.l2_cache_size == UINT32_MAX) {
+                       return EINVAL;
+               }
+               val = (int)cpu_info.l2_cache_size;
+               qval = (long long)cpu_info.l2_cache_size;
                break;
        case HW_L3CACHESIZE:
-               if (cpu_info.l3_cache_size == 0xFFFFFFFF)
-                       return(EINVAL);
-               val = cpu_info.l3_cache_size;
-               qval = (long long)val;
+               if (cpu_info.l3_cache_size == UINT32_MAX) {
+                       return EINVAL;
+               }
+               val = (int)cpu_info.l3_cache_size;
+               qval = (long long)cpu_info.l3_cache_size;
                break;
+       case HW_TARGET:
+               bzero(dummy, sizeof(dummy));
+               if (!PEGetTargetName(dummy, 64)) {
+                       return EINVAL;
+               }
+               dummy[64] = 0;
+               return SYSCTL_OUT(req, dummy, strlen(dummy) + 1);
+       case HW_PRODUCT:
+               bzero(dummy, sizeof(dummy));
+               if (!PEGetProductName(dummy, 64)) {
+                       return EINVAL;
+               }
+               dummy[64] = 0;
+               return SYSCTL_OUT(req, dummy, strlen(dummy) + 1);
 
                /*
                 * Deprecated variables.  We still support these for
                 * backwards compatibility purposes only.
                 */
+#if XNU_TARGET_OS_OSX && defined(__arm64__)
+       /* The following two are kludged for backward
+        * compatibility. Use hw.product/hw.target for something
+        * consistent instead. */
+
        case HW_MACHINE:
                bzero(dummy, sizeof(dummy));
-               if(!PEGetMachineName(dummy,64))
-                       return(EINVAL);
+               if (proc_platform(req->p) == PLATFORM_IOS) {
+                       /* iOS-on-Mac processes don't expect the macOS kind of
+                        * hw.machine, e.g. "arm64", but are used to seeing
+                        * a product string on iOS, which we here hardcode
+                        * to return as "iPad8,6" for compatibility.
+                        *
+                        * Another reason why hw.machine and hw.model are
+                        * trouble and hw.target+hw.product should be used
+                        * instead.
+                        */
+
+                       strlcpy(dummy, "iPad8,6", sizeof(dummy));
+               }
+               else {
+                       strlcpy(dummy, "arm64", sizeof(dummy));
+               }
                dummy[64] = 0;
-               return(SYSCTL_OUT(req, dummy, strlen(dummy) + 1));
+               return SYSCTL_OUT(req, dummy, strlen(dummy) + 1);
        case HW_MODEL:
                bzero(dummy, sizeof(dummy));
-               if(!PEGetModelName(dummy,64))
-                       return(EINVAL);
+               if (!PEGetProductName(dummy, 64)) {
+                       return EINVAL;
+               }
                dummy[64] = 0;
-               return(SYSCTL_OUT(req, dummy, strlen(dummy) + 1));
+               return SYSCTL_OUT(req, dummy, strlen(dummy) + 1);
+#else
+       case HW_MACHINE:
+               bzero(dummy, sizeof(dummy));
+               if (!PEGetMachineName(dummy, 64)) {
+                       return EINVAL;
+               }
+               dummy[64] = 0;
+               return SYSCTL_OUT(req, dummy, strlen(dummy) + 1);
+       case HW_MODEL:
+               bzero(dummy, sizeof(dummy));
+               if (!PEGetModelName(dummy, 64)) {
+                       return EINVAL;
+               }
+               dummy[64] = 0;
+               return SYSCTL_OUT(req, dummy, strlen(dummy) + 1);
+#endif
        case HW_USERMEM:
-               {
-               int usermem = mem_size - vm_page_wire_count * page_size;
+       {
+               int usermem = (int)(mem_size - vm_page_wire_count * page_size);
 
-                       return(SYSCTL_RETURN(req, usermem));
-               }
+               return SYSCTL_RETURN(req, usermem);
+       }
        case HW_EPOCH:
-               epochTemp = PEGetPlatformEpoch();
-               if (epochTemp == -1)
-                       return(EINVAL);
-               return(SYSCTL_RETURN(req, epochTemp));
+               epochTemp = PEGetPlatformEpoch();
+               if (epochTemp == -1) {
+                       return EINVAL;
+               }
+               return SYSCTL_RETURN(req, epochTemp);
        case HW_VECTORUNIT: {
                int vector = cpu_info.vector_unit == 0? 0 : 1;
-               return(SYSCTL_RETURN(req, vector));
+               return SYSCTL_RETURN(req, vector);
        }
        case HW_L2SETTINGS:
-               if (cpu_info.l2_cache_size == 0xFFFFFFFF)
-                       return(EINVAL);
-               return(SYSCTL_RETURN(req, cpu_info.l2_settings));
+               if (cpu_info.l2_cache_size == UINT32_MAX) {
+                       return EINVAL;
+               }
+               return SYSCTL_RETURN(req, cpu_info.l2_settings);
        case HW_L3SETTINGS:
-               if (cpu_info.l3_cache_size == 0xFFFFFFFF)
-                       return(EINVAL);
-               return(SYSCTL_RETURN(req, cpu_info.l3_settings));
+               if (cpu_info.l3_cache_size == UINT32_MAX) {
+                       return EINVAL;
+               }
+               return SYSCTL_RETURN(req, cpu_info.l3_settings);
        default:
-               return(ENOTSUP);
+               return ENOTSUP;
        }
        /*
         * Callers may come to us with either int or quad buffers.
         */
        if (doquad) {
-               return(SYSCTL_RETURN(req, qval));
+               return SYSCTL_RETURN(req, qval);
        }
-       return(SYSCTL_RETURN(req, val));
+       return SYSCTL_RETURN(req, val);
 }
 
 /* hw.pagesize and hw.tbfrequency are expected as 64 bit values */
@@ -356,61 +475,272 @@ sysctl_tbfrequency
        return sysctl_io_number(req, l, sizeof(l), NULL, NULL);
 }
 
+void
+sysctl_set_osenvironment(unsigned int size, const void* value)
+{
+       if (osenvironment_size == 0 && size > 0) {
+               MALLOC(osenvironment, char *, size, M_TEMP, M_WAITOK);
+               if (osenvironment) {
+                       memcpy(osenvironment, value, size);
+                       osenvironment_size = size;
+               }
+       }
+}
+
+void
+sysctl_unblock_osenvironment(void)
+{
+       os_atomic_inc(&osenvironment_initialized, relaxed);
+       thread_wakeup((event_t) &osenvironment_initialized);
+}
+
 /*
- * hw.* MIB variables.
+ * Create sysctl entries coming from device tree.
+ *
+ * Entries from device tree are loaded here because SecureDTLookupEntry() only works before
+ * PE_init_iokit(). Doing this also avoids the extern-C hackery to access these entries
+ * from IORegistry (which requires C++).
  */
-SYSCTL_PROC    (_hw, HW_NCPU, ncpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_NCPU, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, HW_AVAILCPU, activecpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_AVAILCPU, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, OID_AUTO, physicalcpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_PHYSICALCPU, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, OID_AUTO, physicalcpu_max, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_PHYSICALCPUMAX, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, OID_AUTO, logicalcpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_LOGICALCPU, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, OID_AUTO, logicalcpu_max, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_LOGICALCPUMAX, sysctl_hw_generic, "I", "");
-SYSCTL_INT     (_hw, HW_BYTEORDER, byteorder, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (int *)NULL, BYTE_ORDER, "");
-SYSCTL_INT     (_hw, OID_AUTO, cputype, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &cputype, 0, "");
-SYSCTL_INT     (_hw, OID_AUTO, cpusubtype, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &cpusubtype, 0, "");
-SYSCTL_INT     (_hw, OID_AUTO, cpu64bit_capable, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &cpu64bit, 0, "");
-SYSCTL_INT     (_hw, OID_AUTO, cpufamily, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &cpufamily, 0, "");
-SYSCTL_OPAQUE  (_hw, OID_AUTO, cacheconfig, CTLFLAG_RD | CTLFLAG_LOCKED, &cacheconfig, sizeof(cacheconfig), "Q", "");
-SYSCTL_OPAQUE  (_hw, OID_AUTO, cachesize, CTLFLAG_RD | CTLFLAG_LOCKED, &cachesize, sizeof(cachesize), "Q", "");
-SYSCTL_PROC       (_hw, OID_AUTO, pagesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_pagesize, "Q", "");
-SYSCTL_PROC       (_hw, OID_AUTO, pagesize32, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_pagesize32, "Q", "");
+void
+sysctl_load_devicetree_entries(void)
+{
+       DTEntry chosen;
+       void const *value;
+       unsigned int size;
+
+       if (kSuccess != SecureDTLookupEntry(0, "/chosen", &chosen)) {
+               return;
+       }
+
+       /* load osenvironment */
+       if (kSuccess == SecureDTGetProperty(chosen, "osenvironment", (void const **) &value, &size)) {
+               MALLOC(osenvironment, char *, size, M_TEMP, M_WAITOK);
+               if (osenvironment) {
+                       memcpy(osenvironment, value, size);
+                       osenvironment_size = size;
+               }
+       }
+
+       /* load ephemeral_storage */
+       if (kSuccess == SecureDTGetProperty(chosen, "ephemeral-storage", (void const **) &value, &size)) {
+               if (size == sizeof(uint32_t)) {
+                       ephemeral_storage = *(uint32_t const *)value;
+                       property_existence.ephemeral_storage = 1;
+               }
+       }
+
+       /* load use_recovery_securityd */
+       if (kSuccess == SecureDTGetProperty(chosen, "use-recovery-securityd", (void const **) &value, &size)) {
+               if (size == sizeof(uint32_t)) {
+                       use_recovery_securityd = *(uint32_t const *)value;
+                       property_existence.use_recovery_securityd = 1;
+               }
+       }
+}
+
+static int
+sysctl_osenvironment
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+#if defined(__x86_64__)
+#if (DEVELOPMENT || DEBUG)
+       if (os_atomic_load(&osenvironment_initialized, relaxed) == 0) {
+               assert_wait((event_t) &osenvironment_initialized, THREAD_UNINT);
+               if (os_atomic_load(&osenvironment_initialized, relaxed) != 0) {
+                       clear_wait(current_thread(), THREAD_AWAKENED);
+               } else {
+                       (void) thread_block(THREAD_CONTINUE_NULL);
+               }
+       }
+#endif
+#endif
+       if (osenvironment_size > 0) {
+               return SYSCTL_OUT(req, osenvironment, osenvironment_size);
+       } else {
+               return EINVAL;
+       }
+}
+
+static int
+sysctl_ephemeral_storage
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       if (property_existence.ephemeral_storage) {
+               return SYSCTL_OUT(req, &ephemeral_storage, sizeof(ephemeral_storage));
+       } else {
+               return EINVAL;
+       }
+}
+
+static int
+sysctl_use_recovery_securityd
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       if (property_existence.use_recovery_securityd) {
+               return SYSCTL_OUT(req, &use_recovery_securityd, sizeof(use_recovery_securityd));
+       } else {
+               return EINVAL;
+       }
+}
+
+static int
+sysctl_use_kernelmanagerd
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+#if CONFIG_ARROW
+       static int use_kernelmanagerd = 1;
+#else
+       static int use_kernelmanagerd = 0;
+#endif
+       static bool once = false;
+
+       if (!once) {
+               kc_format_t kc_format;
+               PE_get_primary_kc_format(&kc_format);
+               if (kc_format == KCFormatFileset) {
+                       use_kernelmanagerd = 1;
+               } else {
+                       PE_parse_boot_argn("kernelmanagerd", &use_kernelmanagerd, sizeof(use_kernelmanagerd));
+               }
+               once = true;
+       }
+       return SYSCTL_OUT(req, &use_kernelmanagerd, sizeof(use_kernelmanagerd));
+}
+
+#define HW_LOCAL_FREQUENCY             1
+#define HW_LOCAL_FREQUENCY_MIN         2
+#define HW_LOCAL_FREQUENCY_MAX         3
+#define HW_LOCAL_FREQUENCY_CLOCK_RATE  4
+
+static int
+sysctl_bus_frequency
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, __unused struct sysctl_req *req)
+{
+
 #if DEBUG || DEVELOPMENT || (!defined(__arm__) && !defined(__arm64__))
-SYSCTL_QUAD    (_hw, OID_AUTO, busfrequency, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.bus_frequency_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, busfrequency_min, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.bus_frequency_min_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, busfrequency_max, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.bus_frequency_max_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, cpufrequency, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.cpu_frequency_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, cpufrequency_min, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.cpu_frequency_min_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, cpufrequency_max, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.cpu_frequency_max_hz, "");
+       switch (arg2) {
+       case HW_LOCAL_FREQUENCY:
+               return SYSCTL_RETURN(req, gPEClockFrequencyInfo.bus_frequency_hz);
+       case HW_LOCAL_FREQUENCY_MIN:
+               return SYSCTL_RETURN(req, gPEClockFrequencyInfo.bus_frequency_min_hz);
+       case HW_LOCAL_FREQUENCY_MAX:
+               return SYSCTL_RETURN(req, gPEClockFrequencyInfo.bus_frequency_max_hz);
+       case HW_LOCAL_FREQUENCY_CLOCK_RATE:
+               return SYSCTL_OUT(req, &gPEClockFrequencyInfo.bus_clock_rate_hz, sizeof(int));
+       default:
+               return EINVAL;
+       }
+#else
+       return ENOENT;
+#endif
+}
+
+static int
+sysctl_cpu_frequency
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, __unused struct sysctl_req *req)
+{
+
+#if DEBUG || DEVELOPMENT || (!defined(__arm__) && !defined(__arm64__))
+       switch (arg2) {
+       case HW_LOCAL_FREQUENCY:
+               return SYSCTL_RETURN(req, gPEClockFrequencyInfo.cpu_frequency_hz);
+       case HW_LOCAL_FREQUENCY_MIN:
+               return SYSCTL_RETURN(req, gPEClockFrequencyInfo.cpu_frequency_min_hz);
+       case HW_LOCAL_FREQUENCY_MAX:
+               return SYSCTL_RETURN(req, gPEClockFrequencyInfo.cpu_frequency_max_hz);
+       case HW_LOCAL_FREQUENCY_CLOCK_RATE:
+               return SYSCTL_OUT(req, &gPEClockFrequencyInfo.cpu_clock_rate_hz, sizeof(int));
+       default:
+               return EINVAL;
+       }
+#else
+       return ENOENT;
 #endif
-SYSCTL_PROC    (_hw, OID_AUTO, cachelinesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_CACHELINE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC    (_hw, OID_AUTO, l1icachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_L1ICACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC    (_hw, OID_AUTO, l1dcachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_L1DCACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC    (_hw, OID_AUTO, l2cachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_L2CACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC    (_hw, OID_AUTO, l3cachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_L3CACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
+}
+
+/*
+ *  This sysctl will signal to userspace that a serial console is desired:
+ *
+ *    hw.serialdebugmode = 1 will load the serial console job in the multi-user session;
+ *    hw.serialdebugmode = 2 will load the serial console job in the base system as well
+ */
+static int
+sysctl_serialdebugmode
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       uint32_t serial_boot_arg;
+       int serialdebugmode = 0;
+
+       if (PE_parse_boot_argn("serial", &serial_boot_arg, sizeof(serial_boot_arg)) &&
+           (serial_boot_arg & SERIALMODE_OUTPUT) && (serial_boot_arg & SERIALMODE_INPUT)) {
+               serialdebugmode = (serial_boot_arg & SERIALMODE_BASE_TTY) ? 2 : 1;
+       }
+
+       return sysctl_io_number(req, serialdebugmode, sizeof(serialdebugmode), NULL, NULL);
+}
+
+/*
+ * hw.* MIB variables.
+ */
+SYSCTL_PROC(_hw, HW_NCPU, ncpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_NCPU, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, HW_AVAILCPU, activecpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_AVAILCPU, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, physicalcpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_PHYSICALCPU, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, physicalcpu_max, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_PHYSICALCPUMAX, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, logicalcpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_LOGICALCPU, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, logicalcpu_max, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_LOGICALCPUMAX, sysctl_hw_generic, "I", "");
+SYSCTL_INT(_hw, HW_BYTEORDER, byteorder, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (int *)NULL, BYTE_ORDER, "");
+SYSCTL_PROC(_hw, OID_AUTO, cputype, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_CPUTYPE, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, cpusubtype, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_CPUSUBTYPE, sysctl_hw_generic, "I", "");
+SYSCTL_INT(_hw, OID_AUTO, cpu64bit_capable, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &cpu64bit, 0, "");
+SYSCTL_PROC(_hw, OID_AUTO, cpufamily, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_CPUFAMILY, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, cpusubfamily, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_CPUSUBFAMILY, sysctl_hw_generic, "I", "");
+SYSCTL_OPAQUE(_hw, OID_AUTO, cacheconfig, CTLFLAG_RD | CTLFLAG_LOCKED, &cacheconfig, sizeof(cacheconfig), "Q", "");
+SYSCTL_OPAQUE(_hw, OID_AUTO, cachesize, CTLFLAG_RD | CTLFLAG_LOCKED, &cachesize, sizeof(cachesize), "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, pagesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_pagesize, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, pagesize32, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_pagesize32, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, busfrequency, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_FREQUENCY, sysctl_bus_frequency, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, busfrequency_min, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_FREQUENCY_MIN, sysctl_bus_frequency, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, busfrequency_max, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_FREQUENCY_MAX, sysctl_bus_frequency, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, cpufrequency, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_FREQUENCY, sysctl_cpu_frequency, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, cpufrequency_min, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_FREQUENCY_MIN, sysctl_cpu_frequency, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, cpufrequency_max, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_LOCAL_FREQUENCY_MAX, sysctl_cpu_frequency, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, cachelinesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_CACHELINE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, l1icachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_L1ICACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, l1dcachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_L1DCACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, l2cachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_L2CACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
+SYSCTL_PROC(_hw, OID_AUTO, l3cachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, HW_L3CACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
 #if (defined(__arm__) || defined(__arm64__)) && (DEBUG || DEVELOPMENT)
-SYSCTL_QUAD    (_hw, OID_AUTO, memfrequency, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.mem_frequency_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, memfrequency_min, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.mem_frequency_min_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, memfrequency_max, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.mem_frequency_max_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, prffrequency, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.prf_frequency_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, prffrequency_min, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.prf_frequency_min_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, prffrequency_max, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.prf_frequency_max_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, fixfrequency, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.fix_frequency_hz, "");
+SYSCTL_QUAD(_hw, OID_AUTO, memfrequency, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.mem_frequency_hz, "");
+SYSCTL_QUAD(_hw, OID_AUTO, memfrequency_min, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.mem_frequency_min_hz, "");
+SYSCTL_QUAD(_hw, OID_AUTO, memfrequency_max, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.mem_frequency_max_hz, "");
+SYSCTL_QUAD(_hw, OID_AUTO, prffrequency, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.prf_frequency_hz, "");
+SYSCTL_QUAD(_hw, OID_AUTO, prffrequency_min, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.prf_frequency_min_hz, "");
+SYSCTL_QUAD(_hw, OID_AUTO, prffrequency_max, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.prf_frequency_max_hz, "");
+SYSCTL_QUAD(_hw, OID_AUTO, fixfrequency, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.fix_frequency_hz, "");
 #endif /* __arm__ || __arm64__ */
 SYSCTL_PROC(_hw, OID_AUTO, tbfrequency, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_tbfrequency, "Q", "");
-SYSCTL_QUAD    (_hw, HW_MEMSIZE, memsize, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &max_mem, "");
-SYSCTL_INT     (_hw, OID_AUTO, packages, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &packages, 0, "");
+#if XNU_TARGET_OS_OSX
+SYSCTL_QUAD(_hw, HW_MEMSIZE, memsize, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &max_mem_actual, "");
+#else
+SYSCTL_QUAD(_hw, HW_MEMSIZE, memsize, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &max_mem, "");
+#endif /* XNU_TARGET_OS_OSX */
+SYSCTL_INT(_hw, OID_AUTO, packages, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &packages, 0, "");
+SYSCTL_PROC(_hw, OID_AUTO, osenvironment, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_osenvironment, "A", "");
+SYSCTL_PROC(_hw, OID_AUTO, ephemeral_storage, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_ephemeral_storage, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, use_recovery_securityd, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_use_recovery_securityd, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, use_kernelmanagerd, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, 0, 0, sysctl_use_kernelmanagerd, "I", "");
+SYSCTL_PROC(_hw, OID_AUTO, serialdebugmode, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, 0, 0, sysctl_serialdebugmode, "I", "");
 
 /*
  * Optional CPU features can register nodes below hw.optional.
  *
  * If the feature is not present, the node should either not be registered,
- * or it should return -1.  If the feature is present, the node should return
- * 0.  If the feature is present and its use is advised, the node should 
- * return 1.
+ * or it should return 0.  If the feature is present, the node should return
+ * 1.
  */
-SYSCTL_NODE(_hw, OID_AUTO, optional, CTLFLAG_RW|CTLFLAG_LOCKED, NULL, "optional features");
+SYSCTL_NODE(_hw, OID_AUTO, optional, CTLFLAG_RW | CTLFLAG_LOCKED, NULL, "optional features");
 
-SYSCTL_INT(_hw_optional, OID_AUTO, floatingpoint, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (int *)NULL, 1, "");     /* always set */
+SYSCTL_INT(_hw_optional, OID_AUTO, floatingpoint, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (int *)NULL, 1, "");      /* always set */
 
 /*
  * Optional device hardware features can be registered by drivers below hw.features
@@ -429,92 +759,135 @@ SYSCTL_NODE(_hw, OID_AUTO, features, CTLFLAG_RD | CTLFLAG_LOCKED, NULL, "hardwar
  *
  * The *_compat nodes are *NOT* visible within the kernel.
  */
-SYSCTL_PROC(_hw, HW_PAGESIZE,     pagesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_PAGESIZE, sysctl_hw_generic, "I", "");
-#if DEBUG || DEVELOPMENT || (!defined(__arm__) && !defined(__arm64__))
-SYSCTL_COMPAT_INT (_hw, HW_BUS_FREQ,     busfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.bus_clock_rate_hz, 0, "");
-SYSCTL_COMPAT_INT (_hw, HW_CPU_FREQ,     cpufrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.cpu_clock_rate_hz, 0, "");
-#endif
-SYSCTL_PROC(_hw, HW_CACHELINE,    cachelinesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_CACHELINE, sysctl_hw_generic, "I", "");
+
+SYSCTL_PROC(_hw, HW_PAGESIZE, pagesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_PAGESIZE, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, HW_BUS_FREQ, busfrequency_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_LOCAL_FREQUENCY_CLOCK_RATE, sysctl_bus_frequency, "I", "");
+SYSCTL_PROC(_hw, HW_CPU_FREQ, cpufrequency_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_LOCAL_FREQUENCY_CLOCK_RATE, sysctl_cpu_frequency, "I", "");
+SYSCTL_PROC(_hw, HW_CACHELINE, cachelinesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_CACHELINE, sysctl_hw_generic, "I", "");
 SYSCTL_PROC(_hw, HW_L1ICACHESIZE, l1icachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L1ICACHESIZE, sysctl_hw_generic, "I", "");
 SYSCTL_PROC(_hw, HW_L1DCACHESIZE, l1dcachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L1DCACHESIZE, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L2CACHESIZE,  l2cachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L2CACHESIZE, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L3CACHESIZE,  l3cachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L3CACHESIZE, sysctl_hw_generic, "I", "");
-SYSCTL_COMPAT_INT (_hw, HW_TB_FREQ,      tbfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.timebase_frequency_hz, 0, "");
-SYSCTL_PROC(_hw, HW_MACHINE,      machine, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_MACHINE, sysctl_hw_generic, "A", "");
-SYSCTL_PROC(_hw, HW_MODEL,        model, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_MODEL, sysctl_hw_generic, "A", "");
-SYSCTL_COMPAT_UINT(_hw, HW_PHYSMEM,      physmem, CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, &mem_size, 0, "");
-SYSCTL_PROC(_hw, HW_USERMEM,      usermem, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_USERMEM,  sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_EPOCH,        epoch, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_EPOCH, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_VECTORUNIT,   vectorunit, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_VECTORUNIT, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L2SETTINGS,   l2settings, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L2SETTINGS, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L3SETTINGS,   l3settings, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L3SETTINGS, sysctl_hw_generic, "I", "");
-SYSCTL_INT (_hw, OID_AUTO, cputhreadtype, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN | CTLFLAG_LOCKED, &cputhreadtype, 0, "");
-
-#if defined(__i386__) || defined(__x86_64__)
+SYSCTL_PROC(_hw, HW_L2CACHESIZE, l2cachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L2CACHESIZE, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, HW_L3CACHESIZE, l3cachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L3CACHESIZE, sysctl_hw_generic, "I", "");
+SYSCTL_COMPAT_INT(_hw, HW_TB_FREQ, tbfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, &gPEClockFrequencyInfo.timebase_frequency_hz, 0, "");
+SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_MACHINE, sysctl_hw_generic, "A", "");
+SYSCTL_PROC(_hw, HW_MODEL, model, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_MODEL, sysctl_hw_generic, "A", "");
+SYSCTL_PROC(_hw, HW_TARGET, target, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_TARGET, sysctl_hw_generic, "A", "");
+SYSCTL_PROC(_hw, HW_PRODUCT, product, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_PRODUCT, sysctl_hw_generic, "A", "");
+SYSCTL_COMPAT_UINT(_hw, HW_PHYSMEM, physmem, CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, &mem_size, 0, "");
+SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_USERMEM, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, HW_EPOCH, epoch, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_EPOCH, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, HW_VECTORUNIT, vectorunit, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_VECTORUNIT, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, HW_L2SETTINGS, l2settings, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L2SETTINGS, sysctl_hw_generic, "I", "");
+SYSCTL_PROC(_hw, HW_L3SETTINGS, l3settings, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED | CTLFLAG_LOCKED, 0, HW_L3SETTINGS, sysctl_hw_generic, "I", "");
+SYSCTL_INT(_hw, OID_AUTO, cputhreadtype, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN | CTLFLAG_LOCKED, &cputhreadtype, 0, "");
+
+#if defined(__i386__) || defined(__x86_64__) || CONFIG_X86_64_COMPAT
 static int
 sysctl_cpu_capability
 (__unused struct sysctl_oid *oidp, void *arg1, __unused int arg2, struct sysctl_req *req)
 {
-       uint64_t        mask = (uint64_t) (uintptr_t) arg1;
-       boolean_t       is_capable = (_get_cpu_capabilities() & mask) != 0;
-       return SYSCTL_OUT(req, &is_capable, sizeof(is_capable));
+       uint64_t    caps;
+       caps = _get_cpu_capabilities();
 
+       uint64_t        mask = (uint64_t) (uintptr_t) arg1;
+       boolean_t       is_capable = (caps & mask) != 0;
+
+       return SYSCTL_OUT(req, &is_capable, sizeof(is_capable));
 }
+#define capability(name) name
+
 
-SYSCTL_PROC(_hw_optional, OID_AUTO, mmx,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasMMX, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, sse,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasSSE, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, sse2,      CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasSSE2, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, sse3,      CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasSSE3, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, supplementalsse3,  CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasSupplementalSSE3, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, sse4_1,    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasSSE4_1, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, sse4_2,    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasSSE4_2, 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, mmx, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasMMX), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, sse, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasSSE), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, sse2, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasSSE2), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, sse3, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasSSE3), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, supplementalsse3, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasSupplementalSSE3), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, sse4_1, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasSSE4_1), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, sse4_2, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasSSE4_2), 0, sysctl_cpu_capability, "I", "");
 /* "x86_64" is actually a preprocessor symbol on the x86_64 kernel, so we have to hack this */
 #undef x86_64
-SYSCTL_PROC(_hw_optional, OID_AUTO, x86_64,    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) k64Bit, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, aes,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAES, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx1_0,    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX1_0, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, rdrand,    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasRDRAND, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, f16c,      CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasF16C, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, enfstrg,   CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasENFSTRG, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, fma,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasFMA, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx2_0,    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX2_0, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, bmi1,      CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasBMI1, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, bmi2,      CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasBMI2, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, rtm,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasRTM, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, hle,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasHLE, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, adx,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasADX, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, mpx,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasMPX, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, sgx,       CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasSGX, 0, sysctl_cpu_capability, "I", "");
-#if !defined(RC_HIDE_XNU_J137)
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx512f,   CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX512F, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx512cd,  CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX512CD, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx512dq,  CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX512DQ, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx512bw,  CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX512BW, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx512vl,  CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX512VL, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx512ifma,        CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX512IFMA, 0, sysctl_cpu_capability, "I", "");
-SYSCTL_PROC(_hw_optional, OID_AUTO, avx512vbmi,        CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) kHasAVX512VBMI, 0, sysctl_cpu_capability, "I", "");
-#endif /* not RC_HIDE_XNU_J137 */
-#elif defined (__arm__) || defined (__arm64__)
-int watchpoint_flag = -1;
-int breakpoint_flag = -1;
-int gNeon = -1;
-int gNeonHpfp = -1;
+SYSCTL_PROC(_hw_optional, OID_AUTO, x86_64, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(k64Bit), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, aes, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAES), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx1_0, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX1_0), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, rdrand, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasRDRAND), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, f16c, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasF16C), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, enfstrg, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasENFSTRG), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, fma, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasFMA), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx2_0, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX2_0), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, bmi1, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasBMI1), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, bmi2, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasBMI2), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, rtm, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasRTM), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, hle, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasHLE), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, adx, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasADX), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, mpx, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasMPX), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, sgx, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasSGX), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx512f, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX512F), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx512cd, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX512CD), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx512dq, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX512DQ), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx512bw, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX512BW), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx512vl, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX512VL), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx512ifma, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX512IFMA), 0, sysctl_cpu_capability, "I", "");
+SYSCTL_PROC(_hw_optional, OID_AUTO, avx512vbmi, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, (void *) capability(kHasAVX512VBMI), 0, sysctl_cpu_capability, "I", "");
+#undef capability
+#endif /* !__i386__ && !__x86_64 && !CONFIG_X86_64_COMPAT */
+
+#if defined (__arm__) || defined (__arm64__)
+int watchpoint_flag = 0;
+int breakpoint_flag = 0;
+int gNeon = 0;
+int gNeonHpfp = 0;
+int gNeonFp16 = 0;
 int gARMv81Atomics = 0;
+int gARMv8Crc32 = 0;
+int gARMv82FHM = 0;
+int gARMv82SHA512 = 0;
+int gARMv82SHA3 = 0;
 
 #if defined (__arm__)
 int arm64_flag = 0;
 #elif defined (__arm64__) /* end __arm__*/
 int arm64_flag = 1;
 #else /* end __arm64__*/
-int arm64_flag = -1;
+int arm64_flag = 0;
 #endif
 
 SYSCTL_INT(_hw_optional, OID_AUTO, watchpoint, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &watchpoint_flag, 0, "");
 SYSCTL_INT(_hw_optional, OID_AUTO, breakpoint, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &breakpoint_flag, 0, "");
 SYSCTL_INT(_hw_optional, OID_AUTO, neon, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gNeon, 0, "");
 SYSCTL_INT(_hw_optional, OID_AUTO, neon_hpfp, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gNeonHpfp, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, neon_fp16, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gNeonFp16, 0, "");
 SYSCTL_INT(_hw_optional, OID_AUTO, armv8_1_atomics, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gARMv81Atomics, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, armv8_crc32, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gARMv8Crc32, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, armv8_2_fhm, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gARMv82FHM, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, armv8_2_sha512, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gARMv82SHA512, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, armv8_2_sha3, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &gARMv82SHA3, 0, "");
+
+#if DEBUG || DEVELOPMENT
+#if __ARM_KERNEL_PROTECT__
+static int arm_kernel_protect = 1;
+#else
+static int arm_kernel_protect = 0;
+#endif
+SYSCTL_INT(_hw_optional, OID_AUTO, arm_kernel_protect, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &arm_kernel_protect, 0, "");
+#endif
+
+#if DEBUG || DEVELOPMENT
+#if __ARM_WKDM_POPCNT__
+static int wkdm_popcount = 1;
+#else
+static int wkdm_popcount = 0;
+#endif
+SYSCTL_INT(_hw_optional, OID_AUTO, wkdm_popcount, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &wkdm_popcount, 0, "");
+#endif
+
+#if DEBUG || DEVELOPMENT
+#if __has_feature(ptrauth_calls)
+static int ptrauth = 1;
+#else
+static int ptrauth = 0;
+#endif
+SYSCTL_INT(_hw_optional, OID_AUTO, ptrauth, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &ptrauth, 0, "");
+#endif
 
 /*
  * Without this little ifdef dance, the preprocessor replaces "arm64" with "1",
@@ -527,10 +900,7 @@ SYSCTL_INT(_hw_optional, OID_AUTO, arm64, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LO
 #else
 SYSCTL_INT(_hw_optional, OID_AUTO, arm64, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &arm64_flag, 0, "");
 #endif
-
-#else
-#error Unsupported arch
-#endif /* !__i386__ && !__x86_64 && !__arm__ && ! __arm64__ */
+#endif /* !__arm__ && ! __arm64__ */
 
 
 /******************************************************************************
@@ -542,13 +912,11 @@ SYSCTL_INT(_hw_optional, OID_AUTO, arm64, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LO
 void
 sysctl_mib_init(void)
 {
-       cputype = cpu_type();
-       cpusubtype = cpu_subtype();
        cputhreadtype = cpu_threadtype();
 #if defined(__i386__) || defined (__x86_64__)
        cpu64bit = (_get_cpu_capabilities() & k64Bit) == k64Bit;
 #elif defined(__arm__) || defined (__arm64__)
-       cpu64bit = (cputype & CPU_ARCH_ABI64) == CPU_ARCH_ABI64;
+       cpu64bit = (cpu_type() & CPU_ARCH_ABI64) == CPU_ARCH_ABI64;
 #else
 #error Unsupported arch
 #endif
@@ -566,9 +934,6 @@ sysctl_mib_init(void)
        }
 
 #if defined (__i386__) || defined (__x86_64__)
-       /* hw.cpufamily */
-       cpufamily = cpuid_cpufamily();
-
        /* hw.cacheconfig */
        cacheconfig[0] = ml_cpu_cache_sharing(0);
        cacheconfig[1] = ml_cpu_cache_sharing(1);
@@ -584,21 +949,19 @@ sysctl_mib_init(void)
        cachesize[4] = 0;
 
        /* hw.packages */
-       packages = roundup(ml_cpu_cache_sharing(0), cpuid_info()->thread_count)
-                       / cpuid_info()->thread_count;
+       packages = (int)(roundup(ml_cpu_cache_sharing(0), cpuid_info()->thread_count)
+           / cpuid_info()->thread_count);
 
 #elif defined(__arm__) || defined(__arm64__) /* end __i386 */
-
-       cpufamily = cpuid_get_cpufamily();
-
        watchpoint_flag = arm_debug_info()->num_watchpoint_pairs;
        breakpoint_flag = arm_debug_info()->num_breakpoint_pairs;
 
        arm_mvfp_info_t *mvfp_info = arm_mvfp_info();
        gNeon = mvfp_info->neon;
        gNeonHpfp = mvfp_info->neon_hpfp;
+       gNeonFp16 = mvfp_info->neon_fp16;
 
-       cacheconfig[0] = ml_get_max_cpus();
+       cacheconfig[0] = ml_wait_max_cpus();
        cacheconfig[1] = 1;
        cacheconfig[2] = cache_info()->c_l2size ? 1:0;
        cacheconfig[3] = 0;
@@ -613,8 +976,8 @@ sysctl_mib_init(void)
        cachesize[4] = 0;
 
        packages = 1;
+
 #else
 #error unknown architecture
 #endif /* !__i386__ && !__x86_64 && !__arm__ && !__arm64__ */
-
 }