xnu-6153.41.3.tar.gz

[apple/xnu.git] / bsd / kern / kern_mib.c

diff --git a/bsd/kern/kern_mib.c b/bsd/kern/kern_mib.c
index 01ac7e637e1e1664379268f83eb495bb40161361..667b17a7d7b3aad2397317ec376da5242a4dd2cc 100644 (file)
--- a/bsd/kern/kern_mib.c
+++ b/bsd/kern/kern_mib.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,
  * 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.
  * 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@
  */
 /*-
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*-


@@ -97,8 +97,11 @@
 #include <mach/vm_param.h>
 #include <kern/task.h>
 #include <vm/vm_kern.h>
 #include <mach/vm_param.h>
 #include <kern/task.h>
 #include <vm/vm_kern.h>

+#include <vm/vm_map.h>
+#include <vm/vm_protos.h>

 #include <mach/host_info.h>
 #include <kern/pms.h>
 #include <mach/host_info.h>
 #include <kern/pms.h>

+#include <pexpert/device_tree.h>

 
 extern vm_map_t bsd_pageable_map;
 
 
 extern vm_map_t bsd_pageable_map;
 


@@ -111,67 +114,83 @@ extern vm_map_t bsd_pageable_map;
 #include <machine/machine_routines.h>
 #include <machine/cpu_capabilities.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() */

 
 

-#ifdef __i386__
-#include <i386/cpuid.h>                /* for cpuid_info() */
+#if defined(__i386__) || defined(__x86_64__)
+#include <i386/cpuid.h> /* for cpuid_info() */

 #endif
 
 #endif
 

+#if defined(__arm__) || defined(__arm64__)
+#include <arm/cpuid.h>          /* for cpuid_info() & cache_info() */
+#endif

 
 
 #ifndef MAX
 
 
 #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;
 
 #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      cputype, cpusubtype, cputhreadtype, cpufamily, cpu64bit;
+static uint64_t cacheconfig[10], cachesize[10];
+static int      packages;
+
+static char *   osenvironment;
+static uint32_t osenvironment_size = 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
  */
 
 
 /******************************************************************************
  * 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)

 
 
 /*
 
 
 /*

- * 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,
  * 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;
 {
        char dummy[65];
        int  epochTemp;


@@ -203,40 +222,47 @@ sysctl_hw_generic(__unused struct sysctl_oid *oidp, __unused void *arg1,
        switch (arg2) {
        case HW_NCPU:
                if (kret == KERN_SUCCESS) {
        switch (arg2) {
        case HW_NCPU:
                if (kret == KERN_SUCCESS) {

-                       return(SYSCTL_RETURN(req, hinfo.max_cpus));
+                       return SYSCTL_RETURN(req, hinfo.max_cpus);

                } else {
                } else {

-                       return(EINVAL);
+                       return EINVAL;

                }
        case HW_AVAILCPU:
                if (kret == KERN_SUCCESS) {
                }
        case HW_AVAILCPU:
                if (kret == KERN_SUCCESS) {

-                       return(SYSCTL_RETURN(req, hinfo.avail_cpus));
+                       return SYSCTL_RETURN(req, hinfo.avail_cpus);

                } else {
                } else {

-                       return(EINVAL);
+                       return EINVAL;

                }
        case HW_LOCAL_PHYSICALCPU:
                if (kret == KERN_SUCCESS) {
                }
        case HW_LOCAL_PHYSICALCPU:
                if (kret == KERN_SUCCESS) {

-                       return(SYSCTL_RETURN(req, hinfo.physical_cpu));
+                       return SYSCTL_RETURN(req, hinfo.physical_cpu);

                } else {
                } else {

-                       return(EINVAL);
+                       return EINVAL;

                }
        case HW_LOCAL_PHYSICALCPUMAX:
                if (kret == KERN_SUCCESS) {
                }
        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 {
                } else {

-                       return(EINVAL);
+                       return EINVAL;

                }
        case HW_LOCAL_LOGICALCPU:
                if (kret == KERN_SUCCESS) {
                }
        case HW_LOCAL_LOGICALCPU:
                if (kret == KERN_SUCCESS) {

-                       return(SYSCTL_RETURN(req, hinfo.logical_cpu));
+                       return SYSCTL_RETURN(req, hinfo.logical_cpu);

                } else {
                } else {

-                       return(EINVAL);
+                       return EINVAL;

                }
        case HW_LOCAL_LOGICALCPUMAX:
                if (kret == KERN_SUCCESS) {
                }
        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 {
                } else {

-                       return(EINVAL);
+                       return EINVAL;

                }
                }

+       case HW_PAGESIZE:
+       {
+               vm_map_t map = get_task_map(current_task());
+               val = vm_map_page_size(map);
+               qval = (long long)val;
+               break;
+       }

        case HW_CACHELINE:
                val = cpu_info.cache_line_size;
                qval = (long long)val;
        case HW_CACHELINE:
                val = cpu_info.cache_line_size;
                qval = (long long)val;


@@ -250,67 +276,74 @@ sysctl_hw_generic(__unused struct sysctl_oid *oidp, __unused void *arg1,
                qval = (long long)val;
                break;
        case HW_L2CACHESIZE:
                qval = (long long)val;
                break;
        case HW_L2CACHESIZE:

-               if (cpu_info.l2_cache_size == 0xFFFFFFFF)
-                       return(EINVAL);
+               if (cpu_info.l2_cache_size == 0xFFFFFFFF) {
+                       return EINVAL;
+               }

                val = cpu_info.l2_cache_size;
                qval = (long long)val;
                break;
        case HW_L3CACHESIZE:
                val = cpu_info.l2_cache_size;
                qval = (long long)val;
                break;
        case HW_L3CACHESIZE:

-               if (cpu_info.l3_cache_size == 0xFFFFFFFF)
-                       return(EINVAL);
+               if (cpu_info.l3_cache_size == 0xFFFFFFFF) {
+                       return EINVAL;
+               }

                val = cpu_info.l3_cache_size;
                qval = (long long)val;
                break;
 
                val = cpu_info.l3_cache_size;
                qval = (long long)val;
                break;
 

-               /*
-                * Deprecated variables.  We still support these for
-                * backwards compatibility purposes only.
-                */
+       /*
+        * Deprecated variables.  We still support these for
+        * backwards compatibility purposes only.
+        */

        case HW_MACHINE:
                bzero(dummy, sizeof(dummy));
        case HW_MACHINE:
                bzero(dummy, sizeof(dummy));

-               if(!PEGetMachineName(dummy,64))
-                       return(EINVAL);
+               if (!PEGetMachineName(dummy, 64)) {
+                       return EINVAL;
+               }

                dummy[64] = 0;
                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));
        case HW_MODEL:
                bzero(dummy, sizeof(dummy));

-               if(!PEGetModelName(dummy,64))
-                       return(EINVAL);
+               if (!PEGetModelName(dummy, 64)) {
+                       return EINVAL;
+               }

                dummy[64] = 0;
                dummy[64] = 0;

-               return(SYSCTL_OUT(req, dummy, strlen(dummy) + 1));
+               return SYSCTL_OUT(req, dummy, strlen(dummy) + 1);

        case HW_USERMEM:
        case HW_USERMEM:

-               {
+       {

                int usermem = mem_size - vm_page_wire_count * page_size;
 
                int usermem = mem_size - vm_page_wire_count * page_size;
 

-                       return(SYSCTL_RETURN(req, usermem));
-               }
+               return SYSCTL_RETURN(req, usermem);
+       }

        case HW_EPOCH:
        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;
        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:
        }
        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 == 0xFFFFFFFF) {
+                       return EINVAL;
+               }
+               return SYSCTL_RETURN(req, cpu_info.l2_settings);

        case HW_L3SETTINGS:
        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 == 0xFFFFFFFF) {
+                       return EINVAL;
+               }
+               return SYSCTL_RETURN(req, cpu_info.l3_settings);

        default:
        default:

-               return(ENOTSUP);
+               return ENOTSUP;

        }
        /*
         * Callers may come to us with either int or quad buffers.
         */
        if (doquad) {
        }
        /*
         * 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 */
 }
 
 /* hw.pagesize and hw.tbfrequency are expected as 64 bit values */


@@ -318,7 +351,21 @@ static int
 sysctl_pagesize
 (__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {
 sysctl_pagesize
 (__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {

-       long long l = page_size;
+       vm_map_t map = get_task_map(current_task());
+       long long l = vm_map_page_size(map);
+       return sysctl_io_number(req, l, sizeof(l), NULL, NULL);
+}
+
+static int
+sysctl_pagesize32
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+       long long l;
+#if __arm64__
+       l = (long long) (1 << page_shift_user32);
+#else /* __arm64__ */
+       l = (long long) PAGE_SIZE;
+#endif /* __arm64__ */

        return sysctl_io_number(req, l, sizeof(l), NULL, NULL);
 }
 
        return sysctl_io_number(req, l, sizeof(l), NULL, NULL);
 }
 


@@ -330,49 +377,146 @@ sysctl_tbfrequency
        return sysctl_io_number(req, l, sizeof(l), NULL, NULL);
 }
 
        return sysctl_io_number(req, l, sizeof(l), NULL, NULL);
 }
 

+/*
+ * Create sysctl entries coming from device tree.
+ *
+ * Entries from device tree are loaded here because DTLookupEntry() only works before
+ * PE_init_iokit(). Doing this also avoids the extern-C hackery to access these entries
+ * from IORegistry (which requires C++).
+ */
+void
+sysctl_load_devicetree_entries(void)
+{
+       DTEntry chosen;
+       void *value;
+       unsigned int size;
+
+       if (kSuccess != DTLookupEntry(0, "/chosen", &chosen)) {
+               return;
+       }
+
+       /* load osenvironment */
+       if (kSuccess == DTGetProperty(chosen, "osenvironment", (void **) &value, &size)) {
+               MALLOC(osenvironment, char *, size, M_TEMP, M_WAITOK);
+               if (osenvironment) {
+                       memcpy(osenvironment, value, size);
+                       osenvironment_size = size;
+               }
+       }
+
+       /* load ephemeral_storage */
+       if (kSuccess == DTGetProperty(chosen, "ephemeral-storage", (void **) &value, &size)) {
+               if (size == sizeof(uint32_t)) {
+                       ephemeral_storage = *(uint32_t *)value;
+                       property_existence.ephemeral_storage = 1;
+               }
+       }
+
+       /* load use_recovery_securityd */
+       if (kSuccess == DTGetProperty(chosen, "use-recovery-securityd", (void **) &value, &size)) {
+               if (size == sizeof(uint32_t)) {
+                       use_recovery_securityd = *(uint32_t *)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 (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;
+       }
+}
+

 /*
  * hw.* MIB variables.
  */
 /*
  * hw.* MIB variables.
  */

-SYSCTL_PROC    (_hw, HW_NCPU, ncpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_NCPU, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, HW_AVAILCPU, activecpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_AVAILCPU, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, OID_AUTO, physicalcpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_LOCAL_PHYSICALCPU, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, OID_AUTO, physicalcpu_max, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_LOCAL_PHYSICALCPUMAX, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, OID_AUTO, logicalcpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_LOCAL_LOGICALCPU, sysctl_hw_generic, "I", "");
-SYSCTL_PROC    (_hw, OID_AUTO, logicalcpu_max, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_LOCAL_LOGICALCPUMAX, sysctl_hw_generic, "I", "");
-SYSCTL_INT     (_hw, HW_BYTEORDER, byteorder, CTLFLAG_RD | CTLFLAG_KERN, NULL, BYTE_ORDER, "");
-SYSCTL_INT     (_hw, OID_AUTO, cputype, CTLFLAG_RD | CTLFLAG_KERN, &cputype, 0, "");
-SYSCTL_INT     (_hw, OID_AUTO, cpusubtype, CTLFLAG_RD | CTLFLAG_KERN, &cpusubtype, 0, "");
-SYSCTL_INT     (_hw, OID_AUTO, cpu64bit_capable, CTLFLAG_RD | CTLFLAG_KERN, &cpu64bit, 0, "");
-SYSCTL_INT     (_hw, OID_AUTO, cpufamily, CTLFLAG_RD | CTLFLAG_KERN, &cpufamily, 0, "");
-SYSCTL_OPAQUE  (_hw, OID_AUTO, cacheconfig, CTLFLAG_RD, &cacheconfig, sizeof(cacheconfig), "Q", "");
-SYSCTL_OPAQUE  (_hw, OID_AUTO, cachesize, CTLFLAG_RD, &cachesize, sizeof(cachesize), "Q", "");
-SYSCTL_PROC       (_hw, OID_AUTO, pagesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, 0, sysctl_pagesize, "Q", "");
-SYSCTL_QUAD    (_hw, OID_AUTO, busfrequency, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.bus_frequency_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, busfrequency_min, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.bus_frequency_min_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, busfrequency_max, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.bus_frequency_max_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, cpufrequency, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.cpu_frequency_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, cpufrequency_min, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.cpu_frequency_min_hz, "");
-SYSCTL_QUAD    (_hw, OID_AUTO, cpufrequency_max, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.cpu_frequency_max_hz, "");
-SYSCTL_PROC    (_hw, OID_AUTO, cachelinesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_CACHELINE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC    (_hw, OID_AUTO, l1icachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_L1ICACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC    (_hw, OID_AUTO, l1dcachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_L1DCACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC    (_hw, OID_AUTO, l2cachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_L2CACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC    (_hw, OID_AUTO, l3cachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_L3CACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_PROC(_hw, OID_AUTO, tbfrequency, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, 0, sysctl_tbfrequency, "Q", "");
-SYSCTL_QUAD    (_hw, HW_MEMSIZE, memsize, CTLFLAG_RD | CTLFLAG_KERN, &max_mem, "");
-SYSCTL_INT     (_hw, OID_AUTO, packages, CTLFLAG_RD | CTLFLAG_KERN, &packages, 0, "");
+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", "");
+#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, "");
+#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", "");
+#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, "");
+#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, "");
+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", "");

 
 /*
 
 /*

- * Optional features can register nodes below hw.optional.
+ * 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
  *
  * 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 
+ * 0.  If the feature is present and its use is advised, the node should

  * return 1.
  */
  * 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, 0, 1, "");        /* always set */
+/*
+ * Optional device hardware features can be registered by drivers below hw.features
+ */
+SYSCTL_NODE(_hw, OID_AUTO, features, CTLFLAG_RD | CTLFLAG_LOCKED, NULL, "hardware features");

 
 /*
  * Deprecated variables.  These are supported for backwards compatibility
 
 /*
  * Deprecated variables.  These are supported for backwards compatibility


@@ -386,86 +530,113 @@ SYSCTL_INT(_hw_optional, OID_AUTO, floatingpoint, CTLFLAG_RD | CTLFLAG_KERN, 0,
  *
  * The *_compat nodes are *NOT* visible within the kernel.
  */
  *
  * The *_compat nodes are *NOT* visible within the kernel.
  */

-SYSCTL_INT (_hw, HW_PAGESIZE,     pagesize_compat, CTLFLAG_RD | CTLFLAG_MASKED, &page_size, 0, "");
-SYSCTL_INT (_hw, HW_BUS_FREQ,     busfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.bus_clock_rate_hz, 0, "");
-SYSCTL_INT (_hw, HW_CPU_FREQ,     cpufrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.cpu_clock_rate_hz, 0, "");
-SYSCTL_PROC(_hw, HW_CACHELINE,    cachelinesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_CACHELINE, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L1ICACHESIZE, l1icachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L1ICACHESIZE, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L1DCACHESIZE, l1dcachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L1DCACHESIZE, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L2CACHESIZE,  l2cachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L2CACHESIZE, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L3CACHESIZE,  l3cachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L3CACHESIZE, sysctl_hw_generic, "I", "");
-SYSCTL_INT (_hw, HW_TB_FREQ,      tbfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.timebase_frequency_hz, 0, "");
-SYSCTL_PROC(_hw, HW_MACHINE,      machine, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_MACHINE, sysctl_hw_generic, "A", "");
-SYSCTL_PROC(_hw, HW_MODEL,        model, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_MODEL, sysctl_hw_generic, "A", "");
-SYSCTL_UINT(_hw, HW_PHYSMEM,      physmem, CTLFLAG_RD | CTLFLAG_MASKED, &mem_size, 0, "");
-SYSCTL_PROC(_hw, HW_USERMEM,      usermem, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_USERMEM,   sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_EPOCH,        epoch, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_EPOCH, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_VECTORUNIT,   vectorunit, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_VECTORUNIT, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L2SETTINGS,   l2settings, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L2SETTINGS, sysctl_hw_generic, "I", "");
-SYSCTL_PROC(_hw, HW_L3SETTINGS,   l3settings, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L3SETTINGS, sysctl_hw_generic, "I", "");
-SYSCTL_INT (_hw, OID_AUTO, cputhreadtype, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &cputhreadtype, 0, "");
-
-#ifdef __ppc__
-int altivec_flag = -1;
-int graphicsops_flag = -1;
-int x64bitops_flag = -1;
-int fsqrt_flag = -1;
-int stfiwx_flag = -1;
-int dcba_flag = -1;
-int datastreams_flag = -1;
-int dcbtstreams_flag = -1;
-
-SYSCTL_INT(_hw_optional, OID_AUTO, altivec, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &altivec_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, graphicsops, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &graphicsops_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, 64bitops, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &x64bitops_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, fsqrt, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &fsqrt_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, stfiwx, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &stfiwx_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, dcba, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &dcba_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, datastreams, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &datastreams_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, dcbtstreams, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &dcbtstreams_flag, 0, "");
-#elif defined (__i386__)
-int mmx_flag = -1;
-int sse_flag = -1;
-int sse2_flag = -1;
-int sse3_flag = -1;
-int sse4_1_flag = -1;
-int sse4_2_flag = -1;
-int x86_64_flag = -1;
-int supplementalsse3_flag = -1;
-
-SYSCTL_INT(_hw_optional, OID_AUTO, mmx, CTLFLAG_RD | CTLFLAG_KERN, &mmx_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, sse, CTLFLAG_RD | CTLFLAG_KERN, &sse_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, sse2, CTLFLAG_RD | CTLFLAG_KERN, &sse2_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, sse3, CTLFLAG_RD | CTLFLAG_KERN, &sse3_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, supplementalsse3, CTLFLAG_RD | CTLFLAG_KERN, &supplementalsse3_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, sse4_1, CTLFLAG_RD | CTLFLAG_KERN, &sse4_1_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, sse4_2, CTLFLAG_RD | CTLFLAG_KERN, &sse4_2_flag, 0, "");
-SYSCTL_INT(_hw_optional, OID_AUTO, x86_64, CTLFLAG_RD | CTLFLAG_KERN, &x86_64_flag, 0, "");
-#endif /* __ppc__ */
-
-/*
- * Debugging interface to the CPU power management code.
- */
+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_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__)

 static int
 static int

-pmsSysctl(__unused struct sysctl_oid *oidp, __unused void *arg1,
-         __unused int arg2, struct sysctl_req *req)
+sysctl_cpu_capability
+(__unused struct sysctl_oid *oidp, void *arg1, __unused int arg2, struct sysctl_req *req)

 {
 {

-       pmsctl_t        ctl;
-       int             error;
-       boolean_t       intr;
+       uint64_t        mask = (uint64_t) (uintptr_t) arg1;
+       boolean_t       is_capable = (_get_cpu_capabilities() & mask) != 0;

 
 

-       if ((error = SYSCTL_IN(req, &ctl, sizeof(ctl))))
-               return(error);
+       return SYSCTL_OUT(req, &is_capable, sizeof(is_capable));
+}

 
 

-       intr = ml_set_interrupts_enabled(FALSE);                /* No interruptions in here */
-       error = pmsControl(ctl.request, (user_addr_t)(unsigned long)ctl.reqaddr, ctl.reqsize);
-       (void)ml_set_interrupts_enabled(intr);                  /* Restore interruptions */
+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", "");
+/* "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;
+int gNeonFp16 = -1;
+int gARMv81Atomics = 0;
+int gARMv8Crc32 = 0;
+int gARMv82FHM = 0;
+
+#if defined (__arm__)
+int arm64_flag = 0;
+#elif defined (__arm64__) /* end __arm__*/
+int arm64_flag = 1;
+#else /* end __arm64__*/
+int arm64_flag = -1;
+#endif

 
 

-       return(error);
-}
+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_PROC(_hw, OID_AUTO, pms, CTLTYPE_STRUCT | CTLFLAG_WR, 0, 0, pmsSysctl, "S", "Processor Power Management");
+/*
+ * Without this little ifdef dance, the preprocessor replaces "arm64" with "1",
+ * leaving us with a less-than-helpful sysctl.hwoptional.1.
+ */
+#ifdef arm64
+#undef arm64
+SYSCTL_INT(_hw_optional, OID_AUTO, arm64, CTLFLAG_RD | CTLFLAG_KERN | CTLFLAG_LOCKED, &arm64_flag, 0, "");
+#define arm64 1
+#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__ */

 
 
 /******************************************************************************
 
 
 /******************************************************************************


@@ -480,10 +651,12 @@ sysctl_mib_init(void)
        cputype = cpu_type();
        cpusubtype = cpu_subtype();
        cputhreadtype = cpu_threadtype();
        cputype = cpu_type();
        cpusubtype = cpu_subtype();
        cputhreadtype = cpu_threadtype();

-#if defined(__ppc__)
-    cpu64bit = (_cpu_capabilities & k64Bit) == k64Bit;
-#elif defined(__i386__)
-    cpu64bit = (_get_cpu_capabilities() & k64Bit) == k64Bit;
+#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;
+#else
+#error Unsupported arch

 #endif
 
        /*
 #endif
 
        /*


@@ -498,140 +671,10 @@ sysctl_mib_init(void)
                sysctl_register_oid(&sysctl__hw_cputhreadtype);
        }
 
                sysctl_register_oid(&sysctl__hw_cputhreadtype);
        }
 

-#ifdef __ppc__
-/*
- * The convention for these is as follows:
- * If the sysctl does not exist, the functionality is not present in the CPU.
- * If the sysctl exists, it will not crash, and should otherwise function
- *   corectly.
- * If the sysctl exists and returns 0, we advise against using this feature.
- * If the sysctl exists and returns 1, we advise it's use.
- */
-
-       if (_cpu_capabilities & kHasAltivec) {
-               altivec_flag = 1;
-               sysctl_register_oid(&sysctl__hw_optional_altivec);
-       }
-       if (_cpu_capabilities & kHasGraphicsOps) {
-               graphicsops_flag = 1;
-               sysctl_register_oid(&sysctl__hw_optional_graphicsops);
-       }               
-       if (_cpu_capabilities & k64Bit) {
-               x64bitops_flag = 1;
-               sysctl_register_oid(&sysctl__hw_optional_64bitops);
-       }               
-       if (_cpu_capabilities & kHasFsqrt) {
-               fsqrt_flag = 1;
-               sysctl_register_oid(&sysctl__hw_optional_fsqrt);
-       }               
-       if (_cpu_capabilities & kHasStfiwx) {
-               stfiwx_flag = 1;
-               sysctl_register_oid(&sysctl__hw_optional_stfiwx);
-       }               
-       if (_cpu_capabilities & kDcbaAvailable)
-               dcba_flag = 0;
-       if (_cpu_capabilities & kDcbaRecommended)
-               dcba_flag = 1;
-       if (dcba_flag >= 0)
-               sysctl_register_oid(&sysctl__hw_optional_dcba);
-       if (_cpu_capabilities & kDataStreamsAvailable)
-               datastreams_flag = 0;
-       if (_cpu_capabilities & kDataStreamsRecommended)
-               datastreams_flag = 1;
-       if (datastreams_flag >= 0)
-               sysctl_register_oid(&sysctl__hw_optional_datastreams);
-       if (_cpu_capabilities & kDcbtStreamsAvailable)
-               dcbtstreams_flag = 0;
-       if (_cpu_capabilities & kDcbtStreamsRecommended)
-               dcbtstreams_flag = 1;
-       if (dcbtstreams_flag >= 0)
-               sysctl_register_oid(&sysctl__hw_optional_dcbtstreams);
-
+#if defined (__i386__) || defined (__x86_64__)

        /* hw.cpufamily */
        /* hw.cpufamily */

-       switch (cpusubtype) {
-       case CPU_SUBTYPE_POWERPC_750:
-               cpufamily = CPUFAMILY_POWERPC_G3;
-               break;
-       case CPU_SUBTYPE_POWERPC_7400:
-       case CPU_SUBTYPE_POWERPC_7450:
-               cpufamily = CPUFAMILY_POWERPC_G4;
-               break;
-       case CPU_SUBTYPE_POWERPC_970:
-               cpufamily = CPUFAMILY_POWERPC_G5;
-               break;
-       default:
-               cpufamily = CPUFAMILY_UNKNOWN;
-       }
-
-       ml_cpu_info_t cpu_info;
-       ml_cpu_get_info(&cpu_info);
-
-       host_basic_info_data_t hinfo;
-       mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
-       kern_return_t kret = host_info((host_t)BSD_HOST, HOST_BASIC_INFO, (host_info_t)&hinfo, &count);
-       if(kret != KERN_SUCCESS)
-       {
-               hinfo.max_cpus = 1;
-       }
+       cpufamily = cpuid_cpufamily();

 
 

-       /* hw.cachesize */
-       cachesize[0] = max_mem;
-       cachesize[1] = cpu_info.l1_dcache_size;
-       cachesize[2] = cpu_info.l2_settings ? cpu_info.l2_cache_size : 0;
-       cachesize[3] = cpu_info.l3_settings ? cpu_info.l3_cache_size : 0;
-       cachesize[4] = 0;
-       
-       /* hw.cacheconfig */
-       cacheconfig[0] = hinfo.max_cpus;
-       cacheconfig[1] = 1;
-       cacheconfig[2] = cachesize[2] ? 1 : 0;
-       cacheconfig[3] = cachesize[3] ? 1 : 0;
-       cacheconfig[4] = 0;
-
-       /* hw.packages */
-       if (cpusubtype == CPU_SUBTYPE_POWERPC_970 && 
-           cpu_info.l2_cache_size == 1 * 1024 * 1024)
-               /* The signature of the dual-core G5 */
-               packages = roundup(hinfo.max_cpus, 2) / 2;
-       else
-               packages = hinfo.max_cpus;
-
-#elif defined (__i386__)
-       mmx_flag = ((_get_cpu_capabilities() & kHasMMX) == kHasMMX)? 1 : 0;
-       sse_flag = ((_get_cpu_capabilities() & kHasSSE) == kHasSSE)? 1 : 0;
-       sse2_flag = ((_get_cpu_capabilities() & kHasSSE2) == kHasSSE2)? 1 : 0;
-       sse3_flag = ((_get_cpu_capabilities() & kHasSSE3) == kHasSSE3)? 1 : 0;
-       supplementalsse3_flag = ((_get_cpu_capabilities() & kHasSupplementalSSE3) == kHasSupplementalSSE3)? 1 : 0;
-       sse4_1_flag = ((_get_cpu_capabilities() & kHasSSE4_1) == kHasSSE4_1)? 1 : 0;
-       sse4_2_flag = ((_get_cpu_capabilities() & kHasSSE4_2) == kHasSSE4_2)? 1 : 0;
-       x86_64_flag = ((_get_cpu_capabilities() & k64Bit) == k64Bit)? 1 : 0;
-
-       /* hw.cpufamily */
-       switch (cpuid_info()->cpuid_family) {
-       case 6:
-               switch (cpuid_info()->cpuid_model) {
-               case 13:
-                       cpufamily = CPUFAMILY_INTEL_6_13;
-                       break;
-               case 14:
-                       cpufamily = CPUFAMILY_INTEL_6_14; /* Core Solo/Duo */
-                       break;
-               case 15:
-                       cpufamily = CPUFAMILY_INTEL_6_15; /* Core 2 */
-                       break;
-               case 23:
-                       cpufamily = CPUFAMILY_INTEL_6_23;
-                       break;
-               case 26:
-                       cpufamily = CPUFAMILY_INTEL_6_26;
-                       break;
-               default:
-                       cpufamily = CPUFAMILY_UNKNOWN;
-               }
-               break;
-       default:
-               cpufamily = CPUFAMILY_UNKNOWN;
-       }

        /* hw.cacheconfig */
        cacheconfig[0] = ml_cpu_cache_sharing(0);
        cacheconfig[1] = ml_cpu_cache_sharing(1);
        /* hw.cacheconfig */
        cacheconfig[0] = ml_cpu_cache_sharing(0);
        cacheconfig[1] = ml_cpu_cache_sharing(1);


@@ -648,12 +691,37 @@ sysctl_mib_init(void)
 
        /* hw.packages */
        packages = roundup(ml_cpu_cache_sharing(0), cpuid_info()->thread_count)
 
        /* hw.packages */
        packages = roundup(ml_cpu_cache_sharing(0), cpuid_info()->thread_count)

-                       / cpuid_info()->thread_count;
+           / cpuid_info()->thread_count;

 
 

-#else /* end __arm__ */
-# warning we do not support this platform yet
-#endif /* __ppc__ */
+#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[1] = 1;
+       cacheconfig[2] = cache_info()->c_l2size ? 1:0;
+       cacheconfig[3] = 0;
+       cacheconfig[4] = 0;
+       cacheconfig[5] = 0;
+       cacheconfig[6] = 0;
+
+       cachesize[0] = ml_get_machine_mem();
+       cachesize[1] = cache_info()->c_dsize; /* Using the DCache */
+       cachesize[2] = cache_info()->c_l2size;
+       cachesize[3] = 0;
+       cachesize[4] = 0;
+
+       packages = 1;
+
+#else
+#error unknown architecture
+#endif /* !__i386__ && !__x86_64 && !__arm__ && !__arm64__ */
+}